discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=c31cb51499de590ae98374e1a5e5f158e4a5f8e3
commit c31cb51499de590ae98374e1a5e5f158e4a5f8e3 Author: Mike Blumenkrantz <[email protected]> Date: Mon Aug 21 10:16:30 2017 -0400 replace <br> with <ps/> for all text --- src/bin/e_about.c | 34 +++++----- src/bin/e_actions.c | 14 ++-- src/bin/e_comp_x.c | 18 +++--- src/bin/e_config.c | 74 +++++++++++----------- src/bin/e_desklock.c | 4 +- src/bin/e_desktop_editor.c | 12 ++-- src/bin/e_exec.c | 20 +++--- src/bin/e_fm.c | 20 +++--- src/bin/e_grab_dialog.c | 8 +-- src/bin/e_import_config_dialog.c | 6 +- src/bin/e_import_dialog.c | 4 +- src/bin/e_int_client_remember.c | 32 +++++----- src/bin/e_int_config_comp.c | 4 +- src/bin/e_intl.c | 10 +-- src/bin/e_main.c | 28 ++++---- src/bin/e_module.c | 50 +++++++-------- src/bin/e_remember.c | 6 +- src/bin/e_screensaver.c | 2 +- src/bin/e_shelf.c | 8 +-- src/bin/e_sys.c | 30 ++++----- src/bin/e_test.c | 22 +++---- src/bin/e_update.c | 16 ++--- src/bin/e_utils.c | 38 +++++------ src/bin/e_widget_filepreview.c | 24 +++---- src/bin/e_widget_textblock.c | 4 +- .../conf_bindings/e_int_config_acpibindings.c | 2 +- .../conf_bindings/e_int_config_edgebindings.c | 12 ++-- .../conf_bindings/e_int_config_keybindings.c | 4 +- .../conf_bindings/e_int_config_mousebindings.c | 10 +-- .../conf_bindings/e_int_config_signalbindings.c | 4 +- src/modules/conf_dialogs/e_int_config_profiles.c | 2 +- src/modules/conf_intl/e_int_config_imc.c | 8 +-- src/modules/conf_intl/e_int_config_imc_import.c | 4 +- src/modules/conf_intl/e_int_config_intl.c | 28 ++++---- src/modules/conf_theme/e_int_config_theme.c | 6 +- src/modules/conf_theme/e_int_config_theme_import.c | 4 +- src/modules/connman/e_mod_main.c | 2 +- src/modules/cpufreq/e_mod_main.c | 34 +++++----- src/modules/everything/evry_view_help.c | 32 +++++----- src/modules/ibar/e_mod_config.c | 2 +- src/modules/lokker/lokker.c | 4 +- src/modules/luncher/config.c | 2 +- src/modules/music-control/ui.c | 6 +- src/modules/notification/e_mod_main.c | 8 +-- src/modules/notification/e_mod_popup.c | 2 +- src/modules/packagekit/e_mod_packagekit.c | 2 +- src/modules/pager/e_mod_config.c | 6 +- src/modules/pager/gadget/config.c | 6 +- src/modules/pager_plain/e_mod_config.c | 6 +- src/modules/quickaccess/e_mod_quickaccess.c | 64 +++++++++---------- src/modules/shot/e_mod_main.c | 10 +-- src/modules/sysinfo/netstatus/netstatus.c | 4 +- src/modules/wireless/wireless.c | 4 +- src/modules/wizard/page_065.c | 24 +++---- src/modules/wizard/page_170.c | 32 +++++----- src/modules/wizard/page_180.c | 2 +- 56 files changed, 412 insertions(+), 412 deletions(-) diff --git a/src/bin/e_about.c b/src/bin/e_about.c index 279722eca..7d07b6ea9 100644 --- a/src/bin/e_about.c +++ b/src/bin/e_about.c @@ -24,28 +24,28 @@ e_about_new(void) (buf, sizeof(buf), "%s%s", _( "<title>Copyright © 2000-2016, by the Enlightenment " - "Development Team</><br>" - "<br>" + "Development Team</><ps/>" + "<ps/>" "We hope you enjoy using this software as much as we enjoyed " - "writing it.<br>" - "<br>" - "To contact us please visit:<br>" - "<hilight>http://www.enlightenment.org</><br>" - "<br>" + "writing it.<ps/>" + "<ps/>" + "To contact us please visit:<ps/>" + "<hilight>http://www.enlightenment.org</><ps/>" + "<ps/>" ), - "All rights reserved.<br>" - "<br>" + "All rights reserved.<ps/>" + "<ps/>" "Redistribution and use in source and binary forms, with or without " "modification, are permitted provided that the following conditions " - "are met:<br>" - "<br>" + "are met:<ps/>" + "<ps/>" "1. Redistributions of source code must retain the above copyright " - "notice, this list of conditions and the following disclaimer.<br>" + "notice, this list of conditions and the following disclaimer.<ps/>" "2. 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.<br>" - "<br>" + "distribution.<ps/>" + "<ps/>" "<hilight>THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR " "IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED " "WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE " @@ -57,7 +57,7 @@ e_about_new(void) "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.</><br>" + "POSSIBILITY OF SUCH DAMAGE.</><ps/>" ); e_obj_dialog_obj_part_text_set(od, "e.textblock.about", buf); @@ -66,7 +66,7 @@ e_about_new(void) if (f) { tbuf = eina_strbuf_new(); - eina_strbuf_append(tbuf, _("<title>The Team</><br><br>")); + eina_strbuf_append(tbuf, _("<title>The Team</><ps/><ps/>")); while (fgets(buf, sizeof(buf), f)) { int len; @@ -95,7 +95,7 @@ e_about_new(void) if (p) *p = 0; } while (p); - eina_strbuf_append_printf(tbuf, "%s<br>", buf); + eina_strbuf_append_printf(tbuf, "%s<ps/>", buf); } } } diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c index 406b0b632..0252b5354 100644 --- a/src/bin/e_actions.c +++ b/src/bin/e_actions.c @@ -337,9 +337,9 @@ ACT_FN_GO(window_kill, EINA_UNUSED) } snprintf(dialog_text, sizeof(dialog_text), - _("You are about to kill %s.<br><br>" - "Please keep in mind that all data from this window<br>" - "which has not yet been saved will be lost!<br><br>" + _("You are about to kill %s.<ps/><ps/>" + "Please keep in mind that all data from this window<ps/>" + "which has not yet been saved will be lost!<ps/><ps/>" "Are you sure you want to kill this window?"), ec->icccm.name); @@ -1972,10 +1972,10 @@ ACT_FN_GO(app, ) if (!dia) return; snprintf(dialog_text, sizeof(dialog_text), - "%s<br><br>" - "Check syntax. You should not put a whitespace right after colon in action params.<br>" - "syntax: [file:file.desktop|name:App Name|generic:Generic Name|exe:exename]<br><br>" - "exe:terminology (O)<br>" + "%s<ps/><ps/>" + "Check syntax. You should not put a whitespace right after colon in action params.<ps/>" + "syntax: [file:file.desktop|name:App Name|generic:Generic Name|exe:exename]<ps/><ps/>" + "exe:terminology (O)<ps/>" "exe: terminology (X)", params); e_dialog_title_set(dia, _("Action Params Syntax Error")); diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c index e56419ba6..31b7f2cf8 100644 --- a/src/bin/e_comp_x.c +++ b/src/bin/e_comp_x.c @@ -584,11 +584,11 @@ _e_comp_x_add_fail_job(void *d EINA_UNUSED) { e_util_dialog_internal (_("Compositor Warning"), - _("Your display driver does not support OpenGL, GLSL<br>" - "shaders or no OpenGL engines were compiled or installed<br>" - "for Evas or Ecore-Evas. Falling back to software engine.<br>" - "<br>" - "You will need an OpenGL 2.0 (or OpenGL ES 2.0) capable<br>" + _("Your display driver does not support OpenGL, GLSL<ps/>" + "shaders or no OpenGL engines were compiled or installed<ps/>" + "for Evas or Ecore-Evas. Falling back to software engine.<ps/>" + "<ps/>" + "You will need an OpenGL 2.0 (or OpenGL ES 2.0) capable<ps/>" "GPU to use OpenGL with compositing.")); } @@ -5577,8 +5577,8 @@ works: fail: /* everything failed - can't lock */ e_util_dialog_show(_("Lock Failed"), - _("Locking the desktop failed because some application<br>" - "has grabbed either the keyboard or the mouse or both<br>" + _("Locking the desktop failed because some application<ps/>" + "has grabbed either the keyboard or the mouse or both<ps/>" "and their grab is unable to be broken.")); return EINA_FALSE; } @@ -5626,8 +5626,8 @@ _e_comp_x_setup(Ecore_X_Window root, int w, int h) { /* e_util_dialog_internal - (_("Compositor Error"), _("Your screen is not in 24/32bit display mode.<br>" - "This is required to be your default depth<br>" + (_("Compositor Error"), _("Your screen is not in 24/32bit display mode.<ps/>" + "This is required to be your default depth<ps/>" "setting for the compositor to work properly.")); ecore_x_composite_render_window_disable(e_comp->win); free(e_comp); diff --git a/src/bin/e_config.c b/src/bin/e_config.c index d50aab5b1..dd375c5a7 100644 --- a/src/bin/e_config.c +++ b/src/bin/e_config.c @@ -1017,14 +1017,14 @@ e_config_load(void) e_config = NULL; reload = 1; ecore_timer_loop_add(1.0, _e_config_cb_timer, - _("Settings data needed upgrading. Your old settings have<br>" - "been wiped and a new set of defaults initialized. This<br>" - "will happen regularly during development, so don't report a<br>" - "bug. This simply means Enlightenment needs new settings<br>" - "data by default for usable functionality that your old<br>" - "settings simply lack. This new set of defaults will fix<br>" - "that by adding it in. You can re-configure things now to your<br>" - "liking. Sorry for the hiccup in your settings.<br>")); + _("Settings data needed upgrading. Your old settings have<ps/>" + "been wiped and a new set of defaults initialized. This<ps/>" + "will happen regularly during development, so don't report a<ps/>" + "bug. This simply means Enlightenment needs new settings<ps/>" + "data by default for usable functionality that your old<ps/>" + "settings simply lack. This new set of defaults will fix<ps/>" + "that by adding it in. You can re-configure things now to your<ps/>" + "liking. Sorry for the hiccup in your settings.<ps/>")); } /* config is too new? odd! suspect corruption? */ else if (e_config->config_version > E_CONFIG_FILE_VERSION) @@ -1034,12 +1034,12 @@ e_config_load(void) e_config = NULL; reload = 1; ecore_timer_loop_add(1.0, _e_config_cb_timer, - _("Your settings are NEWER than Enlightenment. This is very<br>" - "strange. This should not happen unless you downgraded<br>" - "Enlightenment or copied the settings from a place where<br>" - "a newer version of Enlightenment was running. This is bad and<br>" - "as a precaution your settings have been now restored to<br>" - "defaults. Sorry for the inconvenience.<br>")); + _("Your settings are NEWER than Enlightenment. This is very<ps/>" + "strange. This should not happen unless you downgraded<ps/>" + "Enlightenment or copied the settings from a place where<ps/>" + "a newer version of Enlightenment was running. This is bad and<ps/>" + "as a precaution your settings have been now restored to<ps/>" + "defaults. Sorry for the inconvenience.<ps/>")); } if (reload) { @@ -1150,9 +1150,9 @@ e_config_load(void) e_config_profile_set(prof); eina_stringshare_del(prof); ecore_timer_loop_add(1.0, _e_config_cb_timer, - _("Your bindings settings version does not match the current settings version.<br>" - "As a result, all bindings have been reloaded from defaults.<br>" - "Sorry for the inconvenience.<br>")); + _("Your bindings settings version does not match the current settings version.<ps/>" + "As a result, all bindings have been reloaded from defaults.<ps/>" + "Sorry for the inconvenience.<ps/>")); } if (e_config->config_version < E_CONFIG_FILE_VERSION) @@ -1932,14 +1932,14 @@ _e_config_mv_error(const char *from, const char *to) e_dialog_title_set(dia, _("Enlightenment Settings Write Problems")); e_dialog_icon_set(dia, "dialog-error", 64); snprintf(buf, sizeof(buf), - _("Enlightenment has had an error while moving config files<br>" - "from:<br>" - "%s<br>" - "<br>" - "to:<br>" - "%s<br>" - "<br>" - "The rest of the write has been aborted for safety.<br>"), + _("Enlightenment has had an error while moving config files<ps/>" + "from:<ps/>" + "%s<ps/>" + "<ps/>" + "to:<ps/>" + "%s<ps/>" + "<ps/>" + "The rest of the write has been aborted for safety.<ps/>"), from, to); e_dialog_text_set(dia, buf); e_dialog_button_add(dia, _("OK"), NULL, NULL, NULL); @@ -2493,11 +2493,11 @@ _e_config_eet_close_handle(Eet_File *ef, char *file) break; case EET_ERROR_NOT_WRITABLE: - erstr = _("The file is not writable. Perhaps the disk is read-only<br>or you lost permissions to your files."); + erstr = _("The file is not writable. Perhaps the disk is read-only<ps/>or you lost permissions to your files."); break; case EET_ERROR_OUT_OF_MEMORY: - erstr = _("Memory ran out while preparing the write.<br>Please free up memory."); + erstr = _("Memory ran out while preparing the write.<ps/>Please free up memory."); break; case EET_ERROR_WRITE_ERROR: @@ -2505,11 +2505,11 @@ _e_config_eet_close_handle(Eet_File *ef, char *file) break; case EET_ERROR_WRITE_ERROR_FILE_TOO_BIG: - erstr = _("The settings file is too large.<br>It should be very small (a few hundred KB at most)."); + erstr = _("The settings file is too large.<ps/>It should be very small (a few hundred KB at most)."); break; case EET_ERROR_WRITE_ERROR_IO_ERROR: - erstr = _("You have I/O errors on the disk.<br>Maybe it needs replacing?"); + erstr = _("You have I/O errors on the disk.<ps/>Maybe it needs replacing?"); break; case EET_ERROR_WRITE_ERROR_OUT_OF_SPACE: @@ -2578,14 +2578,14 @@ _e_config_eet_close_handle(Eet_File *ef, char *file) e_dialog_title_set(dia, _("Enlightenment Settings Write Problems")); e_dialog_icon_set(dia, "dialog-error", 64); snprintf(buf, sizeof(buf), - _("Enlightenment has had an error while writing<br>" - "its config file.<br>" - "%s<br>" - "<br>" - "The file where the error occurred was:<br>" - "%s<br>" - "<br>" - "This file has been deleted to avoid corrupt data.<br>"), + _("Enlightenment has had an error while writing<ps/>" + "its config file.<ps/>" + "%s<ps/>" + "<ps/>" + "The file where the error occurred was:<ps/>" + "%s<ps/>" + "<ps/>" + "This file has been deleted to avoid corrupt data.<ps/>"), erstr, file); e_dialog_text_set(dia, buf); e_dialog_button_add(dia, _("OK"), NULL, NULL, NULL); diff --git a/src/bin/e_desklock.c b/src/bin/e_desklock.c index 04c652a6d..1e041d9a9 100644 --- a/src/bin/e_desklock.c +++ b/src/bin/e_desklock.c @@ -272,7 +272,7 @@ e_desklock_show(Eina_Bool suspend) if (e_desklock_is_system()) { e_util_dialog_show(_("Error - no PAM support"), - _("No PAM support was built into Enlightenment, so<br>" + _("No PAM support was built into Enlightenment, so<ps/>" "desk locking is disabled.")); return 0; } @@ -606,7 +606,7 @@ _e_desklock_ask_presentation_mode(void) e_dialog_title_set(dia, _("Activate Presentation Mode?")); e_dialog_icon_set(dia, "dialog-ask", 64); e_dialog_text_set(dia, - _("You unlocked your desktop too fast.<br><br>" + _("You unlocked your desktop too fast.<ps/><ps/>" "Would you like to enable <b>presentation</b> mode and " "temporarily disable screen saver, lock and power saving?")); diff --git a/src/bin/e_desktop_editor.c b/src/bin/e_desktop_editor.c index 772692d0f..b6f36790a 100644 --- a/src/bin/e_desktop_editor.c +++ b/src/bin/e_desktop_editor.c @@ -210,12 +210,12 @@ e_desktop_client_edit(E_Client *ec) if ((!bname) && (!bclass)) { e_util_dialog_show(_("Incomplete Window Properties"), - _("The window you are creating an icon for<br>" - "does not contain window name and class<br>" - "properties. Without these, you will have to<br>" - "use the window title instead. This will only<br>" - "work if the window title is the same at<br>" - "the time the window starts up, and does not<br>" + _("The window you are creating an icon for<ps/>" + "does not contain window name and class<ps/>" + "properties. Without these, you will have to<ps/>" + "use the window title instead. This will only<ps/>" + "work if the window title is the same at<ps/>" + "the time the window starts up, and does not<ps/>" "change.")); } #endif diff --git a/src/bin/e_exec.c b/src/bin/e_exec.c index f253e0262..cf8accb8b 100644 --- a/src/bin/e_exec.c +++ b/src/bin/e_exec.c @@ -452,8 +452,8 @@ _e_exec_cb_exec(void *data, Efreet_Desktop *desktop, char *exec, int remaining) free(inst); e_util_dialog_show (_("Run Error"), - _("Enlightenment was unable to change to directory:<br>" - "<br>" + _("Enlightenment was unable to change to directory:<ps/>" + "<ps/>" "%s"), desktop->path); return NULL; @@ -463,8 +463,8 @@ _e_exec_cb_exec(void *data, Efreet_Desktop *desktop, char *exec, int remaining) { e_util_dialog_show (_("Run Error"), - _("Enlightenment was unable to restore to directory:<br>" - "<br>" + _("Enlightenment was unable to restore to directory:<ps/>" + "<ps/>" "%s"), buf); free(inst); @@ -522,8 +522,8 @@ _e_exec_cb_exec(void *data, Efreet_Desktop *desktop, char *exec, int remaining) { free(inst); e_util_dialog_show(_("Run Error"), - _("Enlightenment was unable to fork a child process:<br>" - "<br>" + _("Enlightenment was unable to fork a child process:<ps/>" + "<ps/>" "%s"), exec); return NULL; @@ -713,10 +713,10 @@ _e_exec_cb_exit(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) e_dialog_title_set(dia, _("Application run error")); snprintf(buf, sizeof(buf), - _("Enlightenment was unable to run the application:<br>" - "<br>" - "%s<br>" - "<br>" + _("Enlightenment was unable to run the application:<ps/>" + "<ps/>" + "%s<ps/>" + "<ps/>" "The application failed to start."), ecore_exe_cmd_get(ev->exe)); e_dialog_text_set(dia, buf); diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c index 2047643b7..1dd3ffaca 100644 --- a/src/bin/e_fm.c +++ b/src/bin/e_fm.c @@ -10678,7 +10678,7 @@ _e_fm_overwrite_dialog(int pid, const char *str) e_dialog_title_set(dialog, _("Warning")); e_dialog_icon_set(dialog, "dialog-warning", 64); snprintf(text, sizeof(text), - _("File already exists, overwrite?<br><hilight>%s</hilight>"), str); + _("File already exists, overwrite?<ps/><hilight>%s</hilight>"), str); e_dialog_text_set(dialog, text); elm_win_center(dialog->win, 1, 1); @@ -10844,7 +10844,7 @@ _e_fm_error_dialog(int pid, const char *str) e_dialog_button_focus_num(dialog, 0); e_dialog_title_set(dialog, _("Error")); snprintf(text, sizeof(text), - _("An error occurred while performing an operation.<br>" + _("An error occurred while performing an operation.<ps/>" "%s"), str); @@ -10950,7 +10950,7 @@ _e_fm_device_error_dialog(const char *title, const char *msg, const char *pstr) n = pstr; pstr += strlen(pstr) + 1; m = pstr; - snprintf(text, sizeof(text), "%s<br>%s<br>%s<br>%s<br>%s", msg, u, d, n, m); + snprintf(text, sizeof(text), "%s<ps/>%s<ps/>%s<ps/>%s<ps/>%s", msg, u, d, n, m); e_dialog_text_set(dialog, text); elm_win_center(dialog->win, 1, 1); @@ -11033,13 +11033,13 @@ _e_fm2_file_delete(Evas_Object *obj) } if ((!sel) || (n == 1)) snprintf(text, sizeof(text), - _("Are you sure you want to delete<br>" + _("Are you sure you want to delete<ps/>" "<hilight>%s</hilight>?"), ic->info.file); else if (n == folder_count) snprintf(text, sizeof(text), - _("Are you sure you want to delete<br>" - "<hilight>all</hilight> the %d files in<br>" + _("Are you sure you want to delete<ps/>" + "<hilight>all</hilight> the %d files in<ps/>" "<hilight>%s</hilight>?"), n, ic->sd->realpath); else @@ -11048,11 +11048,11 @@ _e_fm2_file_delete(Evas_Object *obj) * is nonetheless needed for languages who have multiple plurals * depending on the number of files. */ snprintf(text, sizeof(text), - P_("Are you sure you want to delete<br>" - "the %d selected file in<br>" + P_("Are you sure you want to delete<ps/>" + "the %d selected file in<ps/>" "<hilight>%s</hilight>?", - "Are you sure you want to delete<br>" - "the %d selected files in<br>" + "Are you sure you want to delete<ps/>" + "the %d selected files in<ps/>" "<hilight>%s</hilight>?", n), n, ic->sd->realpath); } diff --git a/src/bin/e_grab_dialog.c b/src/bin/e_grab_dialog.c index 37de7b4bd..98a9ec157 100644 --- a/src/bin/e_grab_dialog.c +++ b/src/bin/e_grab_dialog.c @@ -1,11 +1,11 @@ #include "e.h" -#define TEXT_PRESS_KEY_SEQUENCE _("Please press key combination,<br><br>" \ +#define TEXT_PRESS_KEY_SEQUENCE _("Please press key combination,<ps/><ps/>" \ "or <hilight>Escape</hilight> to abort.") -#define TEXT_PRESS_MOUSE_BINIDING_SEQUENCE _("Please hold any modifier you want<br>" \ - "and press any button on your mouse,<br>or roll a" \ +#define TEXT_PRESS_MOUSE_BINIDING_SEQUENCE _("Please hold any modifier you want<ps/>" \ + "and press any button on your mouse,<ps/>or roll a" \ " wheel, to assign mouse binding." \ - "<br>Press <hilight>Escape</hilight> to abort.") + "<ps/>Press <hilight>Escape</hilight> to abort.") static Eina_Bool _e_grab_dialog_key_handler(void *data, int type EINA_UNUSED, Ecore_Event_Key *ev) diff --git a/src/bin/e_import_config_dialog.c b/src/bin/e_import_config_dialog.c index 24fcebb5b..59f493c3f 100644 --- a/src/bin/e_import_config_dialog.c +++ b/src/bin/e_import_config_dialog.c @@ -291,7 +291,7 @@ _import_cb_edje_cc_exit(void *data, EINA_UNUSED int type, void *event) if (ev->exit_code != 0) { e_util_dialog_show(_("Picture Import Error"), - _("Enlightenment was unable to import the picture<br>" + _("Enlightenment was unable to import the picture<ps/>" "due to conversion errors.")); r = 0; } @@ -349,7 +349,7 @@ _import_cb_ok(void *data, E_Dialog *dia EINA_UNUSED) { e_util_dialog_show(_("Import Error"), _("Enlightenment was unable to " - "import the image<br>due to a " + "import the image<ps/>due to a " "copy error.")); } else @@ -359,7 +359,7 @@ _import_cb_ok(void *data, E_Dialog *dia EINA_UNUSED) { e_util_dialog_show(_("Import Error"), _("Enlightenment was unable to " - "import the image.<br><br>" + "import the image.<ps/><ps/>" "Are you sure this is a valid " "image?")); } diff --git a/src/bin/e_import_dialog.c b/src/bin/e_import_dialog.c index cb07a1197..62d5cbb4c 100644 --- a/src/bin/e_import_dialog.c +++ b/src/bin/e_import_dialog.c @@ -72,7 +72,7 @@ _fsel_cb_ok(void *data, E_Dialog *dia EINA_UNUSED) { e_util_dialog_show(_("Import Error"), _("Enlightenment was unable to " - "import the image<br>due to a " + "import the image<ps/>due to a " "copy error.")); } else @@ -82,7 +82,7 @@ _fsel_cb_ok(void *data, E_Dialog *dia EINA_UNUSED) { e_util_dialog_show(_("Import Error"), _("Enlightenment was unable to " - "import the image.<br><br>" + "import the image.<ps/><ps/>" "Are you sure this is a valid " "image?")); } diff --git a/src/bin/e_int_client_remember.c b/src/bin/e_int_client_remember.c index 56bfda3d0..8adfe3016 100644 --- a/src/bin/e_int_client_remember.c +++ b/src/bin/e_int_client_remember.c @@ -341,18 +341,18 @@ _warning_dialog_show(void) e_dialog_title_set(dia, _("Window properties are not a unique match")); e_dialog_text_set (dia, - _("You are trying to ask Enlightenment to remember to apply<br>" - "properties (such as size, location, border style etc.) to<br>" - "a window that <hilight>does not have unique properties</hilight>.<br>" - "<br>" - "This means it shares Name/Class, Transience, Role etc. properties<br>" - "with more than 1 other window on the screen and remembering<br>" - "properties for this window will apply to all other windows<br>" - "that match these properties.<br>" - "<br>" - "This is just a warning in case you did not intend this to happen.<br>" - "If you did, simply press <hilight>Apply</hilight> or <hilight>OK</hilight> buttons<br>" - "and your settings will be accepted. Press <hilight>Cancel</hilight> if you<br>" + _("You are trying to ask Enlightenment to remember to apply<ps/>" + "properties (such as size, location, border style etc.) to<ps/>" + "a window that <hilight>does not have unique properties</hilight>.<ps/>" + "<ps/>" + "This means it shares Name/Class, Transience, Role etc. properties<ps/>" + "with more than 1 other window on the screen and remembering<ps/>" + "properties for this window will apply to all other windows<ps/>" + "that match these properties.<ps/>" + "<ps/>" + "This is just a warning in case you did not intend this to happen.<ps/>" + "If you did, simply press <hilight>Apply</hilight> or <hilight>OK</hilight> buttons<ps/>" + "and your settings will be accepted. Press <hilight>Cancel</hilight> if you<ps/>" "are not sure and nothing will be affected.") ); e_dialog_button_add(dia, _("OK"), NULL, NULL, NULL); @@ -544,10 +544,10 @@ _advanced_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfd e_dialog_title_set(dia, _("No match properties set")); e_dialog_text_set (dia, - _("You are trying to ask Enlightenment to remember to apply<br>" - "properties (such as size, location, border style etc.) to<br>" - "a window <hilight>without specifying how to remember it</hilight>.<br>" - "<br>" + _("You are trying to ask Enlightenment to remember to apply<ps/>" + "properties (such as size, location, border style etc.) to<ps/>" + "a window <hilight>without specifying how to remember it</hilight>.<ps/>" + "<ps/>" "You must specify at least 1 way of remembering this window.") ); e_dialog_button_add(dia, _("OK"), NULL, NULL, NULL); diff --git a/src/bin/e_int_config_comp.c b/src/bin/e_int_config_comp.c index cb7c10b50..d2b79d634 100644 --- a/src/bin/e_int_config_comp.c +++ b/src/bin/e_int_config_comp.c @@ -150,8 +150,8 @@ _advanced_features_changed(E_Comp_Config *conf) conf->enable_advanced_features = !conf->enable_advanced_features; if (conf->enable_advanced_features) e_util_dialog_internal(_("WARNING"), - _("This option WILL break your desktop if you don't know what you're doing.<br>" - "Do not file bugs about anything that occurs with this option enabled.<br>" + _("This option WILL break your desktop if you don't know what you're doing.<ps/>" + "Do not file bugs about anything that occurs with this option enabled.<ps/>" "You have been warned.")); } diff --git a/src/bin/e_intl.c b/src/bin/e_intl.c index 82dc718e9..7d5f8f345 100644 --- a/src/bin/e_intl.c +++ b/src/bin/e_intl.c @@ -353,11 +353,11 @@ e_intl_input_method_set(const char *imc_path) if ((!_e_intl_input_method_exec) || (!ecore_exe_pid_get(_e_intl_input_method_exec))) e_util_dialog_show(_("Input Method Error"), - _("Error starting the input method executable<br><br>" - "please make sure that your input<br>" - "method configuration is correct and<br>" - "that your configuration's<br>" - "executable is in your PATH<br>")); + _("Error starting the input method executable<ps/><ps/>" + "please make sure that your input<ps/>" + "method configuration is correct and<ps/>" + "that your configuration's<ps/>" + "executable is in your PATH<ps/>")); } e_intl_input_method_config_free(imc); } diff --git a/src/bin/e_main.c b/src/bin/e_main.c index ed076f72b..98676ca18 100644 --- a/src/bin/e_main.c +++ b/src/bin/e_main.c @@ -1751,32 +1751,32 @@ _e_main_modules_load(Eina_Bool safe_mode) e_object_del(E_OBJECT(m)); e_error_message_show - (_("Enlightenment crashed early on start and has<br>" - "been restarted. There was an error loading the<br>" - "module named: %s. This module has been disabled<br>" + (_("Enlightenment crashed early on start and has<ps/>" + "been restarted. There was an error loading the<ps/>" + "module named: %s. This module has been disabled<ps/>" "and will not be loaded."), crashmodule); e_util_dialog_show (_("Enlightenment crashed early on start and has been restarted"), - _("Enlightenment crashed early on start and has been restarted.<br>" - "There was an error loading the module named: %s<br><br>" + _("Enlightenment crashed early on start and has been restarted.<ps/>" + "There was an error loading the module named: %s<ps/><ps/>" "This module has been disabled and will not be loaded."), crashmodule); e_module_all_load(); } else { e_error_message_show - (_("Enlightenment crashed early on start and has<br>" - "been restarted. All modules have been disabled<br>" - "and will not be loaded to help remove any problem<br>" - "modules from your configuration. The module<br>" - "configuration dialog should let you select your<br>" + (_("Enlightenment crashed early on start and has<ps/>" + "been restarted. All modules have been disabled<ps/>" + "and will not be loaded to help remove any problem<ps/>" + "modules from your configuration. The module<ps/>" + "configuration dialog should let you select your<ps/>" "modules again.\n")); e_util_dialog_show (_("Enlightenment crashed early on start and has been restarted"), - _("Enlightenment crashed early on start and has been restarted.<br>" - "All modules have been disabled and will not be loaded to help<br>" - "remove any problem modules from your configuration.<br><br>" - "The module configuration dialog should let you select your<br>" + _("Enlightenment crashed early on start and has been restarted.<ps/>" + "All modules have been disabled and will not be loaded to help<ps/>" + "remove any problem modules from your configuration.<ps/><ps/>" + "The module configuration dialog should let you select your<ps/>" "modules again.")); } mod_init_end = ecore_event_handler_add(E_EVENT_MODULE_INIT_END, _e_main_modules_load_after, NULL); diff --git a/src/bin/e_module.c b/src/bin/e_module.c index 3f78d0ed9..96ddcb67a 100644 --- a/src/bin/e_module.c +++ b/src/bin/e_module.c @@ -385,9 +385,9 @@ e_module_new(const char *name) if (!modpath) { snprintf(body, sizeof(body), - _("There was an error loading the module named: %s<br>" - "No module named %s could be found in the<br>" - "module search directories.<br>"), name, buf); + _("There was an error loading the module named: %s<ps/>" + "No module named %s could be found in the<ps/>" + "module search directories.<ps/>"), name, buf); _e_module_dialog_disable_create(_("Error loading Module"), body, m); m->error = 1; goto init_done; @@ -396,11 +396,11 @@ e_module_new(const char *name) if (!m->handle) { snprintf(body, sizeof(body), - _("There was an error loading the module named: %s<br>" - "The full path to this module is:<br>" - "%s<br>" - "The error reported was:<br>" - "%s<br>"), name, buf, dlerror()); + _("There was an error loading the module named: %s<ps/>" + "The full path to this module is:<ps/>" + "%s<ps/>" + "The error reported was:<ps/>" + "%s<ps/>"), name, buf, dlerror()); _e_module_dialog_disable_create(_("Error loading Module"), body, m); m->error = 1; goto init_done; @@ -414,11 +414,11 @@ e_module_new(const char *name) if ((!m->func.init) || (!m->api)) { snprintf(body, sizeof(body), - _("There was an error loading the module named: %s<br>" - "The full path to this module is:<br>" - "%s<br>" - "The error reported was:<br>" - "%s<br>"), + _("There was an error loading the module named: %s<ps/>" + "The full path to this module is:<ps/>" + "%s<ps/>" + "The error reported was:<ps/>" + "%s<ps/>"), name, buf, _("Module does not contain all needed functions")); _e_module_dialog_disable_create(_("Error loading Module"), body, m); m->api = NULL; @@ -434,9 +434,9 @@ e_module_new(const char *name) if (m->api->version != E_MODULE_API_VERSION) { snprintf(body, sizeof(body), - _("Module API Error<br>Error initializing Module: %s<br>" - "It requires a module API version of: %i.<br>" - "The module API advertized by Enlightenment is: %i.<br>"), + _("Module API Error<ps/>Error initializing Module: %s<ps/>" + "It requires a module API version of: %i.<ps/>" + "The module API advertized by Enlightenment is: %i.<ps/>"), _(m->api->name), m->api->version, E_MODULE_API_VERSION); snprintf(title, sizeof(title), _("Enlightenment %s Module"), @@ -801,8 +801,8 @@ _e_module_dialog_disable_show(const char *title, const char *body, E_Module *m) dia = e_dialog_new(NULL, "E", "_module_unload_dialog"); - snprintf(buf, sizeof(buf), "%s<br>%s", body, - _("What action should be taken with this module?<br>")); + snprintf(buf, sizeof(buf), "%s<ps/>%s", body, + _("What action should be taken with this module?<ps/>")); e_dialog_title_set(dia, title); e_dialog_icon_set(dia, "enlightenment", 64); @@ -961,16 +961,16 @@ _e_module_whitelist_dialog_timer(void *badl) "E", "_module_whitelist_dialog"); sbuf = eina_strbuf_new(); eina_strbuf_append - (sbuf, _("The following modules are not standard ones for<br>" - "Enlightenment and may cause bugs and crashes.<br>" - "Please remove them before reporting any bugs.<br>" - "<br>" - "The module list is as follows:<br>" - "<br>")); + (sbuf, _("The following modules are not standard ones for<ps/>" + "Enlightenment and may cause bugs and crashes.<ps/>" + "Please remove them before reporting any bugs.<ps/>" + "<ps/>" + "The module list is as follows:<ps/>" + "<ps/>")); EINA_LIST_FOREACH(badl, l, s) { eina_strbuf_append(sbuf, s); - eina_strbuf_append(sbuf, "<br>"); + eina_strbuf_append(sbuf, "<ps/>"); } e_dialog_title_set(dia, _("Unstable module tainting")); diff --git a/src/bin/e_remember.c b/src/bin/e_remember.c index 2119f50ad..f404ef0a8 100644 --- a/src/bin/e_remember.c +++ b/src/bin/e_remember.c @@ -49,9 +49,9 @@ e_remember_init(E_Startup_Mode mode) if (!ecore_exe_run(rem->prop.command, NULL)) { e_util_dialog_show(_("Run Error"), - _("Enlightenment was unable to fork a child process:<br>" - "<br>" - "%s<br>"), + _("Enlightenment was unable to fork a child process:<ps/>" + "<ps/>" + "%s<ps/>"), rem->prop.command); } } diff --git a/src/bin/e_screensaver.c b/src/bin/e_screensaver.c index 3243ce847..89bca5e28 100644 --- a/src/bin/e_screensaver.c +++ b/src/bin/e_screensaver.c @@ -223,7 +223,7 @@ _e_screensaver_ask_presentation_mode(void) e_dialog_title_set(dia, _("Activate Presentation Mode?")); e_dialog_icon_set(dia, "dialog-ask", 64); e_dialog_text_set(dia, - _("You disabled the screensaver too fast.<br><br>" + _("You disabled the screensaver too fast.<ps/><ps/>" "Would you like to enable <b>presentation</b> mode and " "temporarily disable screen saver, lock and power saving?")); diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c index 36191c050..c08f33c91 100644 --- a/src/bin/e_shelf.c +++ b/src/bin/e_shelf.c @@ -899,8 +899,8 @@ e_shelf_position_calc(E_Shelf *es) break; } if (err) - e_util_dialog_show(_("Shelf Autohide Error"), _("Shelf autohiding will not work properly<br>" - "with the current configuration; set your shelf to<br>" + e_util_dialog_show(_("Shelf Autohide Error"), _("Shelf autohiding will not work properly<ps/>" + "with the current configuration; set your shelf to<ps/>" "\"Below Everything\" or disable autohiding.")); break; } while (0); @@ -1725,8 +1725,8 @@ _e_shelf_cb_menu_delete(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_ e_object_ref(E_OBJECT(es)); e_confirm_dialog_show(_("Are you sure you want to delete this shelf?"), "enlightenment", - _("You requested to delete this shelf.<br>" - "<br>" + _("You requested to delete this shelf.<ps/>" + "<ps/>" "Are you sure you want to delete it?"), _("Delete"), _("Keep"), _e_shelf_cb_confirm_dialog_yes, NULL, data, NULL, diff --git a/src/bin/e_sys.c b/src/bin/e_sys.c index 29b0422bc..58d7cf720 100644 --- a/src/bin/e_sys.c +++ b/src/bin/e_sys.c @@ -751,11 +751,11 @@ _e_sys_logout_confirm_dialog_update(int remaining) } snprintf(txt, sizeof(txt), - _("Logout is taking too long.<br>" - "Some applications refuse to close.<br>" - "Do you want to finish the logout<br>" - "anyway without closing these<br>" - "applications first?<br><br>" + _("Logout is taking too long.<ps/>" + "Some applications refuse to close.<ps/>" + "Do you want to finish the logout<ps/>" + "anyway without closing these<ps/>" + "applications first?<ps/><ps/>" "Auto logout in %d seconds."), remaining); e_dialog_text_set(_e_sys_logout_confirm_dialog, txt); @@ -894,33 +894,33 @@ _e_sys_current_action(void) switch (_e_sys_action_current) { case E_SYS_LOGOUT: - e_dialog_text_set(dia, _("Logging out.<br>" - "You cannot perform other system actions<br>" + e_dialog_text_set(dia, _("Logging out.<ps/>" + "You cannot perform other system actions<ps/>" "once a logout has begun.")); break; case E_SYS_HALT: case E_SYS_HALT_NOW: - e_dialog_text_set(dia, _("Powering off.<br>" - "You cannot perform any other system actions<br>" + e_dialog_text_set(dia, _("Powering off.<ps/>" + "You cannot perform any other system actions<ps/>" "once a shutdown has been started.")); break; case E_SYS_REBOOT: - e_dialog_text_set(dia, _("Resetting.<br>" - "You cannot perform any other system actions<br>" + e_dialog_text_set(dia, _("Resetting.<ps/>" + "You cannot perform any other system actions<ps/>" "once a reboot has begun.")); break; case E_SYS_SUSPEND: - e_dialog_text_set(dia, _("Suspending.<br>" - "You cannot perform any other system actions<br>" + e_dialog_text_set(dia, _("Suspending.<ps/>" + "You cannot perform any other system actions<ps/>" "until suspend is complete.")); break; case E_SYS_HIBERNATE: - e_dialog_text_set(dia, _("Hibernating.<br>" - "You cannot perform any other system actions<br>" + e_dialog_text_set(dia, _("Hibernating.<ps/>" + "You cannot perform any other system actions<ps/>" "until hibernation is complete.")); break; diff --git a/src/bin/e_test.c b/src/bin/e_test.c index 0cfe1afde..3efd7733a 100644 --- a/src/bin/e_test.c +++ b/src/bin/e_test.c @@ -152,7 +152,7 @@ _e_test_internal(void) dia = e_dialog_new(c, "E", "_test"); e_object_del_attach_func_set(E_OBJECT(dia), _e_test_dialog_del); e_dialog_title_set(dia, "A Test Dialog"); - e_dialog_text_set(dia, "A Test Dialog<br>And another line<br><hilight>Hilighted Text</hilight>"); + e_dialog_text_set(dia, "A Test Dialog<ps/>And another line<ps/><hilight>Hilighted Text</hilight>"); e_dialog_icon_set(dia, "preference-plugin", 64); e_dialog_button_add(dia, "OK", NULL, NULL, NULL); e_dialog_button_add(dia, "Apply", "system-restart", NULL, NULL); @@ -411,16 +411,16 @@ _e_test_internal(void) #if 0 e_widget_textblock_markup_set(o, "<title>A title</title>" - "This is some text<br>" - "Blah blah<br>" - "<hilight>hilighted text</hilight><br>" - "<br>" - "More lines of text<br>" - "And yet more lines of text<br>" - "A very very long line of text that SHOULD be getting word wrapped because it is so long.<br>" - "And another line<br>" - "Some more<br>" - "Smelly fish on a stick<br>" + "This is some text<ps/>" + "Blah blah<ps/>" + "<hilight>hilighted text</hilight><ps/>" + "<ps/>" + "More lines of text<ps/>" + "And yet more lines of text<ps/>" + "A very very long line of text that SHOULD be getting word wrapped because it is so long.<ps/>" + "And another line<ps/>" + "Some more<ps/>" + "Smelly fish on a stick<ps/>" "Whatever." ); #else diff --git a/src/bin/e_update.c b/src/bin/e_update.c index a42470c4e..45e577203 100644 --- a/src/bin/e_update.c +++ b/src/bin/e_update.c @@ -78,14 +78,14 @@ _new_version(const char *ver) e_dialog_icon_set(dialog, "dialog-warning", 64); snprintf(text, sizeof(text), - _("Your enlightenment version is<br>" - "not the current latest release.<br>" - "The latest version is:<br>" - "<br>" - "%s<br>" - "<br>" - "Please visit www.enlightenment.org<br>" - "or update your system packages<br>" + _("Your enlightenment version is<ps/>" + "not the current latest release.<ps/>" + "The latest version is:<ps/>" + "<ps/>" + "%s<ps/>" + "<ps/>" + "Please visit www.enlightenment.org<ps/>" + "or update your system packages<ps/>" "to get a new version."), ver); e_dialog_text_set(dialog, text); elm_win_center(dialog->win, 1, 1); diff --git a/src/bin/e_utils.c b/src/bin/e_utils.c index 99e092f11..afe29e37c 100644 --- a/src/bin/e_utils.c +++ b/src/bin/e_utils.c @@ -132,9 +132,9 @@ e_util_immortal_check(void) if (wins) { e_util_dialog_show(_("Cannot exit - immortal windows."), - _("Some windows are left still around with the Lifespan lock enabled. This means<br>" - "that Enlightenment will not allow itself to exit until these windows have<br>" - "been closed or have the lifespan lock removed.<br>")); + _("Some windows are left still around with the Lifespan lock enabled. This means<ps/>" + "that Enlightenment will not allow itself to exit until these windows have<ps/>" + "been closed or have the lifespan lock removed.<ps/>")); /* FIXME: should really display a list of these lifespan locked */ /* windows in a dialog and let the user disable their locks in */ /* this dialog */ @@ -696,7 +696,7 @@ e_util_dir_check(const char *dir) { if (!ecore_file_mkpath(dir)) { - e_util_dialog_show(_("Error creating directory"), _("Failed to create directory: %s .<br>Check that you have correct permissions set."), dir); + e_util_dialog_show(_("Error creating directory"), _("Failed to create directory: %s .<ps/>Check that you have correct permissions set."), dir); return 0; } } @@ -704,7 +704,7 @@ e_util_dir_check(const char *dir) { if (!ecore_file_is_dir(dir)) { - e_util_dialog_show(_("Error creating directory"), _("Failed to create directory: %s .<br>A file of that name already exists."), dir); + e_util_dialog_show(_("Error creating directory"), _("Failed to create directory: %s .<ps/>A file of that name already exists."), dir); return 0; } } @@ -871,14 +871,14 @@ _e_util_conf_timer_old(void *data) { char *module_name = data; char buf[4096]; - char *msg = _("Configuration data needed upgrading. Your old configuration<br>" - "has been wiped and a new set of defaults initialized. This<br>" - "will happen regularly during development, so don't report a<br>" - "bug. This means the module needs new configuration<br>" - "data by default for usable functionality that your old<br>" - "configuration lacked. This new set of defaults will fix<br>" - "that by adding it in. You can re-configure things now to your<br>" - "liking. Sorry for the hiccup in your configuration.<br>"); + char *msg = _("Configuration data needed upgrading. Your old configuration<ps/>" + "has been wiped and a new set of defaults initialized. This<ps/>" + "will happen regularly during development, so don't report a<ps/>" + "bug. This means the module needs new configuration<ps/>" + "data by default for usable functionality that your old<ps/>" + "configuration lacked. This new set of defaults will fix<ps/>" + "that by adding it in. You can re-configure things now to your<ps/>" + "liking. Sorry for the hiccup in your configuration.<ps/>"); snprintf(buf, sizeof(buf), N_("%s Configuration Updated"), module_name); e_util_dialog_internal(buf, msg); @@ -895,14 +895,14 @@ _e_util_conf_timer_new(void *data) char *msg = _("Your module configuration is NEWER " "than the module version. This is " - "very<br>strange. This should not happen unless" - " you downgraded<br>the module or " + "very<ps/>strange. This should not happen unless" + " you downgraded<ps/>the module or " "copied the configuration from a place where" - "<br>a newer version of the module " - "was running. This is bad and<br>as a " + "<ps/>a newer version of the module " + "was running. This is bad and<ps/>as a " "precaution your configuration has been now " - "restored to<br>defaults. Sorry for the " - "inconvenience.<br>"); + "restored to<ps/>defaults. Sorry for the " + "inconvenience.<ps/>"); snprintf(buf, sizeof(buf), _("%s Configuration Updated"), module_name); e_util_dialog_internal(buf, msg); diff --git a/src/bin/e_widget_filepreview.c b/src/bin/e_widget_filepreview.c index 63ca8ee0d..fbffa9d18 100644 --- a/src/bin/e_widget_filepreview.c +++ b/src/bin/e_widget_filepreview.c @@ -1089,28 +1089,28 @@ _e_wid_fprev_preview_font(E_Widget_Data *wd) "<font=%s>" "<font_size=28>" - "28 - ABC abc 0123 @!?#$*{}<br>" - "The quick brown fox jumps.<br>" + "28 - ABC abc 0123 @!?#$*{}<ps/>" + "The quick brown fox jumps.<ps/>" "<font_size=20>" - "20 - ABC abc 0123 @!?#$*{}<br>" - "The quick brown fox jumps.<br>" + "20 - ABC abc 0123 @!?#$*{}<ps/>" + "The quick brown fox jumps.<ps/>" "<font_size=16>" - "16 - ABC abc 0123 @!?#$*{}<br>" - "The quick brown fox jumps.<br>" + "16 - ABC abc 0123 @!?#$*{}<ps/>" + "The quick brown fox jumps.<ps/>" "<font_size=12>" - "12 - ABC abc 0123 @!?#$*{}<br>" - "The quick brown fox jumps.<br>" + "12 - ABC abc 0123 @!?#$*{}<ps/>" + "The quick brown fox jumps.<ps/>" "<font_size=10>" - "10 - ABC abc 0123 @!?#$*{}<br>" - "The quick brown fox jumps.<br>" + "10 - ABC abc 0123 @!?#$*{}<ps/>" + "The quick brown fox jumps.<ps/>" "<font_size=8>" - "8 - ABC abc 0123 @!?#$*{}<br>" - "The quick brown fox jumps.<br>" + "8 - ABC abc 0123 @!?#$*{}<ps/>" + "The quick brown fox jumps.<ps/>" , escaped ); edje_object_part_text_set(o, "e.textblock.message", buf); diff --git a/src/bin/e_widget_textblock.c b/src/bin/e_widget_textblock.c index 1973b11a1..6133097f3 100644 --- a/src/bin/e_widget_textblock.c +++ b/src/bin/e_widget_textblock.c @@ -61,7 +61,7 @@ e_widget_textblock_plain_set(Evas_Object *obj, const char *text) } mlen = strlen(text); /* need to look for these and replace with a new string (on the right) - * '\n' -> "<br>" + * '\n' -> "<ps/>" * '\t' -> " " * '<' -> "<" * '>' -> ">" @@ -86,7 +86,7 @@ e_widget_textblock_plain_set(Evas_Object *obj, const char *text) { if (*p == '\n') { - strcpy(d, "<br>"); + strcpy(d, "<ps/>"); d += 4 - 1; } else if (*p == '\t') diff --git a/src/modules/conf_bindings/e_int_config_acpibindings.c b/src/modules/conf_bindings/e_int_config_acpibindings.c index fb0039a7d..a13a61c2f 100644 --- a/src/modules/conf_bindings/e_int_config_acpibindings.c +++ b/src/modules/conf_bindings/e_int_config_acpibindings.c @@ -522,7 +522,7 @@ _cb_add_binding(void *data, e_dialog_icon_set(grab_dlg, "preferences-system-power-management", 48); e_dialog_text_set(grab_dlg, _("Please trigger the ACPI event you wish to bind to, " - "<br><br>or <hilight>Escape</hilight> to abort.")); + "<ps/><ps/>or <hilight>Escape</hilight> to abort.")); elm_win_center(grab_dlg->win, 1, 1); elm_win_borderless_set(grab_dlg->win, EINA_TRUE); diff --git a/src/modules/conf_bindings/e_int_config_edgebindings.c b/src/modules/conf_bindings/e_int_config_edgebindings.c index 49fdaf740..854ab5ea5 100644 --- a/src/modules/conf_bindings/e_int_config_edgebindings.c +++ b/src/modules/conf_bindings/e_int_config_edgebindings.c @@ -2,10 +2,10 @@ #include "e.h" #define TEXT_NONE_ACTION_EDGE _("<None>") -#define TEXT_PRESS_EDGE_SEQUENCE _("Please select an edge,<br>" \ - "or click <hilight>Close</hilight> to abort.<br><br>" \ - "You can either specify a delay of this<br> action using " \ - "the slider, or make it<br>respond to edge clicks:" \ +#define TEXT_PRESS_EDGE_SEQUENCE _("Please select an edge,<ps/>" \ + "or click <hilight>Close</hilight> to abort.<ps/><ps/>" \ + "You can either specify a delay of this<ps/> action using " \ + "the slider, or make it<ps/>respond to edge clicks:" \ ) #define TEXT_NO_PARAMS _("<None>") @@ -1229,8 +1229,8 @@ _edge_grab_wnd_selection_apply(E_Config_Dialog_Data *cfdata) if (actd) label = _(actd->act_name); e_util_dialog_show(_("Edge Binding Error"), - _("The edge binding that you chose is already used by<br>" - "<hilight>%s</hilight> action.<br>" + _("The edge binding that you chose is already used by<ps/>" + "<hilight>%s</hilight> action.<ps/>" "Please choose another edge to bind."), label ? label : _("Unknown")); } diff --git a/src/modules/conf_bindings/e_int_config_keybindings.c b/src/modules/conf_bindings/e_int_config_keybindings.c index 995a42409..14c987a30 100644 --- a/src/modules/conf_bindings/e_int_config_keybindings.c +++ b/src/modules/conf_bindings/e_int_config_keybindings.c @@ -978,8 +978,8 @@ _grab_key_down_cb(void *data, e_util_dialog_show(_("Binding Key Error"), _("The binding key combination that you chose" - " is already used by <br>" - "<hilight>%s</hilight> action.<br>" + " is already used by <ps/>" + "<hilight>%s</hilight> action.<ps/>" "Please choose another binding key combination."), label ? label : _("Unknown")); #endif diff --git a/src/modules/conf_bindings/e_int_config_mousebindings.c b/src/modules/conf_bindings/e_int_config_mousebindings.c index f14bd4a0f..e013f991a 100644 --- a/src/modules/conf_bindings/e_int_config_mousebindings.c +++ b/src/modules/conf_bindings/e_int_config_mousebindings.c @@ -3,10 +3,10 @@ #define TEXT_NO_PARAMS _("<None>") #define EXAMPLE_STRING "example : " -#define TEXT_PRESS_MOUSE_BINIDING_SEQUENCE _("Please hold any modifier you want<br>" \ - "and press any button on your mouse,<br>or roll a" \ +#define TEXT_PRESS_MOUSE_BINIDING_SEQUENCE _("Please hold any modifier you want<ps/>" \ + "and press any button on your mouse,<ps/>or roll a" \ " wheel, to assign mouse binding." \ - "<br>Press <hilight>Escape</hilight> to abort.") + "<ps/>Press <hilight>Escape</hilight> to abort.") static void *_create_data(E_Config_Dialog *cfd); static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); @@ -243,8 +243,8 @@ _basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata { if ((!bw->modifiers) && ((bw->context == E_BINDING_CONTEXT_WINDOW) || (bw->context == E_BINDING_CONTEXT_ANY))) { - const char *msg = _("Unable to set a mouse wheel binding without modifiers<br>" - "on a window: conflict with existing edje signal bindings.<br>" + const char *msg = _("Unable to set a mouse wheel binding without modifiers<ps/>" + "on a window: conflict with existing edje signal bindings.<ps/>" "FIXME!!!"); e_util_dialog_internal(_("Mouse Binding Error"), msg); cfdata->binding.wheel = eina_list_remove_list(cfdata->binding.wheel, l); diff --git a/src/modules/conf_bindings/e_int_config_signalbindings.c b/src/modules/conf_bindings/e_int_config_signalbindings.c index 82e456a29..cf2fa2a49 100644 --- a/src/modules/conf_bindings/e_int_config_signalbindings.c +++ b/src/modules/conf_bindings/e_int_config_signalbindings.c @@ -569,8 +569,8 @@ _signal_add_cb_ok(void *data, E_Dialog *dia) eina_stringshare_del(sig); eina_stringshare_del(src); e_util_dialog_show(_("Signal Binding Error"), - _("The signal and source that you entered are already used by<br>" - "<hilight>%s</hilight> action.<br>"), + _("The signal and source that you entered are already used by<ps/>" + "<hilight>%s</hilight> action.<ps/>"), bi->action ?: _("Unknown")); e_object_del(E_OBJECT(dia)); return; diff --git a/src/modules/conf_dialogs/e_int_config_profiles.c b/src/modules/conf_dialogs/e_int_config_profiles.c index 938c83057..b094f75c0 100644 --- a/src/modules/conf_dialogs/e_int_config_profiles.c +++ b/src/modules/conf_dialogs/e_int_config_profiles.c @@ -333,7 +333,7 @@ _cb_delete(void *data, void *data2 EINA_UNUSED) d->cfdata = data; snprintf(buf, sizeof(buf), - _("You want to delete the \"%s\" profile.<br><br>" + _("You want to delete the \"%s\" profile.<ps/><ps/>" "Are you sure?"), d->cfdata->sel_profile); e_confirm_dialog_show(_("Are you sure you want to delete this profile?"), "dialog-warning", buf, _("Delete"), _("Keep"), diff --git a/src/modules/conf_intl/e_int_config_imc.c b/src/modules/conf_intl/e_int_config_imc.c index 45f77075b..f66d5f2e8 100644 --- a/src/modules/conf_intl/e_int_config_imc.c +++ b/src/modules/conf_intl/e_int_config_imc.c @@ -269,8 +269,8 @@ _e_imc_setup_cb(void *data, void *data2 EINA_UNUSED) if (!exe) { e_util_dialog_show(_("Run Error"), - _("Enlightenment was unable to fork a child process:<br>" - "<br>%s<br>"), + _("Enlightenment was unable to fork a child process:<ps/>" + "<ps/>%s<ps/>"), cmd); } } @@ -523,8 +523,8 @@ _e_imc_adv_setup_cb(void *data, void *data2 EINA_UNUSED) if (!exe) { e_util_dialog_show(_("Run Error"), - _("Enlightenment was unable to fork a child process:<br>" - "<br>%s<br>"), cmd); + _("Enlightenment was unable to fork a child process:<ps/>" + "<ps/>%s<ps/>"), cmd); } } } diff --git a/src/modules/conf_intl/e_int_config_imc_import.c b/src/modules/conf_intl/e_int_config_imc_import.c index e9fdfd8ef..75d789540 100644 --- a/src/modules/conf_intl/e_int_config_imc_import.c +++ b/src/modules/conf_intl/e_int_config_imc_import.c @@ -262,7 +262,7 @@ _imc_import_cb_ok(void *data, void *data2 EINA_UNUSED) { e_util_dialog_show(_("Input Method Config Import Error"), _("Enlightenment was unable to import " - "the configuration.<br><br>Are " + "the configuration.<ps/><ps/>Are " "you sure this is really a valid " "configuration?")); } @@ -278,7 +278,7 @@ _imc_import_cb_ok(void *data, void *data2 EINA_UNUSED) { e_util_dialog_show(_("Input Method Config Import Error"), _("Enlightenment was unable to import " - "the configuration<br>due to a copy " + "the configuration<ps/>due to a copy " "error.")); } else diff --git a/src/modules/conf_intl/e_int_config_intl.c b/src/modules/conf_intl/e_int_config_intl.c index 2843900fa..fe7c05eee 100644 --- a/src/modules/conf_intl/e_int_config_intl.c +++ b/src/modules/conf_intl/e_int_config_intl.c @@ -941,13 +941,13 @@ _lc_check(void) buf2[0] = 0; - if (getenv("LC_CTYPE")) strcat(buf2, "<br>LC_CTYPE"); - if (getenv("LC_NUMERIC")) strcat(buf2, "<br>LC_NUMERIC"); - if (getenv("LC_TIME")) strcat(buf2, "<br>LC_TIME"); - if (getenv("LC_COLLATE")) strcat(buf2, "<br>LC_COLLATE"); - if (getenv("LC_MONETARY")) strcat(buf2, "<br>LC_MONETARY"); - if (getenv("LC_MESSAGES")) strcat(buf2, "<br>LC_MESSAGES"); - if (getenv("LC_ALL")) strcat(buf2, "<br>LC_ALL"); + if (getenv("LC_CTYPE")) strcat(buf2, "<ps/>LC_CTYPE"); + if (getenv("LC_NUMERIC")) strcat(buf2, "<ps/>LC_NUMERIC"); + if (getenv("LC_TIME")) strcat(buf2, "<ps/>LC_TIME"); + if (getenv("LC_COLLATE")) strcat(buf2, "<ps/>LC_COLLATE"); + if (getenv("LC_MONETARY")) strcat(buf2, "<ps/>LC_MONETARY"); + if (getenv("LC_MESSAGES")) strcat(buf2, "<ps/>LC_MESSAGES"); + if (getenv("LC_ALL")) strcat(buf2, "<ps/>LC_ALL"); if (!buf2[0]) { @@ -955,13 +955,13 @@ _lc_check(void) return; } - snprintf(buf, sizeof(buf), _("You have some extra locale environment<br>" - "variables set that may interfere with<br>" - "correct display of your chosen language.<br>" - "If you don't want these affected, use the<br>" - "Environment variable settings to unset them.<br>" - "The variables that may affect you are<br>" - "as follows:<br>" + snprintf(buf, sizeof(buf), _("You have some extra locale environment<ps/>" + "variables set that may interfere with<ps/>" + "correct display of your chosen language.<ps/>" + "If you don't want these affected, use the<ps/>" + "Environment variable settings to unset them.<ps/>" + "The variables that may affect you are<ps/>" + "as follows:<ps/>" "%s"), buf2); dia = e_util_dialog_internal(_("Possible Locale problems"), buf); e_object_free_attach_func_set(E_OBJECT(dia), _lc_check_del); diff --git a/src/modules/conf_theme/e_int_config_theme.c b/src/modules/conf_theme/e_int_config_theme.c index 730c614a8..7a3bd246f 100644 --- a/src/modules/conf_theme/e_int_config_theme.c +++ b/src/modules/conf_theme/e_int_config_theme.c @@ -252,9 +252,9 @@ _e_int_theme_preview_set(Evas_Object *preview, const char *file) o = edje_object_add(e); _e_int_theme_edje_file_set(o, file, "e/widgets/dialog/text"); edje_object_part_text_set(o, "e.textblock.message", - "<hilight>Welcome to enlightenment.</hilight><br>" - "<br>" - "This is a sample set of content for a<br>" + "<hilight>Welcome to enlightenment.</hilight><ps/>" + "<ps/>" + "This is a sample set of content for a<ps/>" "theme to test to see what it looks like."); evas_object_show(o); edje_object_part_swallow(po, "e.swallow.content", o); diff --git a/src/modules/conf_theme/e_int_config_theme_import.c b/src/modules/conf_theme/e_int_config_theme_import.c index 98b831826..2d56306c8 100644 --- a/src/modules/conf_theme/e_int_config_theme_import.c +++ b/src/modules/conf_theme/e_int_config_theme_import.c @@ -261,7 +261,7 @@ _theme_import_cb_ok(void *data, void *data2 EINA_UNUSED) { e_util_dialog_show(_("Theme Import Error"), _("Enlightenment was unable to import " - "the theme.<br><br>Are you sure this " + "the theme.<ps/><ps/>Are you sure this " "is really a valid theme?")); } else @@ -270,7 +270,7 @@ _theme_import_cb_ok(void *data, void *data2 EINA_UNUSED) { e_util_dialog_show(_("Theme Import Error"), _("Enlightenment was unable to import " - "the theme<br>due to a copy error.")); + "the theme<ps/>due to a copy error.")); } else e_int_config_theme_update(import->parent, buf); diff --git a/src/modules/connman/e_mod_main.c b/src/modules/connman/e_mod_main.c index 48ab73e94..86975252f 100644 --- a/src/modules/connman/e_mod_main.c +++ b/src/modules/connman/e_mod_main.c @@ -189,7 +189,7 @@ _econnman_app_launch(E_Connman_Instance *inst) e_util_dialog_internal (_("Missing Application"), _("This module wants to execute an external application " - "EConnMan that does not exist.<br>" + "EConnMan that does not exist.<ps/>" "Please install <b>EConnMan</b> application.")); return; } diff --git a/src/modules/cpufreq/e_mod_main.c b/src/modules/cpufreq/e_mod_main.c index 409e217c1..e5b6cf5a3 100644 --- a/src/modules/cpufreq/e_mod_main.c +++ b/src/modules/cpufreq/e_mod_main.c @@ -504,8 +504,8 @@ _cpufreq_set_governor(const char *governor) return; e_dialog_title_set(dia, "Enlightenment Cpufreq Module"); e_dialog_icon_set(dia, "enlightenment", 64); - e_dialog_text_set(dia, _("There was an error trying to set the<br>" - "cpu frequency governor via the module's<br>" + e_dialog_text_set(dia, _("There was an error trying to set the<ps/>" + "cpu frequency governor via the module's<ps/>" "setfreq utility.")); e_dialog_button_add(dia, _("OK"), NULL, NULL, NULL); elm_win_center(dia->win, 1, 1); @@ -530,9 +530,9 @@ _cpufreq_set_frequency(int frequency) return; e_dialog_title_set(dia, "Enlightenment Cpufreq Module"); e_dialog_icon_set(dia, "enlightenment", 64); - e_dialog_text_set(dia, _("Your kernel does not support setting the<br>" - "CPU frequency at all. You may be missing<br>" - "Kernel modules or features, or your CPU<br>" + e_dialog_text_set(dia, _("Your kernel does not support setting the<ps/>" + "CPU frequency at all. You may be missing<ps/>" + "Kernel modules or features, or your CPU<ps/>" "simply does not support this feature.")); e_dialog_button_add(dia, _("OK"), NULL, NULL, NULL); elm_win_center(dia->win, 1, 1); @@ -556,8 +556,8 @@ _cpufreq_set_frequency(int frequency) return; e_dialog_title_set(dia, "Enlightenment Cpufreq Module"); e_dialog_icon_set(dia, "enlightenment", 64); - e_dialog_text_set(dia, _("There was an error trying to set the<br>" - "cpu frequency setting via the module's<br>" + e_dialog_text_set(dia, _("There was an error trying to set the<ps/>" + "cpu frequency setting via the module's<ps/>" "setfreq utility.")); e_dialog_button_add(dia, _("OK"), NULL, NULL, NULL); elm_win_center(dia->win, 1, 1); @@ -584,8 +584,8 @@ _cpufreq_set_pstate(int min, int max) return; e_dialog_title_set(dia, "Enlightenment Cpufreq Module"); e_dialog_icon_set(dia, "enlightenment", 64); - e_dialog_text_set(dia, _("There was an error trying to set the<br>" - "cpu power state setting via the module's<br>" + e_dialog_text_set(dia, _("There was an error trying to set the<ps/>" + "cpu power state setting via the module's<ps/>" "setfreq utility.")); e_dialog_button_add(dia, _("OK"), NULL, NULL, NULL); elm_win_center(dia->win, 1, 1); @@ -1446,7 +1446,7 @@ e_modapi_init(E_Module *m) if (stat(buf, &st) < 0) { e_util_dialog_show(_("Cpufreq Error"), - _("The freqset binary in the cpufreq module<br>" + _("The freqset binary in the cpufreq module<ps/>" "directory cannot be found (stat failed)")); } else if ((st.st_uid != 0) || @@ -1454,13 +1454,13 @@ e_modapi_init(E_Module *m) ((st.st_mode & (S_IXOTH)) != (S_IXOTH))) { e_util_dialog_show(_("Cpufreq Permissions Error"), - _("The freqset binary in the cpufreq module<br>" - "is not owned by root or does not have the<br>" - "setuid bit set. Please ensure this is the<br>" - "case. For example:<br>" - "<br>" - "sudo chown root %s<br>" - "sudo chmod u+s,a+x %s<br>"), + _("The freqset binary in the cpufreq module<ps/>" + "is not owned by root or does not have the<ps/>" + "setuid bit set. Please ensure this is the<ps/>" + "case. For example:<ps/>" + "<ps/>" + "sudo chown root %s<ps/>" + "sudo chmod u+s,a+x %s<ps/>"), buf, buf); } cpufreq_config->status = _cpufreq_status_new(); diff --git a/src/modules/everything/evry_view_help.c b/src/modules/everything/evry_view_help.c index daecd3627..c76f09d88 100644 --- a/src/modules/everything/evry_view_help.c +++ b/src/modules/everything/evry_view_help.c @@ -64,23 +64,23 @@ _view_create(Evry_View *v, const Evry_State *s EINA_UNUSED, Evas_Object *swallow int mw, mh; char *text = - _(" Ok, here comes the explanation of <hilight>everything</hilight>...<br>" - " Just type a few letters of the thing you are looking for. <br>" - " Use cursor <hilight><up/down></hilight> to choose from the list of things.<br>" + _(" Ok, here comes the explanation of <hilight>everything</hilight>...<ps/>" + " Just type a few letters of the thing you are looking for. <ps/>" + " Use cursor <hilight><up/down></hilight> to choose from the list of things.<ps/>" " Press <hilight><tab></hilight> to select" - " an action, then press <hilight><return></hilight>.<br>" - " This page will not show up next time you run <hilight>everything</hilight>.<br>" - " <hilight><Esc></hilight> close this Dialog<br>" - " <hilight><?></hilight> show this page<br>" - " <hilight><return></hilight> run action<br>" - " <hilight><ctrl+return></hilight> run action and continue<br>" - " <hilight><tab></hilight> toggle between selectors<br>" - " <hilight><ctrl+tab></hilight> complete input (depends on plugin)<br>" - " <hilight><ctrl+'x'></hilight> jump to plugin beginning with 'x'<br>" - " <hilight><ctrl+left/right></hilight> cycle through plugins<br>" - " <hilight><ctrl+up/down></hilight> go to first/last item<br>" - " <hilight><ctrl+1></hilight> toggle view modes (exit this page ;)<br>" - " <hilight><ctrl+2></hilight> toggle list view modes<br>" + " an action, then press <hilight><return></hilight>.<ps/>" + " This page will not show up next time you run <hilight>everything</hilight>.<ps/>" + " <hilight><Esc></hilight> close this Dialog<ps/>" + " <hilight><?></hilight> show this page<ps/>" + " <hilight><return></hilight> run action<ps/>" + " <hilight><ctrl+return></hilight> run action and continue<ps/>" + " <hilight><tab></hilight> toggle between selectors<ps/>" + " <hilight><ctrl+tab></hilight> complete input (depends on plugin)<ps/>" + " <hilight><ctrl+'x'></hilight> jump to plugin beginning with 'x'<ps/>" + " <hilight><ctrl+left/right></hilight> cycle through plugins<ps/>" + " <hilight><ctrl+up/down></hilight> go to first/last item<ps/>" + " <hilight><ctrl+1></hilight> toggle view modes (exit this page ;)<ps/>" + " <hilight><ctrl+2></hilight> toggle list view modes<ps/>" " <hilight><ctrl+3></hilight> toggle thumb view modes" ); diff --git a/src/modules/ibar/e_mod_config.c b/src/modules/ibar/e_mod_config.c index 5bc7e0c38..94ffc8ec1 100644 --- a/src/modules/ibar/e_mod_config.c +++ b/src/modules/ibar/e_mod_config.c @@ -201,7 +201,7 @@ _cb_del(void *data, void *data2 EINA_UNUSED) cfdata = data; if (cfdata->dialog_delete) return; - snprintf(buf, sizeof(buf), _("You requested to delete \"%s\".<br><br>" + snprintf(buf, sizeof(buf), _("You requested to delete \"%s\".<ps/><ps/>" "Are you sure you want to delete this bar source?"), cfdata->dir); diff --git a/src/modules/lokker/lokker.c b/src/modules/lokker/lokker.c index 9806264fa..82ea45d25 100644 --- a/src/modules/lokker/lokker.c +++ b/src/modules/lokker/lokker.c @@ -583,8 +583,8 @@ _lokker_cb_exit(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) _lokker_null(); e_desklock_hide(); e_util_dialog_show(_("Authentication System Error"), - _("Authentication via PAM had errors setting up the<br>" - "authentication session. The error code was <hilight>%i</hilight>.<br>" + _("Authentication via PAM had errors setting up the<ps/>" + "authentication session. The error code was <hilight>%i</hilight>.<ps/>" "This is bad and should not be happening. Please report this bug.") , ev->exited ? ev->exit_code : ev->exit_signal); } diff --git a/src/modules/luncher/config.c b/src/modules/luncher/config.c index 318ee289a..92087c17b 100644 --- a/src/modules/luncher/config.c +++ b/src/modules/luncher/config.c @@ -223,7 +223,7 @@ _config_source_del(void *data, Evas_Object *obj EINA_UNUSED, void *event_data EI char buf[4096]; evas_object_del(luncher_config->config_dialog); - snprintf(buf, sizeof(buf), _("You requested to delete \"%s\".<br><br>" + snprintf(buf, sizeof(buf), _("You requested to delete \"%s\".<ps/><ps/>" "Are you sure you want to delete this bar source?"), inst->cfg->dir); e_confirm_dialog_show(_("Are you sure you want to delete this bar source?"), diff --git a/src/modules/music-control/ui.c b/src/modules/music-control/ui.c index 570e0a20c..31bd84c3c 100644 --- a/src/modules/music-control/ui.c +++ b/src/modules/music-control/ui.c @@ -39,11 +39,11 @@ _metadata_update(E_Music_Control_Instance *inst) str = eina_strbuf_new(); if (inst->ctxt->meta_title) - eina_strbuf_append_printf(str, "<title>%s</><br>", inst->ctxt->meta_title); + eina_strbuf_append_printf(str, "<title>%s</><ps/>", inst->ctxt->meta_title); if (inst->ctxt->meta_artist) - eina_strbuf_append_printf(str, "<tag>by</> %s<br>", inst->ctxt->meta_artist); + eina_strbuf_append_printf(str, "<tag>by</> %s<ps/>", inst->ctxt->meta_artist); if (inst->ctxt->meta_album) - eina_strbuf_append_printf(str, "<tag>from</> %s<br>", inst->ctxt->meta_album); + eina_strbuf_append_printf(str, "<tag>from</> %s<ps/>", inst->ctxt->meta_album); edje_object_part_text_set(inst->content_popup, "metadata", eina_strbuf_string_get(str)); eina_strbuf_free(str); diff --git a/src/modules/notification/e_mod_main.c b/src/modules/notification/e_mod_main.c index c24ffffa3..027880234 100644 --- a/src/modules/notification/e_mod_main.c +++ b/src/modules/notification/e_mod_main.c @@ -60,14 +60,14 @@ _notification_show_presentation(Eina_Bool enabled) { summary = _("Entered Presentation Mode"); body = _("Enlightenment has now entered <b>presentation</b> mode." - "<br>During presentation mode, screen saver, lock and " + "<ps/>During presentation mode, screen saver, lock and " "power saving will be disabled so you are not interrupted."); } else { summary = _("Exited Presentation Mode"); body = _("Presentation mode has been exited." - "<br>Now screen saver, lock and " + "<ps/>Now screen saver, lock and " "power saving settings will be restored."); } @@ -82,14 +82,14 @@ _notification_show_offline(Eina_Bool enabled) if (enabled) { summary = _("Enter Offline Mode"); - body = _("Enlightenment is in <b>offline</b> mode.<br>" + body = _("Enlightenment is in <b>offline</b> mode.<ps/>" "During offline mode, modules that use network will stop " "polling remote services."); } else { summary = _("Exited Offline Mode"); - body = _("Now in <b>online</b> mode.<br>" + body = _("Now in <b>online</b> mode.<ps/>" "Now modules that use network will " "resume regular tasks."); } diff --git a/src/modules/notification/e_mod_popup.c b/src/modules/notification/e_mod_popup.c index 9191be9ac..cad8897f7 100644 --- a/src/modules/notification/e_mod_popup.c +++ b/src/modules/notification/e_mod_popup.c @@ -600,7 +600,7 @@ _notification_format_message(Popup_Data *popup) edje_object_part_text_unescaped_set(o, "notification.text.title", popup->notif->summary); /* FIXME: Filter to only include allowed markup? */ - /* We need to replace \n with <br>. FIXME: We need to handle all the + /* We need to replace \n with <ps/>. FIXME: We need to handle all the * newline kinds, and paragraph separator. ATM this will suffice. */ eina_strbuf_append(buf, popup->notif->body); eina_strbuf_replace_all(buf, "\n", "<br/>"); diff --git a/src/modules/packagekit/e_mod_packagekit.c b/src/modules/packagekit/e_mod_packagekit.c index 50ad4a5b7..52f790f1b 100644 --- a/src/modules/packagekit/e_mod_packagekit.c +++ b/src/modules/packagekit/e_mod_packagekit.c @@ -234,7 +234,7 @@ packagekit_popup_update(E_PackageKit_Instance *inst, Eina_Bool rebuild_list) elm_object_text_set(inst->popup_error_label, ctxt->error); if ((ctxt->v_maj != -1) && (ctxt->v_min != -1) && (ctxt->v_mic != -1)) { - snprintf(buf, sizeof(buf), "<br>PackageKit version: %d.%d.%d", + snprintf(buf, sizeof(buf), "<ps/>PackageKit version: %d.%d.%d", ctxt->v_maj, ctxt->v_min, ctxt->v_mic); elm_entry_entry_append(inst->popup_error_label, buf); } diff --git a/src/modules/pager/e_mod_config.c b/src/modules/pager/e_mod_config.c index a7ebdde8d..20fd336e0 100644 --- a/src/modules/pager/e_mod_config.c +++ b/src/modules/pager/e_mod_config.c @@ -451,9 +451,9 @@ _grab_cb_mouse_down(void *data, EINA_UNUSED int type, void *event) if (ev->buttons == 3) { e_util_dialog_show(_("Attention"), - _("You cannot use the right mouse button in the<br>" - "shelf for this as it is already taken by internal<br>" - "code for context menus.<br>" + _("You cannot use the right mouse button in the<ps/>" + "shelf for this as it is already taken by internal<ps/>" + "code for context menus.<ps/>" "This button only works in the popup.")); } else diff --git a/src/modules/pager/gadget/config.c b/src/modules/pager/gadget/config.c index 438eaf370..97f0c2939 100644 --- a/src/modules/pager/gadget/config.c +++ b/src/modules/pager/gadget/config.c @@ -198,9 +198,9 @@ _config_grab_cb_mouse_down(void *data EINA_UNUSED, int type EINA_UNUSED, void *e if (ev->buttons == 3) { e_util_dialog_show(_("Attention"), - _("You cannot use the right mouse button in the<br>" - "gadget for this as it is already taken by internal<br>" - "code for context menus.<br>" + _("You cannot use the right mouse button in the<ps/>" + "gadget for this as it is already taken by internal<ps/>" + "code for context menus.<ps/>" "This button only works in the popup.")); } else diff --git a/src/modules/pager_plain/e_mod_config.c b/src/modules/pager_plain/e_mod_config.c index 8ed46a7c3..f056d9b30 100644 --- a/src/modules/pager_plain/e_mod_config.c +++ b/src/modules/pager_plain/e_mod_config.c @@ -460,9 +460,9 @@ _grab_cb_mouse_down(void *data, EINA_UNUSED int type, void *event) if (ev->buttons == 3) { e_util_dialog_show(_("Attention"), - _("You cannot use the right mouse button in the<br>" - "shelf for this as it is already taken by internal<br>" - "code for context menus.<br>" + _("You cannot use the right mouse button in the<ps/>" + "shelf for this as it is already taken by internal<ps/>" + "code for context menus.<ps/>" "This button only works in the popup.")); } else diff --git a/src/modules/quickaccess/e_mod_quickaccess.c b/src/modules/quickaccess/e_mod_quickaccess.c index 11a1eb359..6482f5832 100644 --- a/src/modules/quickaccess/e_mod_quickaccess.c +++ b/src/modules/quickaccess/e_mod_quickaccess.c @@ -313,17 +313,17 @@ _e_qa_entry_relaunch_setup_help(void *data, E_Dialog *dia) entry->dia = NULL; entry->dia = dia = e_dialog_new(NULL, "E", "_quickaccess_cmd_help_dialog"); - snprintf(buf, sizeof(buf), _("The relaunch option is meant to be used<br>" - "with terminal applications to create a persistent<br>" - "terminal which reopens when closed, generally seen<br>" - "in quake-style drop-down terminals.<br>" - "Either the selected application is not a terminal<br>" - "or the cmdline flag for changing the terminal's window<br>" - "name is not known. Feel free to submit a bug report if this<br>" - "is a terminal which can change its window name.<br>" - "Alternatively, you can add a data.item to<br>" - "%s/e-module-quickaccess.edj<br>" - "Like so:<br>" + snprintf(buf, sizeof(buf), _("The relaunch option is meant to be used<ps/>" + "with terminal applications to create a persistent<ps/>" + "terminal which reopens when closed, generally seen<ps/>" + "in quake-style drop-down terminals.<ps/>" + "Either the selected application is not a terminal<ps/>" + "or the cmdline flag for changing the terminal's window<ps/>" + "name is not known. Feel free to submit a bug report if this<ps/>" + "is a terminal which can change its window name.<ps/>" + "Alternatively, you can add a data.item to<ps/>" + "%s/e-module-quickaccess.edj<ps/>" + "Like so:<ps/>" "data.item: \"%s\" \"--OPT\";"), e_module_dir_get(qa_mod->module), entry->class); @@ -380,11 +380,11 @@ _e_qa_entry_relaunch_setup(E_Quick_Access_Entry *entry) entry->dia = dia = e_dialog_new(NULL, "E", "_quickaccess_cmd_dialog"); snprintf(buf, sizeof(buf), - _("The selected window created with name:<br>%s<br>" - "and class:<br>%s<br>" - "could not be found in the Quickaccess app database<br>" - "This means that either the app is unknown to us<br>" - "or it is not intended for use with this option.<br>" + _("The selected window created with name:<ps/>%s<ps/>" + "and class:<ps/>%s<ps/>" + "could not be found in the Quickaccess app database<ps/>" + "This means that either the app is unknown to us<ps/>" + "or it is not intended for use with this option.<ps/>" "Please choose an action to take:"), entry->name, entry->class); @@ -974,11 +974,11 @@ e_qa_help(void) if (qa_mod->help_dia) return; snprintf(buf, sizeof(buf), "%s/e-module-quickaccess.edj", e_module_dir_get(qa_mod->module)); qa_mod->help_dia = (E_Object*)e_util_dialog_internal(_("Quickaccess Help"), - _("The options found in the Quickaccess menu are as follows:<br>" - "<hilight>Autohide</hilight> - hide the window whenever it loses focus<br>" - "<hilight>Hide Instead of Raise</hilight> - Hide window when activated without focus<br>" - "<hilight>Jump Mode</hilight> - Switch to window's desk and raise instead of showing/hiding<br>" - "<hilight>Relaunch When Closed</hilight> - Run the entry's command again when its window exits<br>" + _("The options found in the Quickaccess menu are as follows:<ps/>" + "<hilight>Autohide</hilight> - hide the window whenever it loses focus<ps/>" + "<hilight>Hide Instead of Raise</hilight> - Hide window when activated without focus<ps/>" + "<hilight>Jump Mode</hilight> - Switch to window's desk and raise instead of showing/hiding<ps/>" + "<hilight>Relaunch When Closed</hilight> - Run the entry's command again when its window exits<ps/>" "<hilight>Transient</hilight> - Remember only this instance of the window (not permanent)")); if (qa_mod->help_timeout) ecore_timer_freeze(qa_mod->help_timeout); e_object_free_attach_func_set(qa_mod->help_dia, _e_qa_dia_end_del); @@ -1013,7 +1013,7 @@ _e_qa_help5(void *data EINA_UNUSED) } snprintf(buf, sizeof(buf), "%s/e-module-quickaccess.edj", e_module_dir_get(qa_mod->module)); qa_mod->help_dia = (E_Object*)e_confirm_dialog_show(_("Quickaccess Help"), buf, - _("You deleted it on your own, you rascal!<br>" + _("You deleted it on your own, you rascal!<ps/>" "Way to go!"), _("Continue"), _("Stop"), _e_qa_help6, _e_qa_help_cancel, NULL, NULL, NULL, NULL); @@ -1054,7 +1054,7 @@ _e_qa_help_activate_hook(E_Quick_Access_Entry *entry) if (entry->config.hidden) _e_qa_border_activate(_e_qa_entry_find_border(e_win_client_get(qa_mod->demo_dia->win))); qa_mod->help_dia = (E_Object*)e_confirm_dialog_show(_("Quickaccess Help"), buf, - _("Well done.<br>" + _("Well done.<ps/>" "Now to delete the entry we just made..."), _("Continue"), _("Stop"), _e_qa_help5, _e_qa_help_cancel, NULL, NULL, NULL, NULL); @@ -1070,7 +1070,7 @@ _e_qa_help4(void *data EINA_UNUSED) snprintf(buf, sizeof(buf), "%s/e-module-quickaccess.edj", e_module_dir_get(qa_mod->module)); qa_mod->help_dia = (E_Object*)e_util_dialog_internal(_("Quickaccess Help"), - _("The demo dialog has been bound to the keys you pressed.<br>" + _("The demo dialog has been bound to the keys you pressed.<ps/>" "Try pressing the same keys!")); e_object_free_attach_func_set(qa_mod->help_dia, _e_qa_dia_del); } @@ -1235,7 +1235,7 @@ _e_qa_help3(void *data EINA_UNUSED) snprintf(buf, sizeof(buf), "%s/e-module-quickaccess.edj", e_module_dir_get(qa_mod->module)); qa_mod->help_dia = (E_Object*)e_util_dialog_internal(_("Quickaccess Help"), - _("The newly displayed window will activate<br>" + _("The newly displayed window will activate<ps/>" "the Quickaccess binding sequence.")); e_object_free_attach_func_set(qa_mod->help_dia, _e_qa_dia_del); @@ -1265,8 +1265,8 @@ _e_qa_help2(void *data EINA_UNUSED) } snprintf(buf, sizeof(buf), "%s/e-module-quickaccess.edj", e_module_dir_get(qa_mod->module)); qa_mod->help_dia = (E_Object*)e_confirm_dialog_show(_("Quickaccess Help"), buf, - _("Quickaccess entries can be created from<br>" - "the border menu of any window.<br>" + _("Quickaccess entries can be created from<ps/>" + "the border menu of any window.<ps/>" "Click Continue to see a demonstration."), _("Continue"), _("Stop"), _e_qa_help3, _e_qa_help_cancel, NULL, NULL, NULL, NULL); @@ -1286,10 +1286,10 @@ _e_qa_help(void *data) if (qa_mod->help_dia) return; snprintf(buf, sizeof(buf), "%s/e-module-quickaccess.edj", e_module_dir_get(qa_mod->module)); qa_mod->help_dia = (E_Object*)e_confirm_dialog_show(_("Quickaccess Help"), buf, - _("Quickaccess is a way of binding user-selected<br>" - "windows and applications to keyboard shortcuts.<br>" - "Once a Quickaccess entry has been created,<br>" - "the associated window can be returned to immediately<br>" + _("Quickaccess is a way of binding user-selected<ps/>" + "windows and applications to keyboard shortcuts.<ps/>" + "Once a Quickaccess entry has been created,<ps/>" + "the associated window can be returned to immediately<ps/>" "on demand by pushing the keyboard shortcut."), _("Continue"), _("Stop"), _e_qa_help2, _e_qa_help_cancel, NULL, NULL, NULL, NULL); @@ -1303,7 +1303,7 @@ _e_qa_first_run(void) snprintf(buf, sizeof(buf), "%s/e-module-quickaccess.edj", e_module_dir_get(qa_mod->module)); qa_mod->help_dia = (E_Object*)e_confirm_dialog_show(_("Quickaccess Help"), buf, - _("This appears to be your first time using the Quickaccess module.<br>" + _("This appears to be your first time using the Quickaccess module.<ps/>" "Would you like some usage tips?"), _("Yes"), _("No"), _e_qa_help, _e_qa_help_cancel, (void*)1, NULL, NULL, NULL); diff --git a/src/modules/shot/e_mod_main.c b/src/modules/shot/e_mod_main.c index 91550ce53..9929dd6e7 100644 --- a/src/modules/shot/e_mod_main.c +++ b/src/modules/shot/e_mod_main.c @@ -230,9 +230,9 @@ _file_select_ok_cb(void *data EINA_UNUSED, E_Dialog *dia) { e_util_dialog_show (_("Error - Unknown format"), - _("File has an unspecified extension.<br>" - "Please use '.jpg' or '.png' extensions<br>" - "only as other formats are not<br>" + _("File has an unspecified extension.<ps/>" + "Please use '.jpg' or '.png' extensions<ps/>" + "only as other formats are not<ps/>" "supported currently.")); return; } @@ -405,7 +405,7 @@ _upload_complete_cb(void *data, int ev_type EINA_UNUSED, void *event) if (status != 200) { e_util_dialog_show(_("Error - Upload Failed"), - _("Upload failed with status code:<br>" + _("Upload failed with status code:<ps/>" "%i"), status); _share_done(); return EINA_FALSE; @@ -558,7 +558,7 @@ _win_share_confirm_cb(void *d EINA_UNUSED, void *d2 EINA_UNUSED) { if (cd) return; cd = e_confirm_dialog_show(_("Confirm Share"), NULL, - _("This image will be uploaded<br>" + _("This image will be uploaded<ps/>" "to enlightenment.org. It will be publicly visible."), _("Confirm"), _("Cancel"), _win_share_confirm_yes, NULL, diff --git a/src/modules/sysinfo/netstatus/netstatus.c b/src/modules/sysinfo/netstatus/netstatus.c index 49e29bd0e..2092674ea 100644 --- a/src/modules/sysinfo/netstatus/netstatus.c +++ b/src/modules/sysinfo/netstatus/netstatus.c @@ -41,7 +41,7 @@ _netstatus_face_update(Thread_Config *thc) if (thc->inst->cfg->netstatus.popup) { char text[4096]; - snprintf(text, sizeof(text), "%s<br>%s", thc->instring, thc->outstring); + snprintf(text, sizeof(text), "%s<ps/>%s", thc->instring, thc->outstring); elm_object_text_set(thc->inst->cfg->netstatus.popup_label, text); } } @@ -92,7 +92,7 @@ _netstatus_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_ evas_object_smart_callback_add(popup, "dismissed", _netstatus_popup_dismissed, inst); evas_object_event_callback_add(popup, EVAS_CALLBACK_DEL, _netstatus_popup_deleted, inst); - snprintf(text, sizeof(text), "%s<br>%s", inst->cfg->netstatus.instring, inst->cfg->netstatus.outstring); + snprintf(text, sizeof(text), "%s<ps/>%s", inst->cfg->netstatus.instring, inst->cfg->netstatus.outstring); label = elm_label_add(popup); elm_object_style_set(label, "marker"); elm_object_text_set(label, text); diff --git a/src/modules/wireless/wireless.c b/src/modules/wireless/wireless.c index d3182239d..2163ff132 100644 --- a/src/modules/wireless/wireless.c +++ b/src/modules/wireless/wireless.c @@ -1467,9 +1467,9 @@ wireless_authenticate_external(Wireless_Network *wn, const char *url) evas_object_del(wireless_popup.popup); } if (wn->type == WIRELESS_SERVICE_TYPE_ETHERNET) - snprintf(buf, sizeof(buf), _("Ethernet connection wants to open a url:<br>%s"), url); + snprintf(buf, sizeof(buf), _("Ethernet connection wants to open a url:<ps/>%s"), url); else - snprintf(buf, sizeof(buf), _("Network '%s' wants to open a url:<br>%s"), wn->name, url); + snprintf(buf, sizeof(buf), _("Network '%s' wants to open a url:<ps/>%s"), wn->name, url); EINA_LIST_FOREACH(instances, l, inst) { if (!inst->icon[wn->type]) continue; diff --git a/src/modules/wizard/page_065.c b/src/modules/wizard/page_065.c index f6dc475c5..a091ef788 100644 --- a/src/modules/wizard/page_065.c +++ b/src/modules/wizard/page_065.c @@ -107,20 +107,20 @@ wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) ob = elm_label_add(o); elm_object_style_set(ob, "default/left"); - snprintf(buf, sizeof(buf), P_("Enlightenment sets default mouse bindings for objects.<br>" - "These bindings provide three operations on click:<br>" - "* <b>Move</b> (left button)<br>" - "* <b>Resize</b> (middle/wheel button)<br>" - "* <b>Open Menu</b> (right button)<br>" - "The default key which must be held to activate these bindings<br>" + snprintf(buf, sizeof(buf), P_("Enlightenment sets default mouse bindings for objects.<ps/>" + "These bindings provide three operations on click:<ps/>" + "* <b>Move</b> (left button)<ps/>" + "* <b>Resize</b> (middle/wheel button)<ps/>" + "* <b>Open Menu</b> (right button)<ps/>" + "The default key which must be held to activate these bindings<ps/>" "is '%s'. Configure the modifiers for this binding below.", - "Enlightenment sets default mouse bindings for objects.<br>" - "These bindings provide three operations on click:<br>" - "* <b>Move</b> (left button)<br>" - "* <b>Resize</b> (middle/wheel button)<br>" - "* <b>Open Menu</b> (right button)<br>" - "The default keys which must be held to activate these bindings<br>" + "Enlightenment sets default mouse bindings for objects.<ps/>" + "These bindings provide three operations on click:<ps/>" + "* <b>Move</b> (left button)<ps/>" + "* <b>Resize</b> (middle/wheel button)<ps/>" + "* <b>Open Menu</b> (right button)<ps/>" + "The default keys which must be held to activate these bindings<ps/>" "is '%s'. Configure the modifiers for this binding below.", num) , eina_strbuf_string_get(sbuf)); diff --git a/src/modules/wizard/page_170.c b/src/modules/wizard/page_170.c index 5f23a1b67..7bdfb41a1 100644 --- a/src/modules/wizard/page_170.c +++ b/src/modules/wizard/page_170.c @@ -34,22 +34,22 @@ wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) evas_object_show(ob); elm_box_pack_end(o, ob); elm_object_text_set(ob, - _("Enlightenment can check for new<br>" - "versions, updates, security and<br>" - "bugfixes, as well as available add-ons.<br>" - "<br>" - "This is very useful, because it lets<br>" - "you know about available bug fixes and<br>" - "security fixes when they happen. As a<br>" - "result, Enlightenment will connect to<br>" - "enlightenment.org and transmit some<br>" - "information, much like any web browser<br>" - "might do. No personal information such as<br>" - "username, password or any personal files<br>" - "will be transmitted. If you don't like this,<br>" - "please disable this below. It is highly<br>" - "advised that you do not disable this as it<br>" - "may leave you vulnerable or having to live<br>" + _("Enlightenment can check for new<ps/>" + "versions, updates, security and<ps/>" + "bugfixes, as well as available add-ons.<ps/>" + "<ps/>" + "This is very useful, because it lets<ps/>" + "you know about available bug fixes and<ps/>" + "security fixes when they happen. As a<ps/>" + "result, Enlightenment will connect to<ps/>" + "enlightenment.org and transmit some<ps/>" + "information, much like any web browser<ps/>" + "might do. No personal information such as<ps/>" + "username, password or any personal files<ps/>" + "will be transmitted. If you don't like this,<ps/>" + "please disable this below. It is highly<ps/>" + "advised that you do not disable this as it<ps/>" + "may leave you vulnerable or having to live<ps/>" "with bugs." ) ); diff --git a/src/modules/wizard/page_180.c b/src/modules/wizard/page_180.c index 740db062b..502b3c0d5 100644 --- a/src/modules/wizard/page_180.c +++ b/src/modules/wizard/page_180.c @@ -34,7 +34,7 @@ wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) evas_object_show(ob); elm_box_pack_end(o, ob); elm_object_text_set(ob, - _("A taskbar can be added to<br>" + _("A taskbar can be added to<ps/>" "show open windows and applications." ) ); --
