diff --git a/po/POTFILES.in b/po/POTFILES.in index 0f1bb74eb..3efda266d 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -134,6 +134,9 @@ src/modules/access/e_mod_config.c src/modules/backlight/e_mod_main.c src/modules/battery/e_mod_config.c src/modules/battery/e_mod_main.c +src/modules/bluez4/agent.c +src/modules/bluez4/e_mod_main.c +src/modules/bluez4/ebluez4.c src/modules/clock/e_mod_config.c src/modules/clock/e_mod_main.c src/modules/conf_comp/e_mod_config.c diff --git a/src/modules/bluez4/agent.c b/src/modules/bluez4/agent.c index e7fd227fe..e60a032e2 100644 --- a/src/modules/bluez4/agent.c +++ b/src/modules/bluez4/agent.c @@ -57,7 +57,7 @@ _create_dialog(const char *title, const char *msg, con = e_container_current_get(e_manager_current_get()); dialog = e_dialog_new(con, title, class); - e_dialog_title_set(dialog, title); + e_dialog_title_set(dialog, _(title)); e_dialog_icon_set(dialog, icon, 64); e_dialog_text_set(dialog, msg); return dialog; @@ -68,7 +68,7 @@ _display_msg(const char *title, const char *msg) { E_Dialog *dialog = _create_dialog(title, msg, "view-hidden-files", "display"); - e_dialog_button_add(dialog, "OK", NULL, NULL, NULL); + e_dialog_button_add(dialog, _("OK"), NULL, NULL, NULL); e_dialog_show(dialog); } @@ -113,7 +113,7 @@ _ask(const char *title, const char *ask_msg, const char *ok_label, dialog->data = eldbus_message; e_win_delete_callback_set(dialog->win, _close); e_dialog_button_add(dialog, ok_label, NULL, _ok, NULL); - e_dialog_button_add(dialog, "Reject", NULL, _reject, NULL); + e_dialog_button_add(dialog, _("Reject"), NULL, _reject, NULL); e_dialog_show(dialog); } @@ -130,10 +130,10 @@ _agent_request_pin_code(const Eldbus_Service_Interface *iface, const Eldbus_Mess { Eldbus_Message *msg = (Eldbus_Message *)message; eldbus_message_ref(msg); - e_entry_dialog_show("Pin Code Requested", NULL, - "Enter the PinCode above. It should have 1-16 " - "characters and can be alphanumeric.", "0000", - "OK", "Cancel", _pincode_ok, _cancel, msg); + e_entry_dialog_show(_("Pin Code Requested"), NULL, + _("Enter the PinCode above. It should have 1-16 " + "characters and can be alphanumeric."), "0000", + _("OK"), _("Cancel"), _pincode_ok, _cancel, msg); return NULL; } @@ -142,9 +142,10 @@ _agent_request_passkey(const Eldbus_Service_Interface *iface, const Eldbus_Messa { Eldbus_Message *msg = (Eldbus_Message *)message; eldbus_message_ref(msg); - e_entry_dialog_show("Passkey Requested", NULL, "Enter the Passkey above. " - "It should be a numeric value between 0-999999.", - "0", "OK", "Cancel", _passkey_ok, _cancel, msg); + e_entry_dialog_show(_("Passkey Requested"), NULL, + _("Enter the Passkey above. " + "It should be a numeric value between 0-999999."), + "0", _("OK"), _("Cancel"), _passkey_ok, _cancel, msg); return NULL; } @@ -159,9 +160,9 @@ _agent_display_passkey(const Eldbus_Service_Interface *iface, const Eldbus_Messa if(!eldbus_message_arguments_get(message, "ouq", &device, &passkey, &entered)) return eldbus_message_error_new(message, BLUEZ_ERROR_FAILED, GET_ERROR_MSG); dev = eina_list_search_unsorted(ctxt->devices, ebluez4_dev_path_cmp, device); - snprintf(buf, sizeof(buf), "%d keys were typed on %s. Passkey is %06d", + snprintf(buf, sizeof(buf), _("%d keys were typed on %s. Passkey is %06d"), entered, dev->name, passkey); - _display_msg("Display Passkey", buf); + _display_msg(N_("Display Passkey"), buf); return eldbus_message_method_return_new(message); } @@ -174,8 +175,8 @@ _agent_display_pin_code(const Eldbus_Service_Interface *iface, const Eldbus_Mess if(!eldbus_message_arguments_get(message, "os", &device, &pincode)) return eldbus_message_error_new(message, BLUEZ_ERROR_FAILED, GET_ERROR_MSG); dev = eina_list_search_unsorted(ctxt->devices, ebluez4_dev_path_cmp, device); - snprintf(buf, sizeof(buf), "Pincode for %s is %s", dev->name, pincode); - _display_msg("Display Pincode", buf); + snprintf(buf, sizeof(buf), _("Pincode for %s is %s"), dev->name, pincode); + _display_msg(N_("Display Pincode"), buf); return eldbus_message_method_return_new(message); } @@ -189,10 +190,10 @@ _agent_request_confirmation(const Eldbus_Service_Interface *iface, const Eldbus_ if(!eldbus_message_arguments_get(message, "ou", &device, &passkey)) return eldbus_message_error_new(message, BLUEZ_ERROR_FAILED, GET_ERROR_MSG); dev = eina_list_search_unsorted(ctxt->devices, ebluez4_dev_path_cmp, device); - snprintf(buf, sizeof(buf), "%06d is the passkey presented in %s?", + snprintf(buf, sizeof(buf), _("%06d is the passkey presented in %s?"), passkey, dev->name); eldbus_message_ref((Eldbus_Message *)message); - _ask("Confirm Request", buf, "Confirm", (Eldbus_Message *)message); + _ask(N_("Confirm Request"), buf, _("Confirm"), (Eldbus_Message *)message); return NULL; } @@ -205,10 +206,10 @@ _agent_authorize(const Eldbus_Service_Interface *iface, const Eldbus_Message *me if(!eldbus_message_arguments_get(message, "os", &device, &uuid)) return eldbus_message_error_new(message, BLUEZ_ERROR_FAILED, GET_ERROR_MSG); dev = eina_list_search_unsorted(ctxt->devices, ebluez4_dev_path_cmp, device); - snprintf(buf, sizeof(buf), "Grant permission for %s to connect?", + snprintf(buf, sizeof(buf), _("Grant permission for %s to connect?"), dev->name); eldbus_message_ref((Eldbus_Message *)message); - _ask("Authorize Connection", buf, "Grant", (Eldbus_Message *)message); + _ask(N_("Authorize Connection"), buf, _("Grant"), (Eldbus_Message *)message); return NULL; } diff --git a/src/modules/bluez4/e_mod_main.c b/src/modules/bluez4/e_mod_main.c index 73628e272..5a7b74578 100644 --- a/src/modules/bluez4/e_mod_main.c +++ b/src/modules/bluez4/e_mod_main.c @@ -88,7 +88,7 @@ _ebluez4_cb_paired(void *data, Eina_Bool success, const char *err_msg) if (success) _ebluez4_search_dialog_del(inst); else - ebluez4_show_error("Bluez Error", err_msg); + ebluez4_show_error(_("Bluez Error"), err_msg); } static void @@ -116,7 +116,7 @@ _ebluez4_cb_search(void *data, E_Menu *m, E_Menu_Item *mi) con = e_container_current_get(e_manager_current_get()); dialog = e_dialog_new(con, "Search Dialog", "search"); - e_dialog_title_set(dialog, "Searching for Devices..."); + e_dialog_title_set(dialog, _("Searching for Devices...")); e_dialog_resizable_set(dialog, EINA_TRUE); e_win_delete_callback_set(dialog->win, _ebluez4_cb_search_dialog_del); @@ -187,7 +187,7 @@ _ebluez4_cb_adap_settings(void *data) con = e_container_current_get(e_manager_current_get()); dialog = e_dialog_new(con, "Adapter Dialog", "adapter"); - e_dialog_title_set(dialog, "Adapter Settings"); + e_dialog_title_set(dialog, _("Adapter Settings")); e_dialog_resizable_set(dialog, EINA_TRUE); e_win_delete_callback_set(dialog->win, _ebluez4_cb_adap_settings_dialog_del); @@ -195,11 +195,11 @@ _ebluez4_cb_adap_settings(void *data) list = e_widget_list_add(evas, 0, 0); - ck = e_widget_check_add(evas, "Default", NULL); + ck = e_widget_check_add(evas, _("Default"), NULL); e_widget_check_checked_set(ck, adap->is_default); e_widget_list_object_append(list, ck, 0, 0, 0); - ck = e_widget_check_add(evas, "Powered", &(adap->powered_checked)); + ck = e_widget_check_add(evas, _("Powered"), &(adap->powered_checked)); e_widget_check_checked_set(ck, adap->powered); e_widget_list_object_append(list, ck, 0, 0, 0); evas_object_smart_callback_add(ck, "changed", _ebluez4_powered_changed, @@ -207,14 +207,14 @@ _ebluez4_cb_adap_settings(void *data) ck_list = eina_list_append(ck_list, ck); - ck = e_widget_check_add(evas, "Visible", &(adap->visible_checked)); + ck = e_widget_check_add(evas, _("Visible"), &(adap->visible_checked)); e_widget_check_checked_set(ck, adap->visible); e_widget_list_object_append(list, ck, 0, 0, 0); evas_object_smart_callback_add(ck, "changed", _ebluez4_visible_changed, adap); ck_list = eina_list_append(ck_list, ck); - ck = e_widget_check_add(evas, "Pairable", &(adap->pairable_checked)); + ck = e_widget_check_add(evas, _("Pairable"), &(adap->pairable_checked)); e_widget_check_checked_set(ck, adap->pairable); e_widget_list_object_append(list, ck, 0, 0, 0); evas_object_smart_callback_add(ck, "changed", @@ -261,7 +261,7 @@ _ebluez4_cb_adap_list(void *data, E_Menu *m, E_Menu_Item *mi) con = e_container_current_get(e_manager_current_get()); dialog = e_dialog_new(con, "Adapters Dialog", "adapters"); - e_dialog_title_set(dialog, "Adapters Available"); + e_dialog_title_set(dialog, _("Adapters Available")); e_dialog_resizable_set(dialog, EINA_TRUE); e_win_delete_callback_set(dialog->win, _ebluez4_cb_adap_list_dialog_del); @@ -371,7 +371,7 @@ _ebluez4_add_devices(Instance *inst) if (dev->paired) { mi = e_menu_item_new(m); - e_menu_item_label_set(mi, "Paired Devices"); + e_menu_item_label_set(mi, _("Paired Devices")); e_menu_item_disabled_set(mi, EINA_TRUE); ret = EINA_TRUE; break; @@ -395,17 +395,17 @@ _ebluez4_add_devices(Instance *inst) if (dev->connected) { e_menu_item_toggle_set(mi, 1); - e_menu_item_label_set(submi, "Disconnect"); + e_menu_item_label_set(submi, _("Disconnect")); e_menu_item_callback_set(submi, _ebluez4_cb_disconnect, dev); } else { e_menu_item_toggle_set(mi, 0); - e_menu_item_label_set(submi, "Connect"); + e_menu_item_label_set(submi, _("Connect")); e_menu_item_callback_set(submi, _ebluez4_cb_connect, dev); } submi = e_menu_item_new(subm); - e_menu_item_label_set(submi, "Forget"); + e_menu_item_label_set(submi, _("Forget")); e_menu_item_callback_set(submi, _ebluez4_cb_forget, dev); #ifdef HAVE_BLUETOOTH @@ -414,7 +414,7 @@ _ebluez4_add_devices(Instance *inst) /* Auto lock when away */ submi = e_menu_item_new(subm); e_menu_item_check_set(submi, 1); - e_menu_item_label_set(submi, "Lock on disconnect"); + e_menu_item_label_set(submi, _("Lock on disconnect")); e_menu_item_callback_set(submi, _ebluez4_cb_lock, dev); chk = ebluez4_config->lock_dev_addr && dev->addr && !strcmp(dev->addr, ebluez4_config->lock_dev_addr); @@ -422,7 +422,7 @@ _ebluez4_add_devices(Instance *inst) submi = e_menu_item_new(subm); e_menu_item_check_set(submi, 1); - e_menu_item_label_set(submi, "Unlock on disconnect"); + e_menu_item_label_set(submi, _("Unlock on disconnect")); e_menu_item_callback_set(submi, _ebluez4_cb_unlock, dev); chk = ebluez4_config->unlock_dev_addr && dev->addr && !strcmp(dev->addr, ebluez4_config->unlock_dev_addr); @@ -444,7 +444,7 @@ _ebluez4_menu_new(Instance *inst) m = e_menu_new(); e_menu_post_deactivate_callback_set(m, _menu_post_deactivate, inst); - e_menu_title_set(m, "Bluez4"); + e_menu_title_set(m, _("Bluez4")); inst->menu = m; if (_ebluez4_add_devices(inst)) @@ -454,11 +454,11 @@ _ebluez4_menu_new(Instance *inst) } mi = e_menu_item_new(m); - e_menu_item_label_set(mi, "Search New Devices"); + e_menu_item_label_set(mi, _("Search New Devices")); e_menu_item_callback_set(mi, _ebluez4_cb_search, inst); mi = e_menu_item_new(m); - e_menu_item_label_set(mi, "Adapter Settings"); + e_menu_item_label_set(mi, _("Adapter Settings")); e_menu_item_callback_set(mi, _ebluez4_cb_adap_list, inst); zone = e_util_zone_current_get(e_manager_current_get()); @@ -559,7 +559,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient) static const char * _gc_label(const E_Gadcon_Client_Class *client_class) { - return "Bluez4"; + return _("Bluez4"); } static Evas_Object * @@ -805,7 +805,7 @@ void ebluez4_show_error(const char *err_name, const char *err_msg) { snprintf(tmpbuf, sizeof(tmpbuf), "%s: %s.", err_name, err_msg); - e_util_dialog_internal("An error has ocurred", tmpbuf); + e_util_dialog_internal(_("An error has ocurred"), tmpbuf); } void diff --git a/src/modules/bluez4/ebluez4.c b/src/modules/bluez4/ebluez4.c index af509108f..e6fbed729 100644 --- a/src/modules/bluez4/ebluez4.c +++ b/src/modules/bluez4/ebluez4.c @@ -215,9 +215,10 @@ _on_dev_property_changed(void *context, const Eldbus_Message *msg) if (!eldbus_message_arguments_get(msg, "sv", &key, &variant)) { snprintf(err_msg, sizeof(err_msg), - "Property of %s changed, but could not be read", dev->name); + _("Property of %s changed, but could not be read"), + dev->name); ERR("%s", err_msg); - ebluez4_show_error("Bluez Error", err_msg); + ebluez4_show_error(_("Bluez Error"), err_msg); return; } @@ -431,12 +432,12 @@ _on_list_devices(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) { Eldbus_Message_Iter *array; const char *path; - const char *err_msg = "Error reading list of devices"; + const char *err_msg = _("Error reading list of devices"); if (!eldbus_message_arguments_get(msg, "ao", &array)) { ERR("%s", err_msg); - ebluez4_show_error("Bluez Error", err_msg); + ebluez4_show_error(_("Bluez Error"), err_msg); return; } @@ -456,9 +457,9 @@ _on_adap_property_changed(void *context, const Eldbus_Message *msg) if (!eldbus_message_arguments_get(msg, "sv", &key, &variant)) { snprintf(err_msg, sizeof(err_msg), - "Property of %s changed, but could not be read", adap->name); + _("Property of %s changed, but could not be read"), adap->name); ERR("%s", err_msg); - ebluez4_show_error("Bluez Error", err_msg); + ebluez4_show_error(_("Bluez Error"), err_msg); return; } @@ -594,12 +595,12 @@ _on_list_adapters(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending { Eldbus_Message_Iter *array; const char *path; - const char *err_msg = "Error reading list of adapters"; + const char *err_msg = _("Error reading list of adapters"); if (!eldbus_message_arguments_get(msg, "ao", &array)) { ERR("%s", err_msg); - ebluez4_show_error("Bluez Error", err_msg); + ebluez4_show_error(_("Bluez Error"), err_msg); return; } @@ -612,12 +613,12 @@ _set_default_adapter(const Eldbus_Message *msg) { Adapter *adap; const char *adap_path; - const char *err_msg = "Error reading path of Default Adapter"; + const char *err_msg = _("Error reading path of Default Adapter"); if (!eldbus_message_arguments_get(msg, "o", &adap_path)) { ERR("%s", err_msg); - ebluez4_show_error("Bluez Error", err_msg); + ebluez4_show_error(_("Bluez Error"), err_msg); return; } @@ -672,12 +673,12 @@ static void _on_adapter_removed(void *context, const Eldbus_Message *msg) { const char *adap_path; - const char *err_msg = "Error reading path of Removed Adapter"; + const char *err_msg = _("Error reading path of Removed Adapter"); if (!eldbus_message_arguments_get(msg, "o", &adap_path)) { ERR("%s", err_msg); - ebluez4_show_error("Bluez Error", err_msg); + ebluez4_show_error(_("Bluez Error"), err_msg); return; } @@ -688,12 +689,12 @@ static void _on_adapter_added(void *context, const Eldbus_Message *msg) { const char *adap_path; - const char *err_msg = "Error reading path of Added Adapter"; + const char *err_msg = _("Error reading path of Added Adapter"); if (!eldbus_message_arguments_get(msg, "o", &adap_path)) { ERR("%s", err_msg); - ebluez4_show_error("Bluez Error", err_msg); + ebluez4_show_error(_("Bluez Error"), err_msg); return; }