From 99846da77f960a72d615c82bf5c5881a2df83616 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Thu, 11 Oct 2012 09:42:59 +0900 Subject: Conversion to gettext to allow localization This is just the first step - convert the string literals, try to catch all the places where this isn't possible and the program needs to convert string constants at runtime (those are the N_ macros). Add a very rough first German localization so I can at least test what I have done. Seriously, I have never used a localized OS, so I am certain that I have many of the 'standard' translations wrong. Someone please take over :-) Major issues with this: - right now it hardcodes the search path for the message catalog to be ./locale - that's of course bogus, but it works well while doing initial testing. Once the tooling support is there we just should use the OS default. - even though de_DE defaults to ISO-8859-15 (or ISO-8859-1 - the internets can't seem to agree) I went with UTF-8 as that is what Gtk appears to want to use internally. ISO-8859-15 encoded .mo files create funny looking artefacts instead of Umlaute. - no support at all in the Makefile - I was hoping someone with more experience in how to best set this up would contribute a good set of Makefile rules - likely this will help fix the first issue in that it will also install the .mo file(s) in the correct place(s) For now simply run msgfmt -c -o subsurface.mo deutsch.po to create the subsurface.mo file and then move it to ./locale/de_DE.UTF-8/LC_MESSAGES/subsurface.mo If you make changes to the sources and need to add new strings to be translated, this is what seems to work (again, should be tooled through the Makefile): xgettext -o subsurface-new.pot -s -k_ -kN_ --add-comments="++GETTEXT" *.c msgmerge -s -U po/deutsch.po subsurface-new.pot If you do this PLEASE do one commit that just has the new msgid as changes in line numbers create a TON of diff-noise. Do changes to translations in a SEPARATE commit. - no testing at all on Windows or Mac It builds on Windows :-) Signed-off-by: Dirk Hohndel --- gtk-gui.c | 143 ++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 73 insertions(+), 70 deletions(-) (limited to 'gtk-gui.c') diff --git a/gtk-gui.c b/gtk-gui.c index e5ac16f94..79e7d35b8 100644 --- a/gtk-gui.c +++ b/gtk-gui.c @@ -3,6 +3,8 @@ /* creates the window and overall layout * divelist, dive info, equipment and printing are handled in their own source files */ +#include +#include #include #include #include @@ -135,7 +137,7 @@ void report_error(GError* error) { error_count++; char buffer[256]; - snprintf(buffer, sizeof(buffer), "Failed to open %i files.", error_count); + snprintf(buffer, sizeof(buffer), _("Failed to open %i files."), error_count); gtk_label_set(GTK_LABEL(error_label), buffer); } } @@ -148,7 +150,7 @@ static GtkFileFilter *setup_filter(void) gtk_file_filter_add_pattern(filter, "*.sda"); gtk_file_filter_add_pattern(filter, "*.SDA"); gtk_file_filter_add_mime_type(filter, "text/xml"); - gtk_file_filter_set_name(filter, "XML file"); + gtk_file_filter_set_name(filter, _("XML file")); return filter; } @@ -160,7 +162,7 @@ static void file_save_as(GtkWidget *w, gpointer data) char *current_file; char *current_dir; - dialog = gtk_file_chooser_dialog_new("Save File As", + dialog = gtk_file_chooser_dialog_new(_("Save File As"), GTK_WINDOW(main_window), GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, @@ -223,7 +225,7 @@ static gboolean ask_save_changes() { GtkWidget *dialog, *label, *content; gboolean quit = TRUE; - dialog = gtk_dialog_new_with_buttons("Save Changes?", + dialog = gtk_dialog_new_with_buttons(_("Save Changes?"), GTK_WINDOW(main_window), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, GTK_STOCK_NO, GTK_RESPONSE_NO, @@ -233,11 +235,11 @@ static gboolean ask_save_changes() if (!existing_filename){ label = gtk_label_new ( - "You have unsaved changes\nWould you like to save those before closing the datafile?"); + _("You have unsaved changes\nWould you like to save those before closing the datafile?")); } else { char *label_text = (char*) malloc(sizeof(char) * (94 + strlen(existing_filename))); sprintf(label_text, - "You have unsaved changes to file: %s \nWould you like to save those before closing the datafile?", + _("You have unsaved changes to file: %s \nWould you like to save those before closing the datafile?"), existing_filename); label = gtk_label_new (label_text); free(label_text); @@ -308,7 +310,7 @@ static void file_open(GtkWidget *w, gpointer data) GtkFileFilter *filter; const char *current_default; - dialog = gtk_file_chooser_dialog_new("Open File", + dialog = gtk_file_chooser_dialog_new(_("Open File"), GTK_WINDOW(main_window), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, @@ -515,7 +517,7 @@ static void pick_default_file(GtkWidget *w, GtkButton *button) GtkFileFilter *filter; struct stat sb; - fs_dialog = gtk_file_chooser_dialog_new("Choose Default XML File", + fs_dialog = gtk_file_chooser_dialog_new(_("Choose Default XML File"), GTK_WINDOW(main_window), GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, @@ -565,57 +567,57 @@ static void preferences_dialog(GtkWidget *w, gpointer data) menu_units = output_units; - dialog = gtk_dialog_new_with_buttons("Preferences", + dialog = gtk_dialog_new_with_buttons(_("Preferences"), GTK_WINDOW(main_window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL); - frame = gtk_frame_new("Units"); + frame = gtk_frame_new(_("Units")); vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog)); gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 5); box = gtk_vbox_new(FALSE, 6); gtk_container_add(GTK_CONTAINER(frame), box); - create_radio(box, "Depth:", - "Meter", set_meter, (output_units.length == METERS), - "Feet", set_feet, (output_units.length == FEET), + create_radio(box, _("Depth:"), + _("Meter"), set_meter, (output_units.length == METERS), + _("Feet"), set_feet, (output_units.length == FEET), NULL); - create_radio(box, "Pressure:", - "Bar", set_bar, (output_units.pressure == BAR), - "PSI", set_psi, (output_units.pressure == PSI), + create_radio(box, _("Pressure:"), + _("Bar"), set_bar, (output_units.pressure == BAR), + _("PSI"), set_psi, (output_units.pressure == PSI), NULL); - create_radio(box, "Volume:", - "Liter", set_liter, (output_units.volume == LITER), - "CuFt", set_cuft, (output_units.volume == CUFT), + create_radio(box, _("Volume:"), + _("Liter"), set_liter, (output_units.volume == LITER), + _("CuFt"), set_cuft, (output_units.volume == CUFT), NULL); - create_radio(box, "Temperature:", - "Celsius", set_celsius, (output_units.temperature == CELSIUS), - "Fahrenheit", set_fahrenheit, (output_units.temperature == FAHRENHEIT), + create_radio(box, _("Temperature:"), + _("Celsius"), set_celsius, (output_units.temperature == CELSIUS), + _("Fahrenheit"), set_fahrenheit, (output_units.temperature == FAHRENHEIT), NULL); - create_radio(box, "Weight:", - "kg", set_kg, (output_units.weight == KG), - "lbs", set_lbs, (output_units.weight == LBS), + create_radio(box, _("Weight:"), + _("kg"), set_kg, (output_units.weight == KG), + _("lbs"), set_lbs, (output_units.weight == LBS), NULL); - frame = gtk_frame_new("Show Columns"); + frame = gtk_frame_new(_("Show Columns")); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), frame, FALSE, FALSE, 5); box = gtk_hbox_new(FALSE, 6); gtk_container_add(GTK_CONTAINER(frame), box); - button = gtk_check_button_new_with_label("Temp"); + button = gtk_check_button_new_with_label(_("Temp")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), visible_cols.temperature); gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 6); g_signal_connect(G_OBJECT(button), "toggled", G_CALLBACK(temperature_toggle), NULL); - button = gtk_check_button_new_with_label("Cyl"); + button = gtk_check_button_new_with_label(_("Cyl")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), visible_cols.cylinder); gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 6); g_signal_connect(G_OBJECT(button), "toggled", G_CALLBACK(cylinder_toggle), NULL); @@ -625,44 +627,44 @@ static void preferences_dialog(GtkWidget *w, gpointer data) gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 6); g_signal_connect(G_OBJECT(button), "toggled", G_CALLBACK(nitrox_toggle), NULL); - button = gtk_check_button_new_with_label("SAC"); + button = gtk_check_button_new_with_label(_("SAC")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), visible_cols.sac); gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 6); g_signal_connect(G_OBJECT(button), "toggled", G_CALLBACK(sac_toggle), NULL); - button = gtk_check_button_new_with_label("OTU"); + button = gtk_check_button_new_with_label(_("OTU")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), visible_cols.otu); gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 6); g_signal_connect(G_OBJECT(button), "toggled", G_CALLBACK(otu_toggle), NULL); - button = gtk_check_button_new_with_label("Weight"); + button = gtk_check_button_new_with_label(_("Weight")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), visible_cols.totalweight); gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 6); g_signal_connect(G_OBJECT(button), "toggled", G_CALLBACK(totalweight_toggle), NULL); - button = gtk_check_button_new_with_label("Suit"); + button = gtk_check_button_new_with_label(_("Suit")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), visible_cols.suit); gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 6); g_signal_connect(G_OBJECT(button), "toggled", G_CALLBACK(suit_toggle), NULL); - frame = gtk_frame_new("Divelist Font"); + frame = gtk_frame_new(_("Divelist Font")); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), frame, FALSE, FALSE, 5); font = gtk_font_button_new_with_font(divelist_font); gtk_container_add(GTK_CONTAINER(frame),font); - frame = gtk_frame_new("Misc. Options"); + frame = gtk_frame_new(_("Misc. Options")); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), frame, FALSE, FALSE, 5); box = gtk_hbox_new(FALSE, 6); gtk_container_add(GTK_CONTAINER(frame), box); - button = gtk_check_button_new_with_label("Automatically group dives in trips"); + button = gtk_check_button_new_with_label(_("Automatically group dives in trips")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), autogroup); gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 6); g_signal_connect(G_OBJECT(button), "toggled", G_CALLBACK(autogroup_toggle), NULL); - frame = gtk_frame_new("Default XML Data File"); + frame = gtk_frame_new(_("Default XML Data File")); gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 5); box = gtk_hbox_new(FALSE, 6); gtk_container_add(GTK_CONTAINER(frame), box); @@ -757,7 +759,7 @@ static void selectevents_dialog(GtkWidget *w, gpointer data) int result; GtkWidget *dialog, *frame, *vbox, *table; - dialog = gtk_dialog_new_with_buttons("SelectEvents", + dialog = gtk_dialog_new_with_buttons(_("SelectEvents"), GTK_WINDOW(main_window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, @@ -766,7 +768,7 @@ static void selectevents_dialog(GtkWidget *w, gpointer data) /* initialize the function that fills the table */ create_toggle(NULL, NULL, NULL); - frame = gtk_frame_new("Enable / Disable Events"); + frame = gtk_frame_new(_("Enable / Disable Events")); vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog)); gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 5); @@ -797,7 +799,7 @@ static void renumber_dialog(GtkWidget *w, gpointer data) struct dive *dive; GtkWidget *dialog, *frame, *button, *vbox; - dialog = gtk_dialog_new_with_buttons("Renumber", + dialog = gtk_dialog_new_with_buttons(_("Renumber"), GTK_WINDOW(main_window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, @@ -806,7 +808,7 @@ static void renumber_dialog(GtkWidget *w, gpointer data) vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog)); - frame = gtk_frame_new("New starting number"); + frame = gtk_frame_new(_("New starting number")); gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 5); button = gtk_spin_button_new_with_range(1, 50000, 1); @@ -846,10 +848,10 @@ static void about_dialog(GtkWidget *w, gpointer data) gtk_show_about_dialog(NULL, "program-name", "Subsurface", - "comments", "Multi-platform divelog software in C", + "comments", _("Multi-platform divelog software in C"), "license", "GPLv2", "version", VERSION_STRING, - "copyright", "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012", + "copyright", _("Linus Torvalds, Dirk Hohndel, and others, 2011, 2012"), "logo-icon-name", "subsurface", /* Must be last: */ logo_property, logo, @@ -894,36 +896,36 @@ static void toggle_zoom(GtkWidget *w, gpointer data) } static GtkActionEntry menu_items[] = { - { "FileMenuAction", NULL, "File", NULL, NULL, NULL}, - { "LogMenuAction", NULL, "Log", NULL, NULL, NULL}, - { "ViewMenuAction", NULL, "View", NULL, NULL, NULL}, - { "FilterMenuAction", NULL, "Filter", NULL, NULL, NULL}, - { "HelpMenuAction", NULL, "Help", NULL, NULL, NULL}, + { "FileMenuAction", NULL, N_("File"), NULL, NULL, NULL}, + { "LogMenuAction", NULL, N_("Log"), NULL, NULL, NULL}, + { "ViewMenuAction", NULL, N_("View"), NULL, NULL, NULL}, + { "FilterMenuAction", NULL, N_("Filter"), NULL, NULL, NULL}, + { "HelpMenuAction", NULL, N_("Help"), NULL, NULL, NULL}, { "NewFile", GTK_STOCK_NEW, NULL, CTRLCHAR "N", NULL, G_CALLBACK(file_close) }, { "OpenFile", GTK_STOCK_OPEN, NULL, CTRLCHAR "O", NULL, G_CALLBACK(file_open) }, { "SaveFile", GTK_STOCK_SAVE, NULL, CTRLCHAR "S", NULL, G_CALLBACK(file_save) }, { "SaveAsFile", GTK_STOCK_SAVE_AS, NULL, SHIFTCHAR CTRLCHAR "S", NULL, G_CALLBACK(file_save_as) }, { "CloseFile", GTK_STOCK_CLOSE, NULL, NULL, NULL, G_CALLBACK(file_close) }, { "Print", GTK_STOCK_PRINT, NULL, CTRLCHAR "P", NULL, G_CALLBACK(do_print) }, - { "ImportFile", GTK_STOCK_GO_BACK, "Import XML File(s)", CTRLCHAR "I", NULL, G_CALLBACK(import_files) }, - { "DownloadLog", GTK_STOCK_GO_DOWN, "Download From Dive Computer", CTRLCHAR "D", NULL, G_CALLBACK(download_dialog) }, - { "AddDive", GTK_STOCK_ADD, "Add Dive", NULL, NULL, G_CALLBACK(add_dive_cb) }, - { "Preferences", GTK_STOCK_PREFERENCES, "Preferences", PREFERENCE_ACCEL, NULL, G_CALLBACK(preferences_dialog) }, - { "Renumber", NULL, "Renumber", NULL, NULL, G_CALLBACK(renumber_dialog) }, - { "YearlyStats", NULL, "Yearly Statistics", NULL, NULL, G_CALLBACK(show_yearly_stats) }, - { "SelectEvents", NULL, "SelectEvents", NULL, NULL, G_CALLBACK(selectevents_dialog) }, + { "ImportFile", GTK_STOCK_GO_BACK, N_("Import XML File(s)"), CTRLCHAR "I", NULL, G_CALLBACK(import_files) }, + { "DownloadLog", GTK_STOCK_GO_DOWN, N_("Download From Dive Computer"), CTRLCHAR "D", NULL, G_CALLBACK(download_dialog) }, + { "AddDive", GTK_STOCK_ADD, N_("Add Dive"), NULL, NULL, G_CALLBACK(add_dive_cb) }, + { "Preferences", GTK_STOCK_PREFERENCES, N_("Preferences"), PREFERENCE_ACCEL, NULL, G_CALLBACK(preferences_dialog) }, + { "Renumber", NULL, N_("Renumber"), NULL, NULL, G_CALLBACK(renumber_dialog) }, + { "YearlyStats", NULL, N_("Yearly Statistics"), NULL, NULL, G_CALLBACK(show_yearly_stats) }, + { "SelectEvents", NULL, N_("SelectEvents"), NULL, NULL, G_CALLBACK(selectevents_dialog) }, { "Quit", GTK_STOCK_QUIT, NULL, CTRLCHAR "Q", NULL, G_CALLBACK(quit) }, { "About", GTK_STOCK_ABOUT, NULL, NULL, NULL, G_CALLBACK(about_dialog) }, - { "ViewList", NULL, "List", CTRLCHAR "1", NULL, G_CALLBACK(view_list) }, - { "ViewProfile", NULL, "Profile", CTRLCHAR "2", NULL, G_CALLBACK(view_profile) }, - { "ViewInfo", NULL, "Info", CTRLCHAR "3", NULL, G_CALLBACK(view_info) }, - { "ViewThree", NULL, "Three", CTRLCHAR "4", NULL, G_CALLBACK(view_three) }, + { "ViewList", NULL, N_("List"), CTRLCHAR "1", NULL, G_CALLBACK(view_list) }, + { "ViewProfile", NULL, N_("Profile"), CTRLCHAR "2", NULL, G_CALLBACK(view_profile) }, + { "ViewInfo", NULL, N_("Info"), CTRLCHAR "3", NULL, G_CALLBACK(view_info) }, + { "ViewThree", NULL, N_("Three"), CTRLCHAR "4", NULL, G_CALLBACK(view_three) }, }; static gint nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]); static GtkToggleActionEntry toggle_items[] = { - { "Autogroup", NULL, "Autogroup", NULL, NULL, G_CALLBACK(autogroup_cb), FALSE }, - { "ToggleZoom", NULL, "Toggle Zoom", CTRLCHAR "0", NULL, G_CALLBACK(toggle_zoom), FALSE }, + { "Autogroup", NULL, N_("Autogroup"), NULL, NULL, G_CALLBACK(autogroup_cb), FALSE }, + { "ToggleZoom", NULL, N_("Toggle Zoom"), CTRLCHAR "0", NULL, G_CALLBACK(toggle_zoom), FALSE }, }; static gint ntoggle_items = sizeof (toggle_items) / sizeof (toggle_items[0]); @@ -974,6 +976,7 @@ static const gchar* ui_string = " \ static GtkWidget *get_menubar_menu(GtkWidget *window, GtkUIManager *ui_manager) { GtkActionGroup *action_group = gtk_action_group_new("Menu"); + gtk_action_group_set_translation_domain(action_group, "subsurface"); gtk_action_group_add_actions(action_group, menu_items, nmenu_items, 0); toggle_items[0].is_active = autogroup; gtk_action_group_add_toggle_actions(action_group, toggle_items, ntoggle_items, 0); @@ -1106,19 +1109,19 @@ void init_ui(int *argcp, char ***argvp) /* Frame for extended dive info */ nb_page = extended_dive_info_widget(); - gtk_notebook_append_page(GTK_NOTEBOOK(notebook), nb_page, gtk_label_new("Dive Notes")); + gtk_notebook_append_page(GTK_NOTEBOOK(notebook), nb_page, gtk_label_new(_("Dive Notes"))); /* Frame for dive equipment */ nb_page = equipment_widget(W_IDX_PRIMARY); - gtk_notebook_append_page(GTK_NOTEBOOK(notebook), nb_page, gtk_label_new("Equipment")); + gtk_notebook_append_page(GTK_NOTEBOOK(notebook), nb_page, gtk_label_new(_("Equipment"))); /* Frame for single dive statistics */ nb_page = single_stats_widget(); - gtk_notebook_append_page(GTK_NOTEBOOK(notebook), nb_page, gtk_label_new("Dive Info")); + gtk_notebook_append_page(GTK_NOTEBOOK(notebook), nb_page, gtk_label_new(_("Dive Info"))); /* Frame for total dive statistics */ nb_page = total_stats_widget(); - gtk_notebook_append_page(GTK_NOTEBOOK(notebook), nb_page, gtk_label_new("Stats")); + gtk_notebook_append_page(GTK_NOTEBOOK(notebook), nb_page, gtk_label_new(_("Stats"))); gtk_widget_set_app_paintable(win, TRUE); gtk_widget_show_all(win); @@ -1327,7 +1330,7 @@ static GtkComboBox *dive_computer_selector(GtkWidget *vbox) model = gtk_list_store_new(1, G_TYPE_POINTER); default_index = fill_computer_list(model); - frame = gtk_frame_new("Dive computer"); + frame = gtk_frame_new(_("Dive computer")); gtk_box_pack_start(GTK_BOX(hbox), frame, FALSE, TRUE, 3); combo_box = gtk_combo_box_new_with_model(GTK_TREE_MODEL(model)); @@ -1358,7 +1361,7 @@ static GtkEntry *dive_computer_device(GtkWidget *vbox) hbox = gtk_hbox_new(FALSE, 6); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 3); - frame = gtk_frame_new("Device name"); + frame = gtk_frame_new(_("Device name")); gtk_box_pack_start(GTK_BOX(hbox), frame, FALSE, TRUE, 3); entry = gtk_entry_new(); @@ -1390,7 +1393,7 @@ void import_files(GtkWidget *w, gpointer data) struct stat sb; GSList *filenames = NULL; - fs_dialog = gtk_file_chooser_dialog_new("Choose XML Files To Import Into Current Data File", + fs_dialog = gtk_file_chooser_dialog_new(_("Choose XML Files To Import Into Current Data File"), GTK_WINDOW(main_window), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, @@ -1465,7 +1468,7 @@ static GtkWidget *import_dive_computer(device_data_t *data, GtkDialog *dialog) button = gtk_dialog_get_widget_for_response(dialog, GTK_RESPONSE_ACCEPT); gtk_button_set_use_stock(GTK_BUTTON(button), 0); - gtk_button_set_label(GTK_BUTTON(button), "Retry"); + gtk_button_set_label(GTK_BUTTON(button), _("Retry")); vbox = gtk_dialog_get_content_area(dialog); @@ -1488,7 +1491,7 @@ void download_dialog(GtkWidget *w, gpointer data) .devname = NULL, }; - dialog = gtk_dialog_new_with_buttons("Download From Dive Computer", + dialog = gtk_dialog_new_with_buttons(_("Download From Dive Computer"), GTK_WINDOW(main_window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, @@ -1496,7 +1499,7 @@ void download_dialog(GtkWidget *w, gpointer data) NULL); vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog)); - label = gtk_label_new(" Please select dive computer and device. "); + label = gtk_label_new(_(" Please select dive computer and device. ")); gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, TRUE, 3); computer = dive_computer_selector(vbox); device = dive_computer_device(vbox); -- cgit v1.2.3-70-g09d2 From 45e84618f541b6d18b61974409c2f2f9a8477428 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Thu, 11 Oct 2012 23:08:45 +0900 Subject: Make translations of menu entries explicit It appears that at least for Norwegian the translations of the stock menu entries was missing. This patch adds those as explicit strings and merges those new strings into the .po files. The translations need to be updated in separate commits. Signed-off-by: Dirk Hohndel --- gtk-gui.c | 16 +++--- po/de_DE.po | 79 ++++++++++++++++++-------- po/nl.po | 184 ++++++++++++++++++++++++++++-------------------------------- po/no_NO.po | 79 ++++++++++++++++++-------- 4 files changed, 209 insertions(+), 149 deletions(-) (limited to 'gtk-gui.c') diff --git a/gtk-gui.c b/gtk-gui.c index 79e7d35b8..45a2ae7a9 100644 --- a/gtk-gui.c +++ b/gtk-gui.c @@ -901,12 +901,12 @@ static GtkActionEntry menu_items[] = { { "ViewMenuAction", NULL, N_("View"), NULL, NULL, NULL}, { "FilterMenuAction", NULL, N_("Filter"), NULL, NULL, NULL}, { "HelpMenuAction", NULL, N_("Help"), NULL, NULL, NULL}, - { "NewFile", GTK_STOCK_NEW, NULL, CTRLCHAR "N", NULL, G_CALLBACK(file_close) }, - { "OpenFile", GTK_STOCK_OPEN, NULL, CTRLCHAR "O", NULL, G_CALLBACK(file_open) }, - { "SaveFile", GTK_STOCK_SAVE, NULL, CTRLCHAR "S", NULL, G_CALLBACK(file_save) }, - { "SaveAsFile", GTK_STOCK_SAVE_AS, NULL, SHIFTCHAR CTRLCHAR "S", NULL, G_CALLBACK(file_save_as) }, - { "CloseFile", GTK_STOCK_CLOSE, NULL, NULL, NULL, G_CALLBACK(file_close) }, - { "Print", GTK_STOCK_PRINT, NULL, CTRLCHAR "P", NULL, G_CALLBACK(do_print) }, + { "NewFile", GTK_STOCK_NEW, N_("New"), CTRLCHAR "N", NULL, G_CALLBACK(file_close) }, + { "OpenFile", GTK_STOCK_OPEN, N_("Open"), CTRLCHAR "O", NULL, G_CALLBACK(file_open) }, + { "SaveFile", GTK_STOCK_SAVE, N_("Save"), CTRLCHAR "S", NULL, G_CALLBACK(file_save) }, + { "SaveAsFile", GTK_STOCK_SAVE_AS, N_("Save As"), SHIFTCHAR CTRLCHAR "S", NULL, G_CALLBACK(file_save_as) }, + { "CloseFile", GTK_STOCK_CLOSE, N_("Close"), NULL, NULL, G_CALLBACK(file_close) }, + { "Print", GTK_STOCK_PRINT, N_("Print"), CTRLCHAR "P", NULL, G_CALLBACK(do_print) }, { "ImportFile", GTK_STOCK_GO_BACK, N_("Import XML File(s)"), CTRLCHAR "I", NULL, G_CALLBACK(import_files) }, { "DownloadLog", GTK_STOCK_GO_DOWN, N_("Download From Dive Computer"), CTRLCHAR "D", NULL, G_CALLBACK(download_dialog) }, { "AddDive", GTK_STOCK_ADD, N_("Add Dive"), NULL, NULL, G_CALLBACK(add_dive_cb) }, @@ -914,8 +914,8 @@ static GtkActionEntry menu_items[] = { { "Renumber", NULL, N_("Renumber"), NULL, NULL, G_CALLBACK(renumber_dialog) }, { "YearlyStats", NULL, N_("Yearly Statistics"), NULL, NULL, G_CALLBACK(show_yearly_stats) }, { "SelectEvents", NULL, N_("SelectEvents"), NULL, NULL, G_CALLBACK(selectevents_dialog) }, - { "Quit", GTK_STOCK_QUIT, NULL, CTRLCHAR "Q", NULL, G_CALLBACK(quit) }, - { "About", GTK_STOCK_ABOUT, NULL, NULL, NULL, G_CALLBACK(about_dialog) }, + { "Quit", GTK_STOCK_QUIT, N_("Quit"), CTRLCHAR "Q", NULL, G_CALLBACK(quit) }, + { "About", GTK_STOCK_ABOUT, N_("About"), NULL, NULL, G_CALLBACK(about_dialog) }, { "ViewList", NULL, N_("List"), CTRLCHAR "1", NULL, G_CALLBACK(view_list) }, { "ViewProfile", NULL, N_("Profile"), CTRLCHAR "2", NULL, G_CALLBACK(view_profile) }, { "ViewInfo", NULL, N_("Info"), CTRLCHAR "3", NULL, G_CALLBACK(view_info) }, diff --git a/po/de_DE.po b/po/de_DE.po index 464b26792..0d6f5ef6c 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-11 07:42+0900\n" +"POT-Creation-Date: 2012-10-11 23:06+0900\n" "PO-Revision-Date: 2012-10-10 16:27+0900\n" "Last-Translator: Dirk Hohndel \n" "Language-Team: German\n" @@ -87,6 +87,10 @@ msgstr "%dst %dmin" msgid "(%s) or (%s)" msgstr "(%s) oder (%s)" +#: gtk-gui.c:918 +msgid "About" +msgstr "" + #: gtk-gui.c:912 msgid "Add Dive" msgstr "Tauchgang hinzufügen" @@ -99,11 +103,11 @@ msgstr "Tauchgang hinzufügen" msgid "Add to trip above" msgstr "Zum obigen Trip hinzufügen" -#: main.c:47 +#: main.c:46 msgid "Apr" msgstr "Apr" -#: main.c:48 +#: main.c:47 msgid "Aug" msgstr "Aug" @@ -153,6 +157,10 @@ msgstr "" "Bitte XML Dateien auswählen, die in die aktuelle Datei eingefügt werden " "sollen" +#: gtk-gui.c:908 +msgid "Close" +msgstr "" + #: divelist.c:2115 msgid "Collapse all" msgstr "Alle einfalten" @@ -189,7 +197,7 @@ msgstr "Datum und Zeit" msgid "Date:" msgstr "Datum:" -#: main.c:48 +#: main.c:47 msgid "Dec" msgstr "Dez" @@ -394,7 +402,7 @@ msgstr "Fehler beim Lesen von '%s'" msgid "Failed to read '%s'.\n" msgstr "Fehler beim Lesen von '%s'.\n" -#: main.c:47 +#: main.c:46 msgid "Feb" msgstr "Feb" @@ -410,7 +418,7 @@ msgstr "Datei" msgid "Filter" msgstr "Filter" -#: main.c:38 +#: main.c:37 msgid "Fri" msgstr "Fr" @@ -434,16 +442,16 @@ msgstr "XML Datei(en) einlesen" msgid "Info" msgstr "Informatinen" -#. ++GETTEXT: these are three character months -#: main.c:47 +#. ++GETTEXT: these are three letter months - we allow up to six code bytes +#: main.c:46 msgid "Jan" msgstr "Jan" -#: main.c:48 +#: main.c:47 msgid "Jul" msgstr "Jul" -#: main.c:47 +#: main.c:46 msgid "Jun" msgstr "Jun" @@ -479,7 +487,7 @@ msgstr "Alarm: Batterie schwach" msgid "Low Battery Warning" msgstr "Warnung: Batterie schwach" -#: main.c:47 +#: main.c:46 msgid "Mar" msgstr "Mär" @@ -522,7 +530,7 @@ msgstr "" msgid "MaxPress" msgstr "Max.Druck" -#: main.c:47 +#: main.c:46 msgid "May" msgstr "Mai" @@ -554,7 +562,7 @@ msgstr "Min. Temp." msgid "Misc. Options" msgstr "Verschiedene Optionen" -#: main.c:38 +#: main.c:37 msgid "Mon" msgstr "Mo" @@ -562,6 +570,10 @@ msgstr "Mo" msgid "Multi-platform divelog software in C" msgstr "Multi-Platform Tauchprogram in C" +#: gtk-gui.c:904 +msgid "New" +msgstr "" + #: gtk-gui.c:811 msgid "New starting number" msgstr "Neue erste Nummer" @@ -574,7 +586,7 @@ msgstr "Keine Tank Informationen" msgid "Notes" msgstr "Notizen" -#: main.c:48 +#: main.c:47 msgid "Nov" msgstr "Nov" @@ -582,10 +594,15 @@ msgstr "Nov" msgid "OTU" msgstr "OTU" -#: main.c:48 +#: main.c:47 msgid "Oct" msgstr "Okt" +#: gtk-gui.c:905 +#, fuzzy +msgid "Open" +msgstr "Datei öffnen" + #: gtk-gui.c:313 msgid "Open File" msgstr "Datei öffnen" @@ -622,6 +639,11 @@ msgstr "Druck:" msgid "Pretty print" msgstr "Schön drucken" +#: gtk-gui.c:909 +#, fuzzy +msgid "Print" +msgstr "Art des Ausdrucks" + #: print.c:505 msgid "Print only selected dives" msgstr "Nur ausgewählte Tauchgänge drucken" @@ -638,6 +660,10 @@ msgstr "Art des Ausdrucks" msgid "Profile" msgstr "Profil" +#: gtk-gui.c:917 +msgid "Quit" +msgstr "" + #: uemis.c:152 msgid "RGT Alert" msgstr "Alarm: verbleibende Gas-Zeit" @@ -695,10 +721,19 @@ msgstr "SDE Datei" msgid "Safety Stop Violation" msgstr "Verletzung des Sicherheitsstops" -#: main.c:38 +#: main.c:37 msgid "Sat" msgstr "Sa" +#: gtk-gui.c:906 +msgid "Save" +msgstr "" + +#: gtk-gui.c:907 +#, fuzzy +msgid "Save As" +msgstr "Datei speichern unter" + #: gtk-gui.c:228 msgid "Save Changes?" msgstr "Änderungen speichern?" @@ -711,7 +746,7 @@ msgstr "Datei speichern unter" msgid "SelectEvents" msgstr "Ereignisse auswählen" -#: main.c:48 +#: main.c:47 msgid "Sep" msgstr "Sep" @@ -759,8 +794,8 @@ msgstr "Statistiken" msgid "Suit" msgstr "Taucheranzug" -#. ++GETTEXT: these are three character days -#: main.c:38 +#. ++GETTEXT: these are three letter days - we allow up to six code bytes +#: main.c:37 msgid "Sun" msgstr "So" @@ -800,7 +835,7 @@ msgstr "Temperatur:" msgid "Three" msgstr "Drei" -#: main.c:38 +#: main.c:37 msgid "Thu" msgstr "Do" @@ -816,7 +851,7 @@ msgstr "Zoom ein-/ausschalten" msgid "Total Time" msgstr "Gesamtzeit" -#: main.c:38 +#: main.c:37 msgid "Tue" msgstr "Di" @@ -864,7 +899,7 @@ msgstr "Volumen:" msgid "Water Temp" msgstr "Wassertemperatur" -#: main.c:38 +#: main.c:37 msgid "Wed" msgstr "Mi" diff --git a/po/nl.po b/po/nl.po index 445e62ad5..89134e732 100644 --- a/po/nl.po +++ b/po/nl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: 2.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-11 07:42+0900\n" +"POT-Creation-Date: 2012-10-11 23:06+0900\n" "PO-Revision-Date: 2012-10-11 13:08+0100\n" "Last-Translator: Jacco van Koll \n" "Language-Team: Dutch\n" @@ -35,8 +35,7 @@ msgstr "" "\n" "Langste" -#: statistics.c:162 -#: statistics.c:163 +#: statistics.c:162 statistics.c:163 msgid "" "\n" "Maximum" @@ -44,9 +43,7 @@ msgstr "" "\n" "Grootste" -#: statistics.c:161 -#: statistics.c:162 -#: statistics.c:163 +#: statistics.c:161 statistics.c:162 statistics.c:163 msgid "" "\n" "Minimum" @@ -66,15 +63,12 @@ msgstr "" msgid " Please select dive computer and device. " msgstr " Selecteer duikcomputer en aansluiting. " -#: statistics.c:601 -#: statistics.c:603 -#: statistics.c:605 +#: statistics.c:601 statistics.c:603 statistics.c:605 #, c-format msgid "%.*f %s/min" msgstr "%.*f %s/min" -#: print.c:252 -#: statistics.c:512 +#: print.c:252 statistics.c:512 #, c-format msgid "%d min" msgstr "%d min" @@ -94,6 +88,10 @@ msgstr "%dst %dmin" msgid "(%s) or (%s)" msgstr "(%s) of (%s)" +#: gtk-gui.c:918 +msgid "About" +msgstr "" + #: gtk-gui.c:912 msgid "Add Dive" msgstr "Duik toevoegen" @@ -106,11 +104,11 @@ msgstr "Duik Toevoegen" msgid "Add to trip above" msgstr "Trip hierboven toevoegen" -#: main.c:47 +#: main.c:46 msgid "Apr" msgstr "Apr" -#: main.c:48 +#: main.c:47 msgid "Aug" msgstr "Aug" @@ -122,8 +120,7 @@ msgstr "Automatisch groeperen" msgid "Automatically group dives in trips" msgstr "Automatisch de duiken in trips groeperen" -#: statistics.c:668 -#: statistics.c:705 +#: statistics.c:668 statistics.c:705 msgid "Avg Depth" msgstr "Gem. diepte" @@ -143,9 +140,7 @@ msgstr "Gemiddelde tijd" msgid "Bar" msgstr "bar" -#: info.c:484 -#: info.c:911 -#: print.c:155 +#: info.c:484 info.c:911 print.c:155 msgid "Buddy" msgstr "Buddy" @@ -161,6 +156,10 @@ msgstr "Kies standaard XML bestand" msgid "Choose XML Files To Import Into Current Data File" msgstr "Kies de XML bestanden om te importeren in huidig data bestand" +#: gtk-gui.c:908 +msgid "Close" +msgstr "" + #: divelist.c:2115 msgid "Collapse all" msgstr "Alle uitklappen" @@ -173,13 +172,11 @@ msgstr "Nieuwe trip hierboven invoegen" msgid "CuFt" msgstr "cuft" -#: divelist.c:1265 -#: gtk-gui.c:620 +#: divelist.c:1265 gtk-gui.c:620 msgid "Cyl" msgstr "Fles" -#: equipment.c:926 -#: equipment.c:1062 +#: equipment.c:926 equipment.c:1062 msgid "Cylinder" msgstr "Fles" @@ -187,9 +184,7 @@ msgstr "Fles" msgid "Cylinders" msgstr "Flessen" -#: divelist.c:1258 -#: print.c:154 -#: statistics.c:696 +#: divelist.c:1258 print.c:154 statistics.c:696 msgid "Date" msgstr "Datum" @@ -201,7 +196,7 @@ msgstr "Datum en tijd" msgid "Date:" msgstr "Datum:" -#: main.c:48 +#: main.c:47 msgid "Dec" msgstr "Dec" @@ -269,9 +264,7 @@ msgstr "Duik #%d - %s" msgid "Dive #%d - %s %02d/%02d/%04d at %d:%02d" msgstr "Duik #%d - %s %02d/%02d/%04d om %d:%02d" -#: gtk-gui.c:1120 -#: info.c:669 -#: statistics.c:687 +#: gtk-gui.c:1120 info.c:669 statistics.c:687 msgid "Dive Info" msgstr "Duik informatie" @@ -319,8 +312,7 @@ msgstr "Duik-instructeur" msgid "Dives" msgstr "Duiken" -#: gtk-gui.c:911 -#: gtk-gui.c:1494 +#: gtk-gui.c:911 gtk-gui.c:1494 msgid "Download From Dive Computer" msgstr "Download uit duikcomputer" @@ -368,13 +360,11 @@ msgstr "Trip overzicht bewerken" msgid "Enable / Disable Events" msgstr "Inschakelen / uitschakelen Evenementen" -#: equipment.c:965 -#: equipment.c:1489 +#: equipment.c:965 equipment.c:1489 msgid "End" msgstr "Einde" -#: gtk-gui.c:1116 -#: info.c:504 +#: gtk-gui.c:1116 info.c:504 msgid "Equipment" msgstr "Uitrusting" @@ -411,7 +401,7 @@ msgstr "Fout bij lezen van '%s'" msgid "Failed to read '%s'.\n" msgstr "Fout bij lezen van '%s'.\n" -#: main.c:47 +#: main.c:46 msgid "Feb" msgstr "Feb" @@ -427,7 +417,7 @@ msgstr "Bestand" msgid "Filter" msgstr "Filter" -#: main.c:38 +#: main.c:37 msgid "Fri" msgstr "Vr" @@ -451,16 +441,16 @@ msgstr "Import XML bestand(en)" msgid "Info" msgstr "Informatie" -#. ++GETTEXT: these are three character months -#: main.c:47 +#. ++GETTEXT: these are three letter months - we allow up to six code bytes +#: main.c:46 msgid "Jan" msgstr "Jan" -#: main.c:48 +#: main.c:47 msgid "Jul" msgstr "Jul" -#: main.c:47 +#: main.c:46 msgid "Jun" msgstr "Jun" @@ -476,11 +466,7 @@ msgstr "Lijst" msgid "Liter" msgstr "Liter" -#: divelist.c:1269 -#: info.c:458 -#: info.c:478 -#: info.c:905 -#: print.c:155 +#: divelist.c:1269 info.c:458 info.c:478 info.c:905 print.c:155 msgid "Location" msgstr "Locatie" @@ -500,7 +486,7 @@ msgstr "Alarm: Lege batterij" msgid "Low Battery Warning" msgstr "Warnung:Lege batterij" -#: main.c:47 +#: main.c:46 msgid "Mar" msgstr "Mar" @@ -516,8 +502,7 @@ msgstr "Master" msgid "Max Deco Time Warning" msgstr "Warnung: Maximale Deco tijd" -#: statistics.c:666 -#: statistics.c:704 +#: statistics.c:666 statistics.c:704 msgid "Max Depth" msgstr "Max. Diepte" @@ -544,7 +529,7 @@ msgstr "" msgid "MaxPress" msgstr "Max.Druk" -#: main.c:47 +#: main.c:46 msgid "May" msgstr "Mei" @@ -576,7 +561,7 @@ msgstr "Min. Temp." msgid "Misc. Options" msgstr "Diverse opties" -#: main.c:38 +#: main.c:37 msgid "Mon" msgstr "Ma" @@ -584,6 +569,10 @@ msgstr "Ma" msgid "Multi-platform divelog software in C" msgstr "Multi-Platform Duikprogramma in C" +#: gtk-gui.c:904 +msgid "New" +msgstr "" + #: gtk-gui.c:811 msgid "New starting number" msgstr "Nieuw begin nummer" @@ -592,26 +581,27 @@ msgstr "Nieuw begin nummer" msgid "No Tank Data" msgstr "Geen fles informatie" -#: info.c:463 -#: info.c:496 -#: info.c:919 +#: info.c:463 info.c:496 info.c:919 msgid "Notes" msgstr "Notities" -#: main.c:48 +#: main.c:47 msgid "Nov" msgstr "Nov" -#: divelist.c:1268 -#: gtk-gui.c:635 -#: statistics.c:713 +#: divelist.c:1268 gtk-gui.c:635 statistics.c:713 msgid "OTU" msgstr "OTU" -#: main.c:48 +#: main.c:47 msgid "Oct" msgstr "Okt" +#: gtk-gui.c:905 +#, fuzzy +msgid "Open" +msgstr "Bestand openen" + #: gtk-gui.c:313 msgid "Open File" msgstr "Bestand openen" @@ -632,8 +622,7 @@ msgstr "Waarschuwing: PO2 Groen" msgid "PSI" msgstr "psi" -#: gtk-gui.c:570 -#: gtk-gui.c:913 +#: gtk-gui.c:570 gtk-gui.c:913 msgid "Preferences" msgstr "Instellingen" @@ -649,6 +638,11 @@ msgstr "Druk:" msgid "Pretty print" msgstr "Mooi afdrukken" +#: gtk-gui.c:909 +#, fuzzy +msgid "Print" +msgstr "Print type" + #: print.c:505 msgid "Print only selected dives" msgstr "Alleen de geselecteerde duiken printen" @@ -665,6 +659,10 @@ msgstr "Print type" msgid "Profile" msgstr "Profiel" +#: gtk-gui.c:917 +msgid "Quit" +msgstr "" + #: uemis.c:152 msgid "RGT Alert" msgstr "Alarm: resterende Gas-tijd" @@ -673,8 +671,7 @@ msgstr "Alarm: resterende Gas-tijd" msgid "RGT Warning" msgstr "Warnung: resterende Gas-tijd" -#: info.c:489 -#: info.c:916 +#: info.c:489 info.c:916 msgid "Rating" msgstr "Waardering" @@ -695,8 +692,7 @@ msgstr "Duik uit trip verwijderen" msgid "Remove selected dives from trip" msgstr "Geselecteerde duiken uit trip verwijderen" -#: gtk-gui.c:802 -#: gtk-gui.c:914 +#: gtk-gui.c:802 gtk-gui.c:914 msgid "Renumber" msgstr "Hernummeren" @@ -704,9 +700,7 @@ msgstr "Hernummeren" msgid "Retry" msgstr "Opnieuw" -#: divelist.c:1267 -#: gtk-gui.c:630 -#: statistics.c:712 +#: divelist.c:1267 gtk-gui.c:630 statistics.c:712 msgid "SAC" msgstr "Gas verbruiksratio" @@ -726,10 +720,19 @@ msgstr "SDE bestand" msgid "Safety Stop Violation" msgstr "veiligheidsstop overtreding" -#: main.c:38 +#: main.c:37 msgid "Sat" msgstr "Za" +#: gtk-gui.c:906 +msgid "Save" +msgstr "" + +#: gtk-gui.c:907 +#, fuzzy +msgid "Save As" +msgstr "Bestand opslaan als" + #: gtk-gui.c:228 msgid "Save Changes?" msgstr "Aanpassingen opslaan?" @@ -738,12 +741,11 @@ msgstr "Aanpassingen opslaan?" msgid "Save File As" msgstr "Bestand opslaan als" -#: gtk-gui.c:762 -#: gtk-gui.c:916 +#: gtk-gui.c:762 gtk-gui.c:916 msgid "SelectEvents" msgstr "gebeurtenissen selecteren" -#: main.c:48 +#: main.c:47 msgid "Sep" msgstr "Sept" @@ -775,8 +777,7 @@ msgstr "Alarm: snelheid" msgid "Speed Warning" msgstr "Warnung: snelheid" -#: equipment.c:962 -#: equipment.c:1488 +#: equipment.c:962 equipment.c:1488 msgid "Start" msgstr "Start" @@ -788,15 +789,12 @@ msgstr "Statistieken" msgid "Stats" msgstr "Statistieken" -#: divelist.c:1264 -#: gtk-gui.c:645 -#: info.c:490 -#: info.c:917 +#: divelist.c:1264 gtk-gui.c:645 info.c:490 info.c:917 msgid "Suit" msgstr "Pak" -#. ++GETTEXT: these are three character days -#: main.c:38 +#. ++GETTEXT: these are three letter days - we allow up to six code bytes +#: main.c:37 msgid "Sun" msgstr "Zo" @@ -836,12 +834,11 @@ msgstr "Temperatuur:" msgid "Three" msgstr "Drie" -#: main.c:38 +#: main.c:37 msgid "Thu" msgstr "Do" -#: info.c:791 -#: print.c:154 +#: info.c:791 print.c:154 msgid "Time" msgstr "Tijd" @@ -853,12 +850,11 @@ msgstr "Zoom in-/uitschakelen" msgid "Total Time" msgstr "Totale tijd" -#: main.c:38 +#: main.c:37 msgid "Tue" msgstr "Di" -#: equipment.c:1485 -#: equipment.c:1513 +#: equipment.c:1485 equipment.c:1513 msgid "Type" msgstr "Type" @@ -902,13 +898,11 @@ msgstr "Volume:" msgid "Water Temp" msgstr "Watertemperatuur" -#: main.c:38 +#: main.c:37 msgid "Wed" msgstr "Wo" -#: equipment.c:1012 -#: equipment.c:1609 -#: gtk-gui.c:640 +#: equipment.c:1012 equipment.c:1609 gtk-gui.c:640 msgid "Weight" msgstr "Gewicht" @@ -932,8 +926,7 @@ msgstr "" "Jaar\n" " > Maand" -#: gtk-gui.c:915 -#: statistics.c:345 +#: gtk-gui.c:915 statistics.c:345 msgid "Yearly Statistics" msgstr "Jaarlijkse statistieken" @@ -982,8 +975,7 @@ msgstr "Geintergreerd" msgid "kg" msgstr "kg" -#: divelist.c:1263 -#: gtk-gui.c:606 +#: divelist.c:1263 gtk-gui.c:606 msgid "lbs" msgstr "US Pond" @@ -996,8 +988,7 @@ msgstr "min" msgid "more than %d days" msgstr "Meer dan %d dagen" -#: equipment.c:1378 -#: equipment.c:1398 +#: equipment.c:1378 equipment.c:1398 msgid "unkn" msgstr "Onbek" @@ -1012,4 +1003,3 @@ msgstr "Niet gespecificeert" #: equipment.c:1514 msgid "weight" msgstr "Gewicht" - diff --git a/po/no_NO.po b/po/no_NO.po index 44a93f7d3..82a86f7e5 100644 --- a/po/no_NO.po +++ b/po/no_NO.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-11 07:42+0900\n" +"POT-Creation-Date: 2012-10-11 23:06+0900\n" "PO-Revision-Date: 2012-10-11 11:16+0100\n" "Last-Translator: Henrik Brautaset Aronsen \n" "Language-Team: Norwegian Bokmål\n" @@ -88,6 +88,10 @@ msgstr "%dt %dmin" msgid "(%s) or (%s)" msgstr "(%s) eller (%s)" +#: gtk-gui.c:918 +msgid "About" +msgstr "" + #: gtk-gui.c:912 msgid "Add Dive" msgstr "Nytt dykk" @@ -100,11 +104,11 @@ msgstr "Nytt dykk" msgid "Add to trip above" msgstr "Slå sammen med turen over" -#: main.c:47 +#: main.c:46 msgid "Apr" msgstr "apr" -#: main.c:48 +#: main.c:47 msgid "Aug" msgstr "aug" @@ -152,6 +156,10 @@ msgstr "Velg standard XML-fil" msgid "Choose XML Files To Import Into Current Data File" msgstr "Velg hvilke XML-filer du vil importere" +#: gtk-gui.c:908 +msgid "Close" +msgstr "" + #: divelist.c:2115 msgid "Collapse all" msgstr "Slå sammen alle" @@ -188,7 +196,7 @@ msgstr "Dato og tid" msgid "Date:" msgstr "Dato:" -#: main.c:48 +#: main.c:47 msgid "Dec" msgstr "des" @@ -393,7 +401,7 @@ msgstr "Kunne ikke åpne '%s'" msgid "Failed to read '%s'.\n" msgstr "Kunne ikke åpne '%s'.\n" -#: main.c:47 +#: main.c:46 msgid "Feb" msgstr "feb" @@ -409,7 +417,7 @@ msgstr "Fil" msgid "Filter" msgstr "Filter" -#: main.c:38 +#: main.c:37 msgid "Fri" msgstr "fre" @@ -433,16 +441,16 @@ msgstr "Importer XML-fil(er)" msgid "Info" msgstr "Info" -#. ++GETTEXT: these are three character months -#: main.c:47 +#. ++GETTEXT: these are three letter months - we allow up to six code bytes +#: main.c:46 msgid "Jan" msgstr "jan" -#: main.c:48 +#: main.c:47 msgid "Jul" msgstr "jul" -#: main.c:47 +#: main.c:46 msgid "Jun" msgstr "jun" @@ -478,7 +486,7 @@ msgstr "Alarm: dårlig batteri" msgid "Low Battery Warning" msgstr "Advarsel: dårlig batteri" -#: main.c:47 +#: main.c:46 msgid "Mar" msgstr "mar" @@ -521,7 +529,7 @@ msgstr "" msgid "MaxPress" msgstr "Maks. trykk" -#: main.c:47 +#: main.c:46 msgid "May" msgstr "mai" @@ -553,7 +561,7 @@ msgstr "Min. temp" msgid "Misc. Options" msgstr "Ymse valg" -#: main.c:38 +#: main.c:37 msgid "Mon" msgstr "man" @@ -561,6 +569,10 @@ msgstr "man" msgid "Multi-platform divelog software in C" msgstr "Dykkelogg i C for flere plattformer" +#: gtk-gui.c:904 +msgid "New" +msgstr "" + #: gtk-gui.c:811 msgid "New starting number" msgstr "Nytt startnummer" @@ -573,7 +585,7 @@ msgstr "Ingen tankinformasjon" msgid "Notes" msgstr "Notater" -#: main.c:48 +#: main.c:47 msgid "Nov" msgstr "nov" @@ -581,10 +593,15 @@ msgstr "nov" msgid "OTU" msgstr "OTU" -#: main.c:48 +#: main.c:47 msgid "Oct" msgstr "okt" +#: gtk-gui.c:905 +#, fuzzy +msgid "Open" +msgstr "Åpne fil" + #: gtk-gui.c:313 msgid "Open File" msgstr "Åpne fil" @@ -621,6 +638,11 @@ msgstr "Trykk:" msgid "Pretty print" msgstr "Pen utskrift" +#: gtk-gui.c:909 +#, fuzzy +msgid "Print" +msgstr "Utskriftstype" + #: print.c:505 msgid "Print only selected dives" msgstr "Skriv ut valgte dykk" @@ -637,6 +659,10 @@ msgstr "Utskriftstype" msgid "Profile" msgstr "Profil" +#: gtk-gui.c:917 +msgid "Quit" +msgstr "" + #: uemis.c:152 msgid "RGT Alert" msgstr "Alarm: gjenværende gasstid" @@ -694,10 +720,19 @@ msgstr "SDE-fil" msgid "Safety Stop Violation" msgstr "Brudd på sikkerhetsstopp" -#: main.c:38 +#: main.c:37 msgid "Sat" msgstr "lør" +#: gtk-gui.c:906 +msgid "Save" +msgstr "" + +#: gtk-gui.c:907 +#, fuzzy +msgid "Save As" +msgstr "Lagre fil som" + #: gtk-gui.c:228 msgid "Save Changes?" msgstr "Lagre endringer?" @@ -710,7 +745,7 @@ msgstr "Lagre fil som" msgid "SelectEvents" msgstr "Velg hendelser" -#: main.c:48 +#: main.c:47 msgid "Sep" msgstr "sep" @@ -758,8 +793,8 @@ msgstr "Statistikk" msgid "Suit" msgstr "Drakt" -#. ++GETTEXT: these are three character days -#: main.c:38 +#. ++GETTEXT: these are three letter days - we allow up to six code bytes +#: main.c:37 msgid "Sun" msgstr "søn" @@ -799,7 +834,7 @@ msgstr "Temperatur:" msgid "Three" msgstr "Alle" -#: main.c:38 +#: main.c:37 msgid "Thu" msgstr "tor" @@ -815,7 +850,7 @@ msgstr "Zoom av/på" msgid "Total Time" msgstr "Total tid" -#: main.c:38 +#: main.c:37 msgid "Tue" msgstr "tir" @@ -863,7 +898,7 @@ msgstr "Volum:" msgid "Water Temp" msgstr "Vanntemperatur" -#: main.c:38 +#: main.c:37 msgid "Wed" msgstr "ons" -- cgit v1.2.3-70-g09d2