replace <br> with <ps/> for all text

devs/bu5hm4n/sandbox_fix
Mike Blumenkrantz 5 years ago
parent 37d1bf3ea0
commit c31cb51499
  1. 34
      src/bin/e_about.c
  2. 14
      src/bin/e_actions.c
  3. 18
      src/bin/e_comp_x.c
  4. 74
      src/bin/e_config.c
  5. 4
      src/bin/e_desklock.c
  6. 12
      src/bin/e_desktop_editor.c
  7. 20
      src/bin/e_exec.c
  8. 20
      src/bin/e_fm.c
  9. 8
      src/bin/e_grab_dialog.c
  10. 6
      src/bin/e_import_config_dialog.c
  11. 4
      src/bin/e_import_dialog.c
  12. 32
      src/bin/e_int_client_remember.c
  13. 4
      src/bin/e_int_config_comp.c
  14. 10
      src/bin/e_intl.c
  15. 28
      src/bin/e_main.c
  16. 50
      src/bin/e_module.c
  17. 6
      src/bin/e_remember.c
  18. 2
      src/bin/e_screensaver.c
  19. 8
      src/bin/e_shelf.c
  20. 30
      src/bin/e_sys.c
  21. 22
      src/bin/e_test.c
  22. 16
      src/bin/e_update.c
  23. 38
      src/bin/e_utils.c
  24. 24
      src/bin/e_widget_filepreview.c
  25. 4
      src/bin/e_widget_textblock.c
  26. 2
      src/modules/conf_bindings/e_int_config_acpibindings.c
  27. 12
      src/modules/conf_bindings/e_int_config_edgebindings.c
  28. 4
      src/modules/conf_bindings/e_int_config_keybindings.c
  29. 10
      src/modules/conf_bindings/e_int_config_mousebindings.c
  30. 4
      src/modules/conf_bindings/e_int_config_signalbindings.c
  31. 2
      src/modules/conf_dialogs/e_int_config_profiles.c
  32. 8
      src/modules/conf_intl/e_int_config_imc.c
  33. 4
      src/modules/conf_intl/e_int_config_imc_import.c
  34. 28
      src/modules/conf_intl/e_int_config_intl.c
  35. 6
      src/modules/conf_theme/e_int_config_theme.c
  36. 4
      src/modules/conf_theme/e_int_config_theme_import.c
  37. 2
      src/modules/connman/e_mod_main.c
  38. 34
      src/modules/cpufreq/e_mod_main.c
  39. 32
      src/modules/everything/evry_view_help.c
  40. 2
      src/modules/ibar/e_mod_config.c
  41. 4
      src/modules/lokker/lokker.c
  42. 2
      src/modules/luncher/config.c
  43. 6
      src/modules/music-control/ui.c
  44. 8
      src/modules/notification/e_mod_main.c
  45. 2
      src/modules/notification/e_mod_popup.c
  46. 2
      src/modules/packagekit/e_mod_packagekit.c
  47. 6
      src/modules/pager/e_mod_config.c
  48. 6
      src/modules/pager/gadget/config.c
  49. 6
      src/modules/pager_plain/e_mod_config.c
  50. 64
      src/modules/quickaccess/e_mod_quickaccess.c
  51. 10
      src/modules/shot/e_mod_main.c
  52. 4
      src/modules/sysinfo/netstatus/netstatus.c
  53. 4
      src/modules/wireless/wireless.c
  54. 24
      src/modules/wizard/page_065.c
  55. 32
      src/modules/wizard/page_170.c
  56. 2
      src/modules/wizard/page_180.c

@ -24,28 +24,28 @@ e_about_new(void)
(buf, sizeof(buf), "%s%s",
_(
"<title>Copyright &copy; 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);
}
}
}

@ -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"));

@ -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);

@ -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);

@ -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?"));

@ -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

@ -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);

@ -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);
}

@ -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)

@ -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?"));
}

@ -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?"));
}

@ -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);

@ -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."));
}

@ -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);
}

@ -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);

@ -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"));

@ -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);
}
}

@ -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?"));

@ -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,

@ -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;

@ -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

@ -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);

@ -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);

@ -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);

@ -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' -> " "
* '<' -> "&lt;"
* '>' -> "&gt;"
@ -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')

@ -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);

@ -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"));
}

@ -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

@ -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>"