[maemo-commits] [maemo-commits] r18110 - in projects/haf/trunk/ke-recv: debian src
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Mon Apr 20 13:07:31 EEST 2009
- Previous message: [maemo-commits] r18109 - projects/haf/trunk/maemo-launcher/debian
- Next message: [maemo-commits] r18111 - projects/haf/trunk/ke-recv/src
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: kihamala Date: 2009-04-20 13:07:09 +0300 (Mon, 20 Apr 2009) New Revision: 18110 Modified: projects/haf/trunk/ke-recv/debian/changelog projects/haf/trunk/ke-recv/debian/control projects/haf/trunk/ke-recv/src/events.c projects/haf/trunk/ke-recv/src/events.h projects/haf/trunk/ke-recv/src/ke-recv.c projects/haf/trunk/ke-recv/src/mmc-check.c Log: l10n fixes Modified: projects/haf/trunk/ke-recv/debian/changelog =================================================================== --- projects/haf/trunk/ke-recv/debian/changelog 2009-04-20 08:53:25 UTC (rev 18109) +++ projects/haf/trunk/ke-recv/debian/changelog 2009-04-20 10:07:09 UTC (rev 18110) @@ -1,3 +1,10 @@ +ke-recv (3.14-1~unreleased) unstable; urgency=low + + * Added dependencies to various l10n packages whose translations are used. + * Removed a number of unused l10n strings. + + -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com> Mon, 20 Apr 2009 12:38:07 +0300 + ke-recv (3.13-1) unstable; urgency=low * Fixes: NB#110491 - BAT: Memory card formatting does not take place. Modified: projects/haf/trunk/ke-recv/debian/control =================================================================== --- projects/haf/trunk/ke-recv/debian/control 2009-04-20 08:53:25 UTC (rev 18109) +++ projects/haf/trunk/ke-recv/debian/control 2009-04-20 10:07:09 UTC (rev 18110) @@ -7,7 +7,7 @@ Package: ke-recv Architecture: any -Depends: ${shlibs:Depends}, ke-recv-l10n-mr | ke-recv-l10n-mr0, gconf2, osso-af-startup (>= 1.22), hal, dosfstools (>> 3.0.1-1maemo2), mtools +Depends: ${shlibs:Depends}, ke-recv-l10n-mr | ke-recv-l10n-mr0, hildon-fm-l10n-mr | hildon-fm-l10n-mr0, osso-filemanager-l10n-mr | osso-filemanager-l10n-mr0, hildon-status-bar-usb-l10n-mr | hildon-status-bar-usb-l10n-mr0, gconf2, osso-af-startup (>= 1.22), hal, dosfstools (>> 3.0.1-1maemo2), mtools Description: Program for automatical mounting and unmounting of memory cards. Program for receiving HW events from the HAL, managing mounting, renaming, formatting, and partitioning of memory cards, etc. Modified: projects/haf/trunk/ke-recv/src/events.c =================================================================== --- projects/haf/trunk/ke-recv/src/events.c 2009-04-20 08:53:25 UTC (rev 18109) +++ projects/haf/trunk/ke-recv/src/events.c 2009-04-20 10:07:09 UTC (rev 18110) @@ -364,7 +364,7 @@ ULOG_WARN_F("swap_switch_on() for %s: %s", mmc->name, strerror(ret)); if (ret == EINVAL) { - display_system_note(MSG_SWAP_FILE_CORRUPTED); + display_system_note("swap file corrupt"); } return FALSE; } @@ -451,13 +451,13 @@ if (dialog == USB_DIALOG) { mmc->swap_dialog_id = open_closeable_dialog(OSSO_GN_WARNING, - MSG_SWAP_IN_USB_USE, - MSG_SWAP_USB_CLOSEAPPS_BUTTON); + "in usb use", + "close apps"); } else { mmc->swap_dialog_id = open_closeable_dialog(OSSO_GN_WARNING, - MSG_SWAP_CARD_IN_USE, - MSG_SWAP_CLOSEAPPS_BUTTON); + "card in use", + "close apps"); } } } @@ -610,7 +610,7 @@ ULOG_INFO_F("USB mass storage module loaded for %s", dev); /* if (show) { - display_dialog(MSG_DEVICE_CONNECTED_VIA_USB); + display_dialog("connected via usb"); } */ inform_mmc_used_over_usb(TRUE, mmc); @@ -779,7 +779,6 @@ } } -#define MSG_UNABLE_TO_REPAIR _("card_unable_to_repair_memory_card") static void handle_e_repair(mmc_info_t *mmc) { @@ -795,7 +794,7 @@ udi = l->udi; } else { ULOG_ERR_F("device name for the partition not found"); - display_system_note(MSG_UNABLE_TO_REPAIR); + display_system_note("unable to repair"); return; } @@ -813,15 +812,15 @@ if (ret > 2) { ULOG_ERR_F("dosfsck returned: %d", ret - 2); - display_system_note(MSG_UNABLE_TO_REPAIR); + display_system_note("unable to repair"); return; } else if (ret > 0) { ULOG_ERR_F("mmc-check error code: %d", ret); - display_system_note(MSG_UNABLE_TO_REPAIR); + display_system_note("unable to repair"); return; } else if (ret < 0) { ULOG_ERR_F("exec_prog error code: %d", ret); - display_system_note(MSG_UNABLE_TO_REPAIR); + display_system_note("unable to repair"); return; } l->corrupt = 0; @@ -829,9 +828,9 @@ init_mmc_volumes(mmc); /* re-init volumes */ if (mount_volumes(mmc, FALSE)) { - display_system_note(_("card_memory_card_repaired")); + display_system_note("memory card repaired"); } else { - display_system_note(MSG_UNABLE_TO_REPAIR); + display_system_note("unable to repair"); } } @@ -884,9 +883,9 @@ set_mmc_corrupted_flag(FALSE, mmc); if (mount_volumes(mmc)) { - display_system_note(_("card_memory_card_repaired")); + display_system_note("memory card repaired"); } else { - display_system_note(MSG_UNABLE_TO_REPAIR); + display_system_note("unable to repair"); } #endif } @@ -1084,7 +1083,7 @@ if (mount_volumes(mmc, TRUE)) { /* display_dialog( - MSG_MEMORY_CARD_AVAILABLE); + "card available"); if (desktop_started) { check_install_file(mmc); } @@ -1186,11 +1185,6 @@ char buf[MAX_MSG_LEN + 1]; buf[0] = '\0'; - if (in && in->display_name[0] == '\0') { - strncpy(in->display_name, - (const char*)dgettext("hildon-fm", - "sfil_li_memorycard_internal"), 99); - } if (ex && ex->display_name[0] == '\0') { strncpy(ex->display_name, (const char*)dgettext("hildon-fm", @@ -1221,7 +1215,7 @@ /* if (mmc->dialog_id == -1 && mmc->swap_dialog_id == -1) { mmc->dialog_id = open_closeable_dialog(OSSO_GN_WARNING, - MSG_UNMOUNT_MEMORY_CARD_IN_USE, ""); + "card in use", ""); } */ } @@ -1289,7 +1283,7 @@ /* if (!mmc->skip_banner) { display_dialog( - MSG_MEMORY_CARD_AVAILABLE); + "card available"); } if (desktop_started) { check_install_file(mmc); Modified: projects/haf/trunk/ke-recv/src/events.h =================================================================== --- projects/haf/trunk/ke-recv/src/events.h 2009-04-20 08:53:25 UTC (rev 18109) +++ projects/haf/trunk/ke-recv/src/events.h 2009-04-20 10:07:09 UTC (rev 18110) @@ -117,25 +117,13 @@ /* some UI strings */ -#define MSG_DEVICE_CONNECTED_VIA_USB _("card_connected_via_usb") #define MSG_USB_DISCONNECTED _("card_ib_usb_disconnected") -#define MSG_NO_MEMORY_CARD_INSERTED _("card_ni_usb_no_memory_card_inserted") -#define MSG_MEMORY_CARD_AVAILABLE _("card_ib_memory_card_available") #define MSG_MEMORY_CARD_IS_CORRUPTED_INT _("card_ti_corrupted_device") #define MSG_MEMORY_CARD_IS_CORRUPTED _("card_ti_corrupted_card") #define MSG_FORMATTING_COMPLETE _("card_ib_formatting_complete") #define MSG_USB_MEMORY_CARD_IN_USE _("card_ni_usb_failed_card_in_use") #define MSG_USB_MEMORY_CARDS_IN_USE _("card_ni_usb_failed_cards_in_use") -#define MSG_UNMOUNT_MEMORY_CARD_IN_USE _("card_ni_card_in_use_warning") -#define MSG_CARD_IS_READ_ONLY _("mmc_ib_mmc_is_readonly") -#define MSG_SWAP_CARD_IN_USE _("card_no_mmc_cover_open_mmc_swap") -#define MSG_SWAP_CLOSEAPPS_BUTTON _("card_bd_mmc_cover_open_mmc_swap_ok") -#define MSG_SWAP_IN_USB_USE _("card_no_usb_connected_swap_on") -#define MSG_SWAP_FILE_CORRUPTED _("memr_ni_swap_file_corrupted") -#define MSG_SWAP_USB_CLOSEAPPS_BUTTON \ - _("card_bd_usb_connected_swap_on_closeapps") - #define MAX_MSG_LEN 500 int handle_event(mmc_event_t e, mmc_info_t *mmc, const char *arg); Modified: projects/haf/trunk/ke-recv/src/ke-recv.c =================================================================== --- projects/haf/trunk/ke-recv/src/ke-recv.c 2009-04-20 08:53:25 UTC (rev 18109) +++ projects/haf/trunk/ke-recv/src/ke-recv.c 2009-04-20 10:07:09 UTC (rev 18110) @@ -2812,7 +2812,7 @@ && int_mmc.whole_device == NULL) { ULOG_DEBUG_F("no cards inserted"); /* - display_system_note(MSG_NO_MEMORY_CARD_INSERTED); + display_system_note("no memory card inserted"); */ return; } Modified: projects/haf/trunk/ke-recv/src/mmc-check.c =================================================================== --- projects/haf/trunk/ke-recv/src/mmc-check.c 2009-04-20 08:53:25 UTC (rev 18109) +++ projects/haf/trunk/ke-recv/src/mmc-check.c 2009-04-20 10:07:09 UTC (rev 18110) @@ -222,7 +222,7 @@ hildon_banner = (HildonBanner*)hildon_banner_show_progress(NULL, NULL, - _("card_repairing_memory_card")); + "repairing"); hildon_banner_set_fraction(hildon_banner, 0.0); gtk_widget_show(GTK_WIDGET(hildon_banner)); }
- Previous message: [maemo-commits] r18109 - projects/haf/trunk/maemo-launcher/debian
- Next message: [maemo-commits] r18111 - projects/haf/trunk/ke-recv/src
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]