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",
_(
"
Copyright © 2000-2016, by the Enlightenment "
- "Development Team>
"
- "
"
+ "Development Team>"
+ ""
"We hope you enjoy using this software as much as we enjoyed "
- "writing it.
"
- "
"
- "To contact us please visit:
"
- "http://www.enlightenment.org>
"
- "
"
+ "writing it."
+ ""
+ "To contact us please visit:"
+ "http://www.enlightenment.org>"
+ ""
),
- "All rights reserved.
"
- "
"
+ "All rights reserved."
+ ""
"Redistribution and use in source and binary forms, with or without "
"modification, are permitted provided that the following conditions "
- "are met:
"
- "
"
+ "are met:"
+ ""
"1. Redistributions of source code must retain the above copyright "
- "notice, this list of conditions and the following disclaimer.
"
+ "notice, this list of conditions and the following disclaimer."
"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.
"
- "
"
+ "distribution."
+ ""
"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.>
"
+ "POSSIBILITY OF SUCH DAMAGE.>"
);
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, _("The Team>
"));
+ eina_strbuf_append(tbuf, _("The Team>"));
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
", buf);
+ eina_strbuf_append_printf(tbuf, "%s", 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.
"
- "Please keep in mind that all data from this window
"
- "which has not yet been saved will be lost!
"
+ _("You are about to kill %s."
+ "Please keep in mind that all data from this window"
+ "which has not yet been saved will be lost!"
"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
"
- "Check syntax. You should not put a whitespace right after colon in action params.
"
- "syntax: [file:file.desktop|name:App Name|generic:Generic Name|exe:exename]
"
- "exe:terminology (O)
"
+ "%s"
+ "Check syntax. You should not put a whitespace right after colon in action params."
+ "syntax: [file:file.desktop|name:App Name|generic:Generic Name|exe:exename]"
+ "exe:terminology (O)"
"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
"
- "shaders or no OpenGL engines were compiled or installed
"
- "for Evas or Ecore-Evas. Falling back to software engine.
"
- "
"
- "You will need an OpenGL 2.0 (or OpenGL ES 2.0) capable
"
+ _("Your display driver does not support OpenGL, GLSL"
+ "shaders or no OpenGL engines were compiled or installed"
+ "for Evas or Ecore-Evas. Falling back to software engine."
+ ""
+ "You will need an OpenGL 2.0 (or OpenGL ES 2.0) capable"
"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
"
- "has grabbed either the keyboard or the mouse or both
"
+ _("Locking the desktop failed because some application"
+ "has grabbed either the keyboard or the mouse or both"
"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.
"
- "This is required to be your default depth
"
+ (_("Compositor Error"), _("Your screen is not in 24/32bit display mode."
+ "This is required to be your default depth"
"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
"
- "been wiped and a new set of defaults initialized. This
"
- "will happen regularly during development, so don't report a
"
- "bug. This simply means Enlightenment needs new settings
"
- "data by default for usable functionality that your old
"
- "settings simply lack. This new set of defaults will fix
"
- "that by adding it in. You can re-configure things now to your
"
- "liking. Sorry for the hiccup in your settings.
"));
+ _("Settings data needed upgrading. Your old settings have"
+ "been wiped and a new set of defaults initialized. This"
+ "will happen regularly during development, so don't report a"
+ "bug. This simply means Enlightenment needs new settings"
+ "data by default for usable functionality that your old"
+ "settings simply lack. This new set of defaults will fix"
+ "that by adding it in. You can re-configure things now to your"
+ "liking. Sorry for the hiccup in your settings."));
}
/* 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
"
- "strange. This should not happen unless you downgraded
"
- "Enlightenment or copied the settings from a place where
"
- "a newer version of Enlightenment was running. This is bad and
"
- "as a precaution your settings have been now restored to
"
- "defaults. Sorry for the inconvenience.
"));
+ _("Your settings are NEWER than Enlightenment. This is very"
+ "strange. This should not happen unless you downgraded"
+ "Enlightenment or copied the settings from a place where"
+ "a newer version of Enlightenment was running. This is bad and"
+ "as a precaution your settings have been now restored to"
+ "defaults. Sorry for the inconvenience."));
}
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.
"
- "As a result, all bindings have been reloaded from defaults.
"
- "Sorry for the inconvenience.
"));
+ _("Your bindings settings version does not match the current settings version."
+ "As a result, all bindings have been reloaded from defaults."
+ "Sorry for the inconvenience."));
}
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
"
- "from:
"
- "%s
"
- "
"
- "to:
"
- "%s
"
- "
"
- "The rest of the write has been aborted for safety.
"),
+ _("Enlightenment has had an error while moving config files"
+ "from:"
+ "%s"
+ ""
+ "to:"
+ "%s"
+ ""
+ "The rest of the write has been aborted for safety."),
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
or you lost permissions to your files.");
+ erstr = _("The file is not writable. Perhaps the disk is read-onlyor you lost permissions to your files.");
break;
case EET_ERROR_OUT_OF_MEMORY:
- erstr = _("Memory ran out while preparing the write.
Please free up memory.");
+ erstr = _("Memory ran out while preparing the write.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.
It should be very small (a few hundred KB at most).");
+ erstr = _("The settings file is too large.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.
Maybe it needs replacing?");
+ erstr = _("You have I/O errors on the disk.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
"
- "its config file.
"
- "%s
"
- "
"
- "The file where the error occurred was:
"
- "%s
"
- "
"
- "This file has been deleted to avoid corrupt data.
"),
+ _("Enlightenment has had an error while writing"
+ "its config file."
+ "%s"
+ ""
+ "The file where the error occurred was:"
+ "%s"
+ ""
+ "This file has been deleted to avoid corrupt data."),
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
"
+ _("No PAM support was built into Enlightenment, so"
"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.
"
+ _("You unlocked your desktop too fast."
"Would you like to enable presentation 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
"
- "does not contain window name and class
"
- "properties. Without these, you will have to
"
- "use the window title instead. This will only
"
- "work if the window title is the same at
"
- "the time the window starts up, and does not
"
+ _("The window you are creating an icon for"
+ "does not contain window name and class"
+ "properties. Without these, you will have to"
+ "use the window title instead. This will only"
+ "work if the window title is the same at"
+ "the time the window starts up, and does not"
"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:
"
- "
"
+ _("Enlightenment was unable to change to directory:"
+ ""
"%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:
"
- "
"
+ _("Enlightenment was unable to restore to directory:"
+ ""
"%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:
"
- "
"
+ _("Enlightenment was unable to fork a child process:"
+ ""
"%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:
"
- "
"
- "%s
"
- "
"
+ _("Enlightenment was unable to run the application:"
+ ""
+ "%s"
+ ""
"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?
%s"), str);
+ _("File already exists, overwrite?%s"), 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.
"
+ _("An error occurred while performing an operation."
"%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
%s
%s
%s
%s", msg, u, d, n, m);
+ snprintf(text, sizeof(text), "%s%s%s%s%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
"
+ _("Are you sure you want to delete"
"%s?"),
ic->info.file);
else if (n == folder_count)
snprintf(text, sizeof(text),
- _("Are you sure you want to delete
"
- "all the %d files in
"
+ _("Are you sure you want to delete"
+ "all the %d files in"
"%s?"),
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
"
- "the %d selected file in
"
+ P_("Are you sure you want to delete"
+ "the %d selected file in"
"%s?",
- "Are you sure you want to delete
"
- "the %d selected files in
"
+ "Are you sure you want to delete"
+ "the %d selected files in"
"%s?", 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,
" \
+#define TEXT_PRESS_KEY_SEQUENCE _("Please press key combination," \
"or Escape to abort.")
-#define TEXT_PRESS_MOUSE_BINIDING_SEQUENCE _("Please hold any modifier you want
" \
- "and press any button on your mouse,
or roll a" \
+#define TEXT_PRESS_MOUSE_BINIDING_SEQUENCE _("Please hold any modifier you want" \
+ "and press any button on your mouse,or roll a" \
" wheel, to assign mouse binding." \
- "
Press Escape to abort.")
+ "Press Escape 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
"
+ _("Enlightenment was unable to import the picture"
"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
due to a "
+ "import the imagedue 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.
"
+ "import the image."
"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
due to a "
+ "import the imagedue 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.
"
+ "import the image."
"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
"
- "properties (such as size, location, border style etc.) to
"
- "a window that does not have unique properties.
"
- "
"
- "This means it shares Name/Class, Transience, Role etc. properties
"
- "with more than 1 other window on the screen and remembering
"
- "properties for this window will apply to all other windows
"
- "that match these properties.
"
- "
"
- "This is just a warning in case you did not intend this to happen.
"
- "If you did, simply press Apply or OK buttons
"
- "and your settings will be accepted. Press Cancel if you
"
+ _("You are trying to ask Enlightenment to remember to apply"
+ "properties (such as size, location, border style etc.) to"
+ "a window that does not have unique properties."
+ ""
+ "This means it shares Name/Class, Transience, Role etc. properties"
+ "with more than 1 other window on the screen and remembering"
+ "properties for this window will apply to all other windows"
+ "that match these properties."
+ ""
+ "This is just a warning in case you did not intend this to happen."
+ "If you did, simply press Apply or OK buttons"
+ "and your settings will be accepted. Press Cancel if you"
"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
"
- "properties (such as size, location, border style etc.) to
"
- "a window without specifying how to remember it.
"
- "
"
+ _("You are trying to ask Enlightenment to remember to apply"
+ "properties (such as size, location, border style etc.) to"
+ "a window without specifying how to remember it."
+ ""
"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.
"
- "Do not file bugs about anything that occurs with this option enabled.
"
+ _("This option WILL break your desktop if you don't know what you're doing."
+ "Do not file bugs about anything that occurs with this option enabled."
"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
"
- "please make sure that your input
"
- "method configuration is correct and
"
- "that your configuration's
"
- "executable is in your PATH
"));
+ _("Error starting the input method executable"
+ "please make sure that your input"
+ "method configuration is correct and"
+ "that your configuration's"
+ "executable is in your PATH"));
}
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
"
- "been restarted. There was an error loading the
"
- "module named: %s. This module has been disabled
"
+ (_("Enlightenment crashed early on start and has"
+ "been restarted. There was an error loading the"
+ "module named: %s. This module has been disabled"
"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.
"
- "There was an error loading the module named: %s
"
+ _("Enlightenment crashed early on start and has been restarted."
+ "There was an error loading the module named: %s"
"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
"
- "been restarted. All modules have been disabled
"
- "and will not be loaded to help remove any problem
"
- "modules from your configuration. The module
"
- "configuration dialog should let you select your
"
+ (_("Enlightenment crashed early on start and has"
+ "been restarted. All modules have been disabled"
+ "and will not be loaded to help remove any problem"
+ "modules from your configuration. The module"
+ "configuration dialog should let you select your"
"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.
"
- "All modules have been disabled and will not be loaded to help
"
- "remove any problem modules from your configuration.
"
- "The module configuration dialog should let you select your
"
+ _("Enlightenment crashed early on start and has been restarted."
+ "All modules have been disabled and will not be loaded to help"
+ "remove any problem modules from your configuration."
+ "The module configuration dialog should let you select your"
"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
"
- "No module named %s could be found in the
"
- "module search directories.
"), name, buf);
+ _("There was an error loading the module named: %s"
+ "No module named %s could be found in the"
+ "module search directories."), 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
"
- "The full path to this module is:
"
- "%s
"
- "The error reported was:
"
- "%s
"), name, buf, dlerror());
+ _("There was an error loading the module named: %s"
+ "The full path to this module is:"
+ "%s"
+ "The error reported was:"
+ "%s"), 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
"
- "The full path to this module is:
"
- "%s
"
- "The error reported was:
"
- "%s
"),
+ _("There was an error loading the module named: %s"
+ "The full path to this module is:"
+ "%s"
+ "The error reported was:"
+ "%s"),
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
Error initializing Module: %s
"
- "It requires a module API version of: %i.
"
- "The module API advertized by Enlightenment is: %i.
"),
+ _("Module API ErrorError initializing Module: %s"
+ "It requires a module API version of: %i."
+ "The module API advertized by Enlightenment is: %i."),
_(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
%s", body,
- _("What action should be taken with this module?
"));
+ snprintf(buf, sizeof(buf), "%s%s", body,
+ _("What action should be taken with this module?"));
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
"
- "Enlightenment and may cause bugs and crashes.
"
- "Please remove them before reporting any bugs.
"
- "
"
- "The module list is as follows:
"
- "
"));
+ (sbuf, _("The following modules are not standard ones for"
+ "Enlightenment and may cause bugs and crashes."
+ "Please remove them before reporting any bugs."
+ ""
+ "The module list is as follows:"
+ ""));
EINA_LIST_FOREACH(badl, l, s)
{
eina_strbuf_append(sbuf, s);
- eina_strbuf_append(sbuf, "
");
+ eina_strbuf_append(sbuf, "");
}
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:
"
- "
"
- "%s
"),
+ _("Enlightenment was unable to fork a child process:"
+ ""
+ "%s"),
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.
"
+ _("You disabled the screensaver too fast."
"Would you like to enable presentation 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
"
- "with the current configuration; set your shelf to
"
+ e_util_dialog_show(_("Shelf Autohide Error"), _("Shelf autohiding will not work properly"
+ "with the current configuration; set your shelf to"
"\"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.
"
- "
"
+ _("You requested to delete this shelf."
+ ""
"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.
"
- "Some applications refuse to close.
"
- "Do you want to finish the logout
"
- "anyway without closing these
"
- "applications first?
"
+ _("Logout is taking too long."
+ "Some applications refuse to close."
+ "Do you want to finish the logout"
+ "anyway without closing these"
+ "applications first?"
"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.
"
- "You cannot perform other system actions
"
+ e_dialog_text_set(dia, _("Logging out."
+ "You cannot perform other system actions"
"once a logout has begun."));
break;
case E_SYS_HALT:
case E_SYS_HALT_NOW:
- e_dialog_text_set(dia, _("Powering off.
"
- "You cannot perform any other system actions
"
+ e_dialog_text_set(dia, _("Powering off."
+ "You cannot perform any other system actions"
"once a shutdown has been started."));
break;
case E_SYS_REBOOT:
- e_dialog_text_set(dia, _("Resetting.
"
- "You cannot perform any other system actions
"
+ e_dialog_text_set(dia, _("Resetting."
+ "You cannot perform any other system actions"
"once a reboot has begun."));
break;
case E_SYS_SUSPEND:
- e_dialog_text_set(dia, _("Suspending.
"
- "You cannot perform any other system actions
"
+ e_dialog_text_set(dia, _("Suspending."
+ "You cannot perform any other system actions"
"until suspend is complete."));
break;
case E_SYS_HIBERNATE:
- e_dialog_text_set(dia, _("Hibernating.
"
- "You cannot perform any other system actions
"
+ e_dialog_text_set(dia, _("Hibernating."
+ "You cannot perform any other system actions"
"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
And another line
Hilighted Text");
+ e_dialog_text_set(dia, "A Test DialogAnd another lineHilighted Text");
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,
"A title"
- "This is some text
"
- "Blah blah
"
- "hilighted text
"
- "
"
- "More lines of text
"
- "And yet more lines of text
"
- "A very very long line of text that SHOULD be getting word wrapped because it is so long.
"
- "And another line
"
- "Some more
"
- "Smelly fish on a stick
"
+ "This is some text"
+ "Blah blah"
+ "hilighted text"
+ ""
+ "More lines of text"
+ "And yet more lines of text"
+ "A very very long line of text that SHOULD be getting word wrapped because it is so long."
+ "And another line"
+ "Some more"
+ "Smelly fish on a stick"
"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
"
- "not the current latest release.
"
- "The latest version is:
"
- "
"
- "%s
"
- "
"
- "Please visit www.enlightenment.org
"
- "or update your system packages
"
+ _("Your enlightenment version is"
+ "not the current latest release."
+ "The latest version is:"
+ ""
+ "%s"
+ ""
+ "Please visit www.enlightenment.org"
+ "or update your system packages"
"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
"
- "that Enlightenment will not allow itself to exit until these windows have
"
- "been closed or have the lifespan lock removed.
"));
+ _("Some windows are left still around with the Lifespan lock enabled. This means"
+ "that Enlightenment will not allow itself to exit until these windows have"
+ "been closed or have the lifespan lock removed."));
/* 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 .
Check that you have correct permissions set."), dir);
+ e_util_dialog_show(_("Error creating directory"), _("Failed to create directory: %s .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 .
A file of that name already exists."), dir);
+ e_util_dialog_show(_("Error creating directory"), _("Failed to create directory: %s .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
"
- "has been wiped and a new set of defaults initialized. This
"
- "will happen regularly during development, so don't report a
"
- "bug. This means the module needs new configuration
"
- "data by default for usable functionality that your old
"
- "configuration lacked. This new set of defaults will fix
"
- "that by adding it in. You can re-configure things now to your
"
- "liking. Sorry for the hiccup in your configuration.
");
+ char *msg = _("Configuration data needed upgrading. Your old configuration"
+ "has been wiped and a new set of defaults initialized. This"
+ "will happen regularly during development, so don't report a"
+ "bug. This means the module needs new configuration"
+ "data by default for usable functionality that your old"
+ "configuration lacked. This new set of defaults will fix"
+ "that by adding it in. You can re-configure things now to your"
+ "liking. Sorry for the hiccup in your configuration.");
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
strange. This should not happen unless"
- " you downgraded
the module or "
+ "verystrange. This should not happen unless"
+ " you downgradedthe module or "
"copied the configuration from a place where"
- "
a newer version of the module "
- "was running. This is bad and
as a "
+ "a newer version of the module "
+ "was running. This is bad andas a "
"precaution your configuration has been now "
- "restored to
defaults. Sorry for the "
- "inconvenience.
");
+ "restored todefaults. Sorry for the "
+ "inconvenience.");
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)
""
""
- "28 - ABC abc 0123 @!?#$*{}
"
- "The quick brown fox jumps.
"
+ "28 - ABC abc 0123 @!?#$*{}"
+ "The quick brown fox jumps."
""
- "20 - ABC abc 0123 @!?#$*{}
"
- "The quick brown fox jumps.
"
+ "20 - ABC abc 0123 @!?#$*{}"
+ "The quick brown fox jumps."
""
- "16 - ABC abc 0123 @!?#$*{}
"
- "The quick brown fox jumps.
"
+ "16 - ABC abc 0123 @!?#$*{}"
+ "The quick brown fox jumps."
""
- "12 - ABC abc 0123 @!?#$*{}
"
- "The quick brown fox jumps.
"
+ "12 - ABC abc 0123 @!?#$*{}"
+ "The quick brown fox jumps."
""
- "10 - ABC abc 0123 @!?#$*{}
"
- "The quick brown fox jumps.
"
+ "10 - ABC abc 0123 @!?#$*{}"
+ "The quick brown fox jumps."
""
- "8 - ABC abc 0123 @!?#$*{}
"
- "The quick brown fox jumps.
"
+ "8 - ABC abc 0123 @!?#$*{}"
+ "The quick brown fox jumps."
, 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' -> "
"
+ * '\n' -> ""
* '\t' -> " "
* '<' -> "<"
* '>' -> ">"
@@ -86,7 +86,7 @@ e_widget_textblock_plain_set(Evas_Object *obj, const char *text)
{
if (*p == '\n')
{
- strcpy(d, "
");
+ strcpy(d, "");
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, "
- "
or Escape to abort."));
+ "or Escape 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 _("")
-#define TEXT_PRESS_EDGE_SEQUENCE _("Please select an edge,
" \
- "or click Close to abort.
" \
- "You can either specify a delay of this
action using " \
- "the slider, or make it
respond to edge clicks:" \
+#define TEXT_PRESS_EDGE_SEQUENCE _("Please select an edge," \
+ "or click Close to abort." \
+ "You can either specify a delay of this action using " \
+ "the slider, or make itrespond to edge clicks:" \
)
#define TEXT_NO_PARAMS _("")
@@ -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
"
- "%s action.
"
+ _("The edge binding that you chose is already used by"
+ "%s action."
"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
"
- "%s action.
"
+ " is already used by "
+ "%s action."
"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 _("")
#define EXAMPLE_STRING "example : "
-#define TEXT_PRESS_MOUSE_BINIDING_SEQUENCE _("Please hold any modifier you want
" \
- "and press any button on your mouse,
or roll a" \
+#define TEXT_PRESS_MOUSE_BINIDING_SEQUENCE _("Please hold any modifier you want" \
+ "and press any button on your mouse,or roll a" \
" wheel, to assign mouse binding." \
- "
Press Escape to abort.")
+ "Press Escape 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
"
- "on a window: conflict with existing edje signal bindings.
"
+ const char *msg = _("Unable to set a mouse wheel binding without modifiers"
+ "on a window: conflict with existing edje signal bindings."
"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
"
- "%s action.
"),
+ _("The signal and source that you entered are already used by"
+ "%s action."),
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.
"
+ _("You want to delete the \"%s\" profile."
"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:
"
- "
%s
"),
+ _("Enlightenment was unable to fork a child process:"
+ "%s"),
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:
"
- "
%s
"), cmd);
+ _("Enlightenment was unable to fork a child process:"
+ "%s"), 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.
Are "
+ "the configuration.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
due to a copy "
+ "the configurationdue 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, "
LC_CTYPE");
- if (getenv("LC_NUMERIC")) strcat(buf2, "
LC_NUMERIC");
- if (getenv("LC_TIME")) strcat(buf2, "
LC_TIME");
- if (getenv("LC_COLLATE")) strcat(buf2, "
LC_COLLATE");
- if (getenv("LC_MONETARY")) strcat(buf2, "
LC_MONETARY");
- if (getenv("LC_MESSAGES")) strcat(buf2, "
LC_MESSAGES");
- if (getenv("LC_ALL")) strcat(buf2, "
LC_ALL");
+ if (getenv("LC_CTYPE")) strcat(buf2, "LC_CTYPE");
+ if (getenv("LC_NUMERIC")) strcat(buf2, "LC_NUMERIC");
+ if (getenv("LC_TIME")) strcat(buf2, "LC_TIME");
+ if (getenv("LC_COLLATE")) strcat(buf2, "LC_COLLATE");
+ if (getenv("LC_MONETARY")) strcat(buf2, "LC_MONETARY");
+ if (getenv("LC_MESSAGES")) strcat(buf2, "LC_MESSAGES");
+ if (getenv("LC_ALL")) strcat(buf2, "LC_ALL");
if (!buf2[0])
{
@@ -955,13 +955,13 @@ _lc_check(void)
return;
}
- snprintf(buf, sizeof(buf), _("You have some extra locale environment
"
- "variables set that may interfere with
"
- "correct display of your chosen language.
"
- "If you don't want these affected, use the
"
- "Environment variable settings to unset them.
"
- "The variables that may affect you are
"
- "as follows:
"
+ snprintf(buf, sizeof(buf), _("You have some extra locale environment"
+ "variables set that may interfere with"
+ "correct display of your chosen language."
+ "If you don't want these affected, use the"
+ "Environment variable settings to unset them."
+ "The variables that may affect you are"
+ "as follows:"
"%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",
- "Welcome to enlightenment.
"
- "
"
- "This is a sample set of content for a
"
+ "Welcome to enlightenment."
+ ""
+ "This is a sample set of content for a"
"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.
Are you sure this "
+ "the theme.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
due to a copy error."));
+ "the themedue 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.
"
+ "EConnMan that does not exist."
"Please install EConnMan 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
"
- "cpu frequency governor via the module's
"
+ e_dialog_text_set(dia, _("There was an error trying to set the"
+ "cpu frequency governor via the module's"
"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
"
- "CPU frequency at all. You may be missing
"
- "Kernel modules or features, or your CPU
"
+ e_dialog_text_set(dia, _("Your kernel does not support setting the"
+ "CPU frequency at all. You may be missing"
+ "Kernel modules or features, or your CPU"
"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
"
- "cpu frequency setting via the module's
"
+ e_dialog_text_set(dia, _("There was an error trying to set the"
+ "cpu frequency setting via the module's"
"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
"
- "cpu power state setting via the module's
"
+ e_dialog_text_set(dia, _("There was an error trying to set the"
+ "cpu power state setting via the module's"
"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
"
+ _("The freqset binary in the cpufreq module"
"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
"
- "is not owned by root or does not have the
"
- "setuid bit set. Please ensure this is the
"
- "case. For example:
"
- "
"
- "sudo chown root %s
"
- "sudo chmod u+s,a+x %s
"),
+ _("The freqset binary in the cpufreq module"
+ "is not owned by root or does not have the"
+ "setuid bit set. Please ensure this is the"
+ "case. For example:"
+ ""
+ "sudo chown root %s"
+ "sudo chmod u+s,a+x %s"),
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 everything...
"
- " Just type a few letters of the thing you are looking for.
"
- " Use cursor <up/down> to choose from the list of things.
"
+ _(" Ok, here comes the explanation of everything..."
+ " Just type a few letters of the thing you are looking for. "
+ " Use cursor <up/down> to choose from the list of things."
" Press <tab> to select"
- " an action, then press <return>.
"
- " This page will not show up next time you run everything.
"
- " <Esc> close this Dialog
"
- " <?> show this page
"
- " <return> run action
"
- " <ctrl+return> run action and continue
"
- " <tab> toggle between selectors
"
- " <ctrl+tab> complete input (depends on plugin)
"
- " <ctrl+'x'> jump to plugin beginning with 'x'
"
- " <ctrl+left/right> cycle through plugins
"
- " <ctrl+up/down> go to first/last item
"
- " <ctrl+1> toggle view modes (exit this page ;)
"
- " <ctrl+2> toggle list view modes
"
+ " an action, then press <return>."
+ " This page will not show up next time you run everything."
+ " <Esc> close this Dialog"
+ " <?> show this page"
+ " <return> run action"
+ " <ctrl+return> run action and continue"
+ " <tab> toggle between selectors"
+ " <ctrl+tab> complete input (depends on plugin)"
+ " <ctrl+'x'> jump to plugin beginning with 'x'"
+ " <ctrl+left/right> cycle through plugins"
+ " <ctrl+up/down> go to first/last item"
+ " <ctrl+1> toggle view modes (exit this page ;)"
+ " <ctrl+2> toggle list view modes"
" <ctrl+3> 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\".
"
+ snprintf(buf, sizeof(buf), _("You requested to delete \"%s\"."
"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
"
- "authentication session. The error code was %i.
"
+ _("Authentication via PAM had errors setting up the"
+ "authentication session. The error code was %i."
"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\".
"
+ snprintf(buf, sizeof(buf), _("You requested to delete \"%s\"."
"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, "%s>
", inst->ctxt->meta_title);
+ eina_strbuf_append_printf(str, "%s>", inst->ctxt->meta_title);
if (inst->ctxt->meta_artist)
- eina_strbuf_append_printf(str, "by> %s
", inst->ctxt->meta_artist);
+ eina_strbuf_append_printf(str, "by> %s", inst->ctxt->meta_artist);
if (inst->ctxt->meta_album)
- eina_strbuf_append_printf(str, "from> %s
", inst->ctxt->meta_album);
+ eina_strbuf_append_printf(str, "from> %s", 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 presentation mode."
- "
During presentation mode, screen saver, lock and "
+ "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."
- "
Now screen saver, lock and "
+ "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 offline mode.
"
+ body = _("Enlightenment is in offline mode."
"During offline mode, modules that use network will stop "
"polling remote services.");
}
else
{
summary = _("Exited Offline Mode");
- body = _("Now in online mode.
"
+ body = _("Now in online mode."
"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
. FIXME: We need to handle all the
+ /* We need to replace \n with . 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", "
");
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), "
PackageKit version: %d.%d.%d",
+ snprintf(buf, sizeof(buf), "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
"
- "shelf for this as it is already taken by internal
"
- "code for context menus.
"
+ _("You cannot use the right mouse button in the"
+ "shelf for this as it is already taken by internal"
+ "code for context menus."
"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
"
- "gadget for this as it is already taken by internal
"
- "code for context menus.
"
+ _("You cannot use the right mouse button in the"
+ "gadget for this as it is already taken by internal"
+ "code for context menus."
"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
"
- "shelf for this as it is already taken by internal
"
- "code for context menus.
"
+ _("You cannot use the right mouse button in the"
+ "shelf for this as it is already taken by internal"
+ "code for context menus."
"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
"
- "with terminal applications to create a persistent
"
- "terminal which reopens when closed, generally seen
"
- "in quake-style drop-down terminals.
"
- "Either the selected application is not a terminal
"
- "or the cmdline flag for changing the terminal's window
"
- "name is not known. Feel free to submit a bug report if this
"
- "is a terminal which can change its window name.
"
- "Alternatively, you can add a data.item to
"
- "%s/e-module-quickaccess.edj
"
- "Like so:
"
+ snprintf(buf, sizeof(buf), _("The relaunch option is meant to be used"
+ "with terminal applications to create a persistent"
+ "terminal which reopens when closed, generally seen"
+ "in quake-style drop-down terminals."
+ "Either the selected application is not a terminal"
+ "or the cmdline flag for changing the terminal's window"
+ "name is not known. Feel free to submit a bug report if this"
+ "is a terminal which can change its window name."
+ "Alternatively, you can add a data.item to"
+ "%s/e-module-quickaccess.edj"
+ "Like so:"
"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:
%s
"
- "and class:
%s
"
- "could not be found in the Quickaccess app database
"
- "This means that either the app is unknown to us
"
- "or it is not intended for use with this option.
"
+ _("The selected window created with name:%s"
+ "and class:%s"
+ "could not be found in the Quickaccess app database"
+ "This means that either the app is unknown to us"
+ "or it is not intended for use with this option."
"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:
"
- "Autohide - hide the window whenever it loses focus
"
- "Hide Instead of Raise - Hide window when activated without focus
"
- "Jump Mode - Switch to window's desk and raise instead of showing/hiding
"
- "Relaunch When Closed - Run the entry's command again when its window exits
"
+ _("The options found in the Quickaccess menu are as follows:"
+ "Autohide - hide the window whenever it loses focus"
+ "Hide Instead of Raise - Hide window when activated without focus"
+ "Jump Mode - Switch to window's desk and raise instead of showing/hiding"
+ "Relaunch When Closed - Run the entry's command again when its window exits"
"Transient - 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!
"
+ _("You deleted it on your own, you rascal!"
"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.
"
+ _("Well done."
"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.
"
+ _("The demo dialog has been bound to the keys you pressed."
"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
"
+ _("The newly displayed window will activate"
"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
"
- "the border menu of any window.
"
+ _("Quickaccess entries can be created from"
+ "the border menu of any window."
"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
"
- "windows and applications to keyboard shortcuts.
"
- "Once a Quickaccess entry has been created,
"
- "the associated window can be returned to immediately
"
+ _("Quickaccess is a way of binding user-selected"
+ "windows and applications to keyboard shortcuts."
+ "Once a Quickaccess entry has been created,"
+ "the associated window can be returned to immediately"
"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.
"
+ _("This appears to be your first time using the Quickaccess module."
"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.
"
- "Please use '.jpg' or '.png' extensions
"
- "only as other formats are not
"
+ _("File has an unspecified extension."
+ "Please use '.jpg' or '.png' extensions"
+ "only as other formats are not"
"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:
"
+ _("Upload failed with status code:"
"%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
"
+ _("This image will be uploaded"
"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
%s", thc->instring, thc->outstring);
+ snprintf(text, sizeof(text), "%s%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
%s", inst->cfg->netstatus.instring, inst->cfg->netstatus.outstring);
+ snprintf(text, sizeof(text), "%s%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:
%s"), url);
+ snprintf(buf, sizeof(buf), _("Ethernet connection wants to open a url:%s"), url);
else
- snprintf(buf, sizeof(buf), _("Network '%s' wants to open a url:
%s"), wn->name, url);
+ snprintf(buf, sizeof(buf), _("Network '%s' wants to open a url:%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.
"
- "These bindings provide three operations on click:
"
- "* Move (left button)
"
- "* Resize (middle/wheel button)
"
- "* Open Menu (right button)
"
- "The default key which must be held to activate these bindings
"
+ snprintf(buf, sizeof(buf), P_("Enlightenment sets default mouse bindings for objects."
+ "These bindings provide three operations on click:"
+ "* Move (left button)"
+ "* Resize (middle/wheel button)"
+ "* Open Menu (right button)"
+ "The default key which must be held to activate these bindings"
"is '%s'. Configure the modifiers for this binding below.",
- "Enlightenment sets default mouse bindings for objects.
"
- "These bindings provide three operations on click:
"
- "* Move (left button)
"
- "* Resize (middle/wheel button)
"
- "* Open Menu (right button)
"
- "The default keys which must be held to activate these bindings
"
+ "Enlightenment sets default mouse bindings for objects."
+ "These bindings provide three operations on click:"
+ "* Move (left button)"
+ "* Resize (middle/wheel button)"
+ "* Open Menu (right button)"
+ "The default keys which must be held to activate these bindings"
"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
"
- "versions, updates, security and
"
- "bugfixes, as well as available add-ons.
"
- "
"
- "This is very useful, because it lets
"
- "you know about available bug fixes and
"
- "security fixes when they happen. As a
"
- "result, Enlightenment will connect to
"
- "enlightenment.org and transmit some
"
- "information, much like any web browser
"
- "might do. No personal information such as
"
- "username, password or any personal files
"
- "will be transmitted. If you don't like this,
"
- "please disable this below. It is highly
"
- "advised that you do not disable this as it
"
- "may leave you vulnerable or having to live
"
+ _("Enlightenment can check for new"
+ "versions, updates, security and"
+ "bugfixes, as well as available add-ons."
+ ""
+ "This is very useful, because it lets"
+ "you know about available bug fixes and"
+ "security fixes when they happen. As a"
+ "result, Enlightenment will connect to"
+ "enlightenment.org and transmit some"
+ "information, much like any web browser"
+ "might do. No personal information such as"
+ "username, password or any personal files"
+ "will be transmitted. If you don't like this,"
+ "please disable this below. It is highly"
+ "advised that you do not disable this as it"
+ "may leave you vulnerable or having to live"
"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
"
+ _("A taskbar can be added to"
"show open windows and applications."
)
);