diff options
| -rw-r--r-- | dive.c | 21 | ||||
| -rw-r--r-- | dive.h | 2 | ||||
| -rw-r--r-- | gtk-gui.c | 4 | ||||
| -rw-r--r-- | info.c | 60 | ||||
| -rw-r--r-- | libdivecomputer.c | 2 | ||||
| -rw-r--r-- | parse-xml.c | 2 | ||||
| -rw-r--r-- | po/fr_FR.po | 377 | ||||
| -rw-r--r-- | po/nl_NL.po | 265 | ||||
| -rw-r--r-- | profile.c | 37 | ||||
| -rw-r--r-- | save-xml.c | 2 | ||||
| -rw-r--r-- | statistics.c | 19 | ||||
| -rw-r--r-- | uemis.c | 2 |
12 files changed, 455 insertions, 338 deletions
@@ -695,6 +695,23 @@ static void merge_cylinder_info(cylinder_t *res, cylinder_t *a, cylinder_t *b) MERGE_MIN(res, a, b, end.mbar); } +static void merge_weightsystem_info(weightsystem_t *res, weightsystem_t *a, weightsystem_t *b) +{ + if (!a->weight.grams) + a = b; + *res = *a; +} + +static void merge_equipment(struct dive *res, struct dive *a, struct dive *b) +{ + int i; + + for (i = 0; i < MAX_CYLINDERS; i++) + merge_cylinder_info(res->cylinder+i, a->cylinder + i, b->cylinder + i); + for (i = 0; i < MAX_WEIGHTSYSTEMS; i++) + merge_weightsystem_info(res->weightsystem+i, a->weightsystem + i, b->weightsystem + i); +} + /* * This could do a lot more merging. Right now it really only * merges almost exact duplicates - something that happens easily @@ -702,7 +719,6 @@ static void merge_cylinder_info(cylinder_t *res, cylinder_t *a, cylinder_t *b) */ struct dive *try_to_merge(struct dive *a, struct dive *b) { - int i; struct dive *res; if ((a->when >= b->when + 60) || (a->when <= b->when - 60)) @@ -734,8 +750,7 @@ struct dive *try_to_merge(struct dive *a, struct dive *b) MERGE_MAX(res, a, b, surfacetime.seconds); MERGE_MAX(res, a, b, airtemp.mkelvin); MERGE_MIN(res, a, b, watertemp.mkelvin); - for (i = 0; i < MAX_CYLINDERS; i++) - merge_cylinder_info(res->cylinder+i, a->cylinder + i, b->cylinder + i); + merge_equipment(res, a, b); merge_events(res, a, b, 0); return merge_samples(res, a, b, 0); } @@ -267,7 +267,7 @@ struct dive { double latitude, longitude; depth_t maxdepth, meandepth; duration_t duration, surfacetime; - depth_t visibility; + int visibility; /* 0 - 5 star rating */ temperature_t airtemp, watertemp; cylinder_t cylinder[MAX_CYLINDERS]; weightsystem_t weightsystem[MAX_WEIGHTSYSTEMS]; @@ -1211,8 +1211,8 @@ static gboolean expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer * so effective drawing area is width-2x * height-2y */ drawing_area.width = widget->allocation.width; drawing_area.height = widget->allocation.height; - drawing_area.x = drawing_area.width / 20.0; - drawing_area.y = drawing_area.height / 20.0; + drawing_area.x = MIN(50,drawing_area.width / 20.0); + drawing_area.y = MIN(50,drawing_area.height / 20.0); gc.cr = gdk_cairo_create(widget->window); g_object_set(widget, "has-tooltip", TRUE, NULL); @@ -238,6 +238,19 @@ static GtkEntry *text_value(GtkWidget *box, const char *label) return GTK_ENTRY(widget); } +static GtkEntry *single_text_entry(GtkWidget *box, const char *label, const char *text) +{ + GtkEntry *entry; + GtkWidget *frame = gtk_frame_new(label); + + gtk_box_pack_start(GTK_BOX(box), frame, FALSE, TRUE, 0); + entry = GTK_ENTRY(gtk_entry_new()); + gtk_container_add(GTK_CONTAINER(frame), GTK_WIDGET(entry)); + if (text && *text) + gtk_entry_set_text(entry, text); + return entry; +} + static GtkComboBoxEntry *text_entry(GtkWidget *box, const char *label, GtkListStore *completions, const char *text) { GtkEntry *entry; @@ -387,7 +400,8 @@ static int get_rating(const char *string) } struct dive_info { - GtkComboBoxEntry *location, *divemaster, *buddy, *rating, *suit; + GtkComboBoxEntry *location, *divemaster, *buddy, *rating, *suit, *viz; + GtkEntry *airtemp; GtkTextView *notes; }; @@ -395,6 +409,7 @@ static void save_dive_info_changes(struct dive *dive, struct dive *master, struc { char *old_text, *new_text; char *rating_string; + double newtemp; int changed = 0; new_text = get_combo_box_entry_text(info->location, &dive->location, master->location); @@ -429,6 +444,33 @@ static void save_dive_info_changes(struct dive *dive, struct dive *master, struc } free(rating_string); + rating_string = strdup(star_strings[dive->visibility]); + new_text = get_combo_box_entry_text(info->viz, &rating_string, star_strings[master->visibility]); + if (new_text) { + dive->visibility = get_rating(rating_string); + changed = 1; + } + free(rating_string); + + new_text = (char *)gtk_entry_get_text(info->airtemp); + if(sscanf(new_text, "%lf", &newtemp) == 1) { + unsigned long mkelvin; + switch (output_units.temperature) { + case CELSIUS: + mkelvin = C_to_mkelvin(newtemp); + break; + case FAHRENHEIT: + mkelvin = F_to_mkelvin(newtemp); + break; + default: + mkelvin = 0; + } + if (mkelvin != dive->airtemp.mkelvin) { + dive->airtemp.mkelvin = mkelvin; + changed = 1; + } + } + if (info->notes) { old_text = dive->notes; dive->notes = get_text(info->notes); @@ -465,6 +507,9 @@ static void dive_info_widget(GtkWidget *box, struct dive *dive, struct dive_info { GtkWidget *hbox, *label, *frame, *equipment; char buffer[128]; + char airtemp[6]; + const char *unit; + double value; snprintf(buffer, sizeof(buffer), "%s", _("Edit multiple dives")); @@ -487,6 +532,19 @@ static void dive_info_widget(GtkWidget *box, struct dive *dive, struct dive_info info->rating = text_entry(hbox, _("Rating"), star_list, star_strings[dive->rating]); info->suit = text_entry(hbox, _("Suit"), suit_list, dive->suit); + hbox = gtk_hbox_new(FALSE, 3); + gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, TRUE, 0); + + info->viz = text_entry(hbox, _("Visibility"), star_list, star_strings[dive->visibility]); + + value = get_temp_units(dive->airtemp.mkelvin, &unit); + snprintf(buffer, sizeof(buffer), _("Air Temp in %s"), unit); + if (dive->airtemp.mkelvin) + snprintf(airtemp, sizeof(airtemp), "%.1f", value); + else + airtemp[0] = '\0'; + info->airtemp = single_text_entry(hbox, buffer, airtemp); + /* only show notes if editing a single dive */ if (multi) { info->notes = NULL; diff --git a/libdivecomputer.c b/libdivecomputer.c index 8c5a4f180..e3153572a 100644 --- a/libdivecomputer.c +++ b/libdivecomputer.c @@ -60,7 +60,7 @@ static int parse_gasmixes(device_data_t *devdata, struct dive *dive, dc_parser_t he = gasmix.helium * 1000 + 0.5; /* Ignore bogus data - libdivecomputer does some crazy stuff */ - if (o2 <= AIR_PERMILLE || o2 >= 1000) + if (o2 + he <= AIR_PERMILLE || o2 >= 1000) o2 = 0; if (he < 0 || he >= 800 || o2+he >= 1000) he = 0; diff --git a/parse-xml.c b/parse-xml.c index cb84cc26a..9429580e6 100644 --- a/parse-xml.c +++ b/parse-xml.c @@ -1126,6 +1126,8 @@ static void try_to_fill_dive(struct dive **divep, const char *name, char *buf) return; if (MATCH(".rating", get_index, &dive->rating)) return; + if (MATCH(".visibility", get_index, &dive->visibility)) + return; if (MATCH(".cylinder.size", cylindersize, &dive->cylinder[cur_cylinder_index].type.size)) return; if (MATCH(".cylinder.workpressure", pressure, &dive->cylinder[cur_cylinder_index].type.workingpressure)) diff --git a/po/fr_FR.po b/po/fr_FR.po index 9079cddc6..31e144ed9 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -1,17 +1,17 @@ # French translations for Subsurface package -# French messages for Subsurface. # Copyright (C) 2012 Subsurface's COPYRIGHT HOLDER # This file is distributed under the same license as the Subsurface package. +# # Pierre-Yves Chibon <pingou@pingoured.fr>, 2012 # Jean-Noël Rouchon <jnoel@sissiou.net>, 2012 -# +# Stéphane Raimbault <stephane.raimbault@gmail.com>, 2012 msgid "" msgstr "" "Project-Id-Version: 2.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-21 20:59-0700\n" -"PO-Revision-Date: 2012-10-21 15:21+0100\n" -"Last-Translator: Pierre-Yves Chibon <pingou@pingoured.fr>\n" +"POT-Creation-Date: 2012-10-27 02:44+0200\n" +"PO-Revision-Date: 2012-10-27 02:44+0200\n" +"Last-Translator: Stéphane Raimbault <stephane.raimbault@gmail.com>\n" "Language-Team: French\n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -22,11 +22,11 @@ msgstr "" #: statistics.c:162 msgctxt "Stats" msgid " > Month" -msgstr " > Mois" +msgstr " > mois" #: gtk-gui.c:1516 msgid " Please select dive computer and device. " -msgstr " Merci de choisir un ordinateur de plongée et un port " +msgstr " Veuillez choisir un ordinateur de plongée et un périphérique. " #: statistics.c:160 msgid "#" @@ -35,7 +35,7 @@ msgstr "N°" #: statistics.c:553 statistics.c:625 statistics.c:627 statistics.c:629 #, c-format msgid "%.*f %s/min" -msgstr "%.*f %s/min" +msgstr "%.*f %s/min" #. ++GETTEXT 80 chars: lead text ("" or localized "Dive #%d - ") weekday, monthname, day, year, hour, min #: print.c:72 @@ -64,17 +64,17 @@ msgstr "%1$s %3$d %2$s %4$d, %5$2d:%6$02d" #: print.c:254 statistics.c:536 #, c-format msgid "%d min" -msgstr "%d min" +msgstr "%d min" #: statistics.c:507 #, c-format msgid "%dd %dh %dmin" -msgstr "%dt %dh %dmin" +msgstr "%d j %d h %d min" #: statistics.c:509 #, c-format msgid "%dh %dmin" -msgstr "%dh %dmin" +msgstr "%d h %d min" #: dive.c:618 #, c-format @@ -89,21 +89,21 @@ msgstr "À propos de Subsurface" msgid "Add Dive..." msgstr "Ajouter une plongée..." -#: divelist.c:2023 +#: divelist.c:2077 msgid "Add dive" msgstr "Ajouter une plongée" -#: divelist.c:2102 +#: divelist.c:2156 msgid "Add to trip above" -msgstr "Ajoutée au groupe au-dessus" +msgstr "Ajouter au groupe au-dessus" #: main.c:46 msgid "Apr" -msgstr "Avr" +msgstr "Avril" #: main.c:47 msgid "Aug" -msgstr "Aou" +msgstr "Août" #: gtk-gui.c:932 msgid "Autogroup" @@ -135,25 +135,25 @@ msgstr "Moyenne" #: statistics.c:692 statistics.c:729 msgid "Avg Depth" -msgstr "Profondeur Moy." +msgstr "Profondeur moy." #: statistics.c:700 msgid "Avg SAC" -msgstr "Consommation d'air Moy." +msgstr "Consommation d'air moy." #: statistics.c:675 msgid "Avg Temp" -msgstr "Temp. Moy." +msgstr "Temp. moy." #: statistics.c:682 msgid "Avg Time" -msgstr "Temps Moy." +msgstr "Temps moy." #: gtk-gui.c:592 msgid "Bar" msgstr "bar" -#: info.c:515 info.c:942 print.c:156 +#: info.c:482 info.c:909 print.c:156 msgid "Buddy" msgstr "Binôme" @@ -163,21 +163,21 @@ msgstr "Celsius" #: gtk-gui.c:522 msgid "Choose Default XML File" -msgstr "Entrez le fichier XML par défaut" +msgstr "Choisissez le fichier XML par défaut" #: gtk-gui.c:1410 msgid "Choose XML Files To Import Into Current Data File" -msgstr "Entrez le fichier XML à importer dans les données actuelles" +msgstr "Choisissez le fichier XML à importer dans les données actuelles" #: gtk-gui.c:913 msgid "Close" msgstr "Fermer" -#: divelist.c:2119 +#: divelist.c:2173 msgid "Collapse all" -msgstr "Réduire tout" +msgstr "Tout replier" -#: divelist.c:2092 +#: divelist.c:2146 msgid "Create new trip above" msgstr "Créer un nouveau groupe au-dessus" @@ -201,64 +201,56 @@ msgstr "Blocks" msgid "Date" msgstr "Date" -#: info.c:807 +#: info.c:774 msgid "Date and Time" -msgstr "Date et Heure" +msgstr "Date et heure" -#: info.c:817 +#: info.c:784 msgid "Date:" -msgstr "Date:" +msgstr "Date :" #: main.c:47 msgid "Dec" -msgstr "Dec" +msgstr "Déc." #: gtk-gui.c:669 msgid "Default XML Data File" msgstr "Fichier XML par défaut" -#: info.c:256 -msgid "Delete" -msgstr "Supprimer" - -#: info.c:207 -msgid "Delete Dive" -msgstr "Supprimer Plongée" - -#: divelist.c:2010 +#: divelist.c:1946 divelist.c:2025 divelist.c:2064 msgid "Delete dive" -msgstr "Supprimer plongée" +msgstr "Supprimer la plongée" -#: divelist.c:2009 +#: divelist.c:1948 divelist.c:2063 msgid "Delete dives" -msgstr "Supprimer plongées" +msgstr "Supprimer les plongées" #: print.c:155 statistics.c:160 msgid "Depth" msgstr "Profondeur" -#: info.c:867 +#: info.c:834 #, c-format msgid "Depth (%s):" -msgstr "Profondeur (%s):" +msgstr "Profondeur (%s) :" #: uemis.c:161 msgid "Depth Limit Exceeded" -msgstr "Profondeur Plafond Dépassée" +msgstr "Profondeur plafond dépassée" #: gtk-gui.c:586 msgid "Depth:" -msgstr "Profondeur:" +msgstr "Profondeur :" #: gtk-gui.c:1378 msgid "Device name" -msgstr "Nom de l'appareil" +msgstr "Nom du périphérique" #. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min #: info.c:107 #, c-format msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d" -msgstr "Plongée n°%1$d - %2$s %4$02d/%3$02d/%5$04d at %6$d:%7$02d" +msgstr "Plongée n°%1$d - %2$s %4$02d/%3$02d/%5$04d à %6$d:%7$02d" #: info.c:159 print.c:67 #, c-format @@ -270,9 +262,9 @@ msgstr "Plongée n°%d - " msgid "Dive %d: %s %d %04d" msgstr "Plongée n°%d - %s %d %04d" -#: gtk-gui.c:1134 info.c:700 statistics.c:711 +#: gtk-gui.c:1134 info.c:667 statistics.c:711 msgid "Dive Info" -msgstr "Détails Plongée" +msgstr "Détails de plongée" #: gtk-gui.c:1126 msgid "Dive Notes" @@ -280,7 +272,7 @@ msgstr "Notes de Plongée" #: statistics.c:721 msgid "Dive Time" -msgstr "Temps de Plongée" +msgstr "Temps de plongée" #: uemis.c:167 msgid "Dive Time Alert" @@ -288,7 +280,7 @@ msgstr "Alerte temps de plongée" #: uemis.c:165 msgid "Dive Time Info" -msgstr "Information: Temps de Plongée" +msgstr "Information du temps de plongée" #: gtk-gui.c:1347 msgid "Dive computer" @@ -300,9 +292,9 @@ msgstr "Erreur à l'import des données de plongées" #: print.c:476 msgid "Dive details" -msgstr "Détails plongée" +msgstr "Détails de plongée" -#: info.c:514 +#: info.c:481 msgid "Dive master" msgstr "Chef de Palanquée" @@ -314,9 +306,9 @@ msgstr "Plongée n°" msgid "Divelist Font" msgstr "Police pour la liste de plongée" -#: info.c:941 +#: info.c:908 msgid "Divemaster" -msgstr "Chef de Palanquée" +msgstr "Chef de palanquée" #: statistics.c:672 msgid "Dives" @@ -334,98 +326,98 @@ msgstr "Télécharger depuis l'ordinateur de plongée..." msgid "Duration" msgstr "Durée" -#: info.c:862 +#: info.c:829 msgid "Duration (min)" msgstr "Durée (min)" -#: info.c:257 +#: info.c:224 msgid "Edit" -msgstr "Éditer" +msgstr "Modifier" -#: info.c:659 +#: info.c:626 msgid "Edit Trip Info" -msgstr "Éditer Informations Groupe" +msgstr "Modifier les informations du groupe" -#: divelist.c:2031 +#: divelist.c:2085 msgid "Edit Trip Summary" -msgstr "Éditer Sommaire Groupe" +msgstr "Modifier le résumé du groupe" -#: divelist.c:2007 +#: divelist.c:2061 msgid "Edit dive" -msgstr "Éditer plongée" +msgstr "Modifier la plongée" -#: divelist.c:2006 +#: divelist.c:2060 msgid "Edit dives" -msgstr "Éditer plongées" +msgstr "Modifier les plongées" -#: info.c:502 +#: info.c:469 msgid "Edit multiple dives" -msgstr "Éditer plusieur plongées" +msgstr "Modifier plusieurs plongées" -#: info.c:482 +#: info.c:449 msgid "Edit trip summary" -msgstr "Éditer Sommaire Groupe" +msgstr "Modifier le résumé du groupe" #: gtk-gui.c:773 msgid "Enable / Disable Events" -msgstr "Activer / Désactiver Évênements" +msgstr "Activer / Désactiver évênements" #: equipment.c:973 equipment.c:1497 msgid "End" msgstr "Fin" -#: gtk-gui.c:1130 info.c:535 +#: gtk-gui.c:1130 info.c:502 msgid "Equipment" -msgstr "Équipment" +msgstr "Équipement" #: libdivecomputer.c:240 msgid "Error parsing the datetime" -msgstr "Erreur à l'analyse de l'heure" +msgstr "Impossible d'analyser l'heure" #: libdivecomputer.c:259 msgid "Error parsing the divetime" -msgstr "Erreur à l'analyse de temps de plongée" +msgstr "Impossible d'analyser le temps de plongée" #: libdivecomputer.c:286 msgid "Error parsing the gas mix" -msgstr "Erreur à l'analyse de mélange gazeux" +msgstr "Impossible d'analyser le mélange gazeux" #: libdivecomputer.c:279 msgid "Error parsing the gas mix count" -msgstr "Erreur à l'analyse du nombre de mélange gazeux" +msgstr "Impossible d'analyser le nombre de mélange gazeux" #: libdivecomputer.c:269 msgid "Error parsing the maxdepth" -msgstr "Erreur à l'analyse de la profondeux maximale" +msgstr "Impossible d'analyser la profondeux maximale" #: libdivecomputer.c:294 msgid "Error parsing the samples" -msgstr "Erreur à l'analyse des échantillons" +msgstr "Impossible d'analyser des échantillons" #: libdivecomputer.c:369 msgid "Error registering the cancellation handler." -msgstr "Erreur à l'annulation" +msgstr "Impossible d'enregistrer le gestionnaire d'annulation." #: libdivecomputer.c:231 msgid "Error registering the data" -msgstr "Erreur dans l'enregistrement de la date" +msgstr "Impossible d'enregistrer de la date" #: libdivecomputer.c:364 msgid "Error registering the event handler." -msgstr "Erreur dans l'enregistrement de l'évênement" +msgstr "Impossible d'enregistrer le gestionnaire d'événement." #: libdivecomputer.c:339 #, c-format msgid "Event: systime=%<PRId64>, devtime=%u\n" -msgstr "Évênement: systime=%<PRId64>, devtime=%u\n" +msgstr "Événement : systime=%<PRId64>, devtime=%u\n" #: libdivecomputer.c:325 msgid "Event: waiting for user action" -msgstr "Évênement: attente d'une action de l'utilisateur" +msgstr "Événement : attente d'une action de l'utilisateur" -#: divelist.c:2116 +#: divelist.c:2170 msgid "Expand all" -msgstr "Afficher tout" +msgstr "Tout déplier" #: gtk-gui.c:603 msgid "Fahrenheit" @@ -434,31 +426,31 @@ msgstr "Fahrenheit" #: gtk-gui.c:140 #, c-format msgid "Failed to open %i files." -msgstr "Échec de l'ouverture du fichier %i." +msgstr "Impossible de l'ouverture du fichier %i." #: parse-xml.c:1498 #, c-format msgid "Failed to parse '%s'" -msgstr "Échec de l'analyse '%s'" +msgstr "Impossible d'analyser « %s »" #: parse-xml.c:1493 #, c-format msgid "Failed to parse '%s'.\n" -msgstr "Échec de l'analyse '%s'.\n" +msgstr "Impossible d'analyser « %s ».\n" #: file.c:266 #, c-format msgid "Failed to read '%s'" -msgstr "Échec de la lecture '%s'" +msgstr "Impossible de la lecture « %s »" #: file.c:262 #, c-format msgid "Failed to read '%s'.\n" -msgstr "Échec de la lecture '%s'.\n" +msgstr "Impossible de lire « %s ».\n" #: main.c:46 msgid "Feb" -msgstr "Fév" +msgstr "Fév." #: gtk-gui.c:588 msgid "Feet" @@ -474,11 +466,11 @@ msgstr "Filtrer" #: main.c:37 msgid "Fri" -msgstr "Ven" +msgstr "Ven." #: statistics.c:739 msgid "Gas Used" -msgstr "Air Utilisé" +msgstr "Air utilisé" #: equipment.c:983 msgid "Gasmix" @@ -490,7 +482,7 @@ msgstr "Aide" #: gtk-gui.c:915 msgid "Import XML File(s)..." -msgstr "Importer fichier(s) XML..." +msgstr "Importer les fichiers XML..." #: gtk-gui.c:926 msgid "Info" @@ -499,15 +491,15 @@ msgstr "Information" #. ++GETTEXT: these are three letter months - we allow up to six code bytes #: main.c:46 msgid "Jan" -msgstr "Jan" +msgstr "Janv." #: main.c:47 msgid "Jul" -msgstr "Jul" +msgstr "Juil." #: main.c:46 msgid "Jun" -msgstr "Jun" +msgstr "Juin" #: gtk-gui.c:857 msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012" @@ -521,7 +513,7 @@ msgstr "Liste" msgid "Liter" msgstr "Litre" -#: divelist.c:1273 info.c:487 info.c:509 info.c:936 print.c:156 +#: divelist.c:1273 info.c:454 info.c:476 info.c:903 print.c:156 msgid "Location" msgstr "Lieu" @@ -540,15 +532,15 @@ msgstr "Plongée la plus longue" #: uemis.c:175 msgid "Low Battery Alert" -msgstr "Alarme: Batterie Faible" +msgstr "Alarme de batterie faible" #: uemis.c:173 msgid "Low Battery Warning" -msgstr "Attention: Batterie Faible" +msgstr "Avertissement de batterie faible" #: main.c:46 msgid "Mar" -msgstr "Mar" +msgstr "Mar." #: uemis.c:169 msgid "Marker" @@ -560,19 +552,19 @@ msgstr "Chef" #: uemis.c:163 msgid "Max Deco Time Warning" -msgstr "Attention: Temps de Decopression Maximum" +msgstr "Avertissement de temps de décompression max" #: statistics.c:690 statistics.c:728 msgid "Max Depth" -msgstr "Profondeur Max." +msgstr "Profondeur max." #: statistics.c:698 msgid "Max SAC" -msgstr "Consommation d'air Max." +msgstr "Consommation d'air max." #: statistics.c:673 msgid "Max Temp" -msgstr "Temp. Max." +msgstr "Temp. max." #: print.c:95 #, c-format @@ -581,8 +573,8 @@ msgid "" "Duration: %d min\n" "%s" msgstr "" -"Profondeur Max.: %.*f %s\n" -"Durée: %d min\n" +"Profondeur max. : %.*f %s\n" +"Durée : %d min\n" "%s" #: equipment.c:1495 @@ -608,13 +600,13 @@ msgstr "Maximum" msgid "May" msgstr "Mai" -#: divelist.c:2039 +#: divelist.c:2093 msgid "Merge trip with trip above" -msgstr "Intégrer groupe dans le groupe au-dessus" +msgstr "Fusionner le groupe avec le groupe au dessus" -#: divelist.c:2049 +#: divelist.c:2103 msgid "Merge trip with trip below" -msgstr "Intégrer groupe dans le groupe en-dessous" +msgstr "Fusionner le groupe avec le groupe au dessous" #: gtk-gui.c:587 msgid "Meter" @@ -622,15 +614,15 @@ msgstr "Mètre" #: statistics.c:691 msgid "Min Depth" -msgstr "Profondeur Min." +msgstr "Profondeur min." #: statistics.c:699 msgid "Min SAC" -msgstr "Consommation d'air Min." +msgstr "Consommation d'air min." #: statistics.c:674 msgid "Min Temp" -msgstr "Temp. Min." +msgstr "Temp. min." #: statistics.c:169 msgctxt "Depth" @@ -653,7 +645,7 @@ msgstr "Options diverses" #: main.c:37 msgid "Mon" -msgstr "Lun" +msgstr "Lun." #: gtk-gui.c:853 msgid "Multi-platform divelog software in C" @@ -671,13 +663,13 @@ msgstr "Nouveau numéro de départ" msgid "No Tank Data" msgstr "Pas d'information sur le block" -#: info.c:492 info.c:527 info.c:950 +#: info.c:459 info.c:494 info.c:917 msgid "Notes" msgstr "Notes" #: main.c:47 msgid "Nov" -msgstr "Nov" +msgstr "Nov." #: libdivecomputer.c:84 msgid "OLF" @@ -689,7 +681,7 @@ msgstr "OTU" #: main.c:47 msgid "Oct" -msgstr "Oct" +msgstr "Oct." #: libdivecomputer.c:427 msgid "Odd pthread error return" @@ -709,15 +701,15 @@ msgstr "PO2" #: uemis.c:149 msgid "PO2 Ascend Alarm" -msgstr "Alarme: Pression O2 Ascendant" +msgstr "Alarme PO2 ascendant" #: uemis.c:147 msgid "PO2 Ascend Warning" -msgstr "Attention: Pression O2 Ascendant" +msgstr "Avertissement PO2 ascendant" #: uemis.c:144 msgid "PO2 Green Warning" -msgstr "Attention: Pression O2 vert" +msgstr "Avertissement PO2 Vert" #: gtk-gui.c:593 msgid "PSI" @@ -737,11 +729,11 @@ msgstr "Pression" #: gtk-gui.c:591 msgid "Pressure:" -msgstr "Pression:" +msgstr "Pression :" #: print.c:486 msgid "Pretty print" -msgstr "Jolie impression" +msgstr "Impression mise en forme" #: print.c:507 msgid "Print only selected dives" @@ -749,7 +741,7 @@ msgstr "Imprimer uniquement les plongées selectionnées" #: print.c:502 msgid "Print selection" -msgstr "Imprimer sélection" +msgstr "Imprimer la sélection" #: print.c:480 msgid "Print type" @@ -769,44 +761,44 @@ msgstr "Quitter" #: uemis.c:157 msgid "RGT Alert" -msgstr "Alarme: Temps d'air restant" +msgstr "Alerte temps air restant" #: uemis.c:155 msgid "RGT Warning" -msgstr "Attention: Temps d'air restant" +msgstr "Avertissement temps d'air restant" -#: info.c:520 info.c:947 +#: info.c:487 info.c:914 msgid "Rating" msgstr "Évaluation" -#: uemis-downloader.c:267 +#: uemis-downloader.c:445 #, c-format msgid "Reading dive %s" -msgstr "Lecture plongée %s" +msgstr "Lecture de la plongée %s" -#: divelist.c:2054 +#: divelist.c:1818 divelist.c:2108 msgid "Remove Trip" -msgstr "Supprimer Groupe" +msgstr "Supprimer groupe" -#: divelist.c:2110 +#: divelist.c:2164 msgid "Remove dive from trip" -msgstr "Retirer plongée du groupe" +msgstr "Retirer la plongée du groupe" -#: divelist.c:2108 +#: divelist.c:2162 msgid "Remove selected dives from trip" msgstr "Retirer les plongées sélectionnées du groupe" #: gtk-gui.c:804 msgid "Renumber" -msgstr "Re-numéroter" +msgstr "Renuméroter" #: gtk-gui.c:919 msgid "Renumber..." -msgstr "Re-numéroter..." +msgstr "Renuméroter..." #: gtk-gui.c:1485 msgid "Retry" -msgstr "Re-essayer" +msgstr "Essayer à nouveau" #: divelist.c:1271 gtk-gui.c:632 statistics.c:160 statistics.c:736 msgid "SAC" @@ -822,43 +814,44 @@ msgstr "Violation du palier de sécurité" #: main.c:37 msgid "Sat" -msgstr "Sam" +msgstr "Sam." #: gtk-gui.c:912 msgid "Save As..." msgstr "Enregistrer sous..." +# Title #: gtk-gui.c:228 msgid "Save Changes?" -msgstr "Enregistrer changements ?" +msgstr "Enregistrement des changements ?" #: gtk-gui.c:165 msgid "Save File As" -msgstr "Enregistrer Fichier sous" +msgstr "Enregistrer le fichier sous" #: gtk-gui.c:911 msgid "Save..." msgstr "Enregistrer..." #: gtk-gui.c:764 -msgid "SelectEvents" -msgstr "Sélectionner évênements" +msgid "Select Events" +msgstr "Sélection des évènements" #: gtk-gui.c:921 -msgid "SelectEvents..." -msgstr "Sélectionner évênements..." +msgid "Select Events..." +msgstr "Sélection des événements..." #: main.c:47 msgid "Sep" -msgstr "Sept" +msgstr "Sept." #: uemis-downloader.c:30 msgid "" "Short write to req.txt file\n" "Is the Uemis Zurich plugged in correctly?" msgstr "" -"Écriture partiel des progrès dans le fichier req.txt\n" -"Est-ce que votre Uemis Zurich est branché correctement ?" +"Écriture partielle des progrès dans le fichier req.txt\n" +"Est-ce que votre Uemis Zurich est branché correctement ?" #: statistics.c:166 msgctxt "Duration" @@ -871,7 +864,7 @@ msgstr "Plongée la plus courte" #: gtk-gui.c:611 msgid "Show Columns" -msgstr "Afficher colonne" +msgstr "Afficher les colonnes" #: equipment.c:959 equipment.c:1494 msgid "Size" @@ -879,11 +872,11 @@ msgstr "Taille" #: uemis.c:139 msgid "Speed Alarm" -msgstr "Alarme: vitesse" +msgstr "Alarme de vitesse" #: uemis.c:142 msgid "Speed Warning" -msgstr "Attention: vitesse" +msgstr "Avertissemnt de vitesse" #: equipment.c:970 equipment.c:1496 msgid "Start" @@ -897,14 +890,14 @@ msgstr "Statistiques" msgid "Stats" msgstr "Stats" -#: divelist.c:1268 gtk-gui.c:647 info.c:521 info.c:948 +#: divelist.c:1268 gtk-gui.c:647 info.c:488 info.c:915 msgid "Suit" msgstr "Combinaison" #. ++GETTEXT: these are three letter days - we allow up to six code bytes #: main.c:37 msgid "Sun" -msgstr "Dim" +msgstr "Dim." #: statistics.c:722 msgid "Surf Intv" @@ -920,11 +913,11 @@ msgstr "Changement de block suggéré" #: uemis.c:153 msgid "Tank Pressure Info" -msgstr "Information: Pression block" +msgstr "Information de pression block" #: gtk-gui.c:617 msgid "Temp" -msgstr "Température" +msgstr "Temp." #: statistics.c:160 msgid "Temperature" @@ -932,7 +925,7 @@ msgstr "Température" #: gtk-gui.c:601 msgid "Temperature:" -msgstr "Température:" +msgstr "Température :" #: gtk-gui.c:927 msgid "Three" @@ -940,15 +933,15 @@ msgstr "Trois" #: main.c:37 msgid "Thu" -msgstr "Jeu" +msgstr "Jeu." -#: info.c:822 print.c:155 +#: info.c:789 print.c:155 msgid "Time" msgstr "Temps" #: gtk-gui.c:933 msgid "Toggle Zoom" -msgstr "Zoom avant/arrière" +msgstr "Changer de zoom" #: statistics.c:164 msgctxt "Duration" @@ -969,7 +962,7 @@ msgstr[1] "Groupe %1$s %3$d %2$s %4$d (%5$d plongées)" #: main.c:37 msgid "Tue" -msgstr "Mar" +msgstr "Mar." #: equipment.c:1493 equipment.c:1521 msgid "Type" @@ -981,9 +974,9 @@ msgid "" "Disconnect/reconnect the dive computer\n" "and try again" msgstr "" -"Uemis Zurich: Le disque dur est presque plein\n" +"Uemis Zurich : le disque dur est presque plein\n" "Débranchez et re-branchez l'ordinateur\n" -"et re-essayez" +"et essayer à nouveau" #: uemis-downloader.c:29 msgid "" @@ -995,23 +988,23 @@ msgstr "" "Débranchez et re-branchez l'ordinateur\n" "et re-essayez" -#: uemis-downloader.c:559 +#: uemis-downloader.c:781 msgid "Uemis init failed" -msgstr "Uemis initialisation ratée" +msgstr "Impossible d'initialiser Uemis" #: libdivecomputer.c:390 msgid "Unable to create libdivecomputer context" -msgstr "Incapable de créer un context libdivecomputer" +msgstr "Impossible de créer un context libdivecomputer" #: libdivecomputer.c:225 #, c-format msgid "Unable to create parser for %s %s" -msgstr "Incapable de créer une analyse pour %s %s" +msgstr "Impossible de créer une analyse pour %s %s" #: libdivecomputer.c:392 #, c-format msgid "Unable to open %s %s (%s)" -msgstr "Échec de l'ouverture du fichier %s %s (%s)" +msgstr "Impossible d'ouvrir %s %s (%s)" #: gtk-gui.c:579 msgid "Units" @@ -1023,15 +1016,15 @@ msgstr "Vue" #: gtk-gui.c:596 msgid "Volume:" -msgstr "Volume:" +msgstr "Volume :" #: statistics.c:730 msgid "Water Temp" -msgstr "Température de l'eau" +msgstr "Temp. de l'eau" #: main.c:37 msgid "Wed" -msgstr "Mer" +msgstr "Mer." #: equipment.c:1020 equipment.c:1620 gtk-gui.c:642 msgid "Weight" @@ -1039,7 +1032,7 @@ msgstr "Poids" #: equipment.c:1125 msgid "Weight System" -msgstr "Système de Poids" +msgstr "Système de poids" #: gtk-gui.c:606 msgid "Weight:" @@ -1063,7 +1056,7 @@ msgid "" "Would you like to save those before closing the datafile?" msgstr "" "Vous avez des changements non-enregistrés.\n" -"Souhaitez-vous enregistrer ces changements avant de fermer ?" +"Souhaitez-vous enregistrer ces changements avant de fermer ?" #: gtk-gui.c:241 gtk-gui.c:244 #, c-format @@ -1080,7 +1073,7 @@ msgstr "air" #: libdivecomputer.c:84 msgid "airtime" -msgstr "Temps d'air" +msgstr "temps d'air" #: equipment.c:832 msgid "ankle" @@ -1104,15 +1097,15 @@ msgstr "ceinture" #: libdivecomputer.c:81 msgid "bookmark" -msgstr "Marque-page" +msgstr "marque-page" #: libdivecomputer.c:80 msgid "ceiling" -msgstr "Plafond" +msgstr "plafond" #: libdivecomputer.c:83 msgid "ceiling (safety stop)" -msgstr "Plafond (palier de sécurité)" +msgstr "plafond (palier de sécurité)" #: equipment.c:834 msgid "clip-on" @@ -1124,7 +1117,7 @@ msgstr "pied³" #: libdivecomputer.c:80 msgid "deco" -msgstr "Décompression" +msgstr "décompression" #: libdivecomputer.c:83 msgid "deepstop" @@ -1134,7 +1127,7 @@ msgstr "Arrêt profond" msgid "divetime" msgstr "Temps de plongée" -#: dive.c:113 divelist.c:1264 info.c:867 +#: dive.c:113 divelist.c:1264 info.c:834 msgid "ft" msgstr "pied" @@ -1152,7 +1145,7 @@ msgstr "intégré" #: libdivecomputer.c:103 msgid "invalid event number" -msgstr "Évênement inconnu/invalid" +msgstr "numéro d'événement non valide" #: dive.c:136 equipment.c:1045 gtk-gui.c:607 msgid "kg" @@ -1164,15 +1157,15 @@ msgstr "l" #: dive.c:132 divelist.c:1267 equipment.c:1047 gtk-gui.c:608 msgid "lbs" -msgstr "Livre US" +msgstr "livre US" -#: dive.c:108 info.c:867 +#: dive.c:108 info.c:834 msgid "m" msgstr "m" #: libdivecomputer.c:84 msgid "maxdepth" -msgstr "prof. maximal" +msgstr "prof. max" #: divelist.c:1265 msgid "min" @@ -1181,12 +1174,12 @@ msgstr "min" #: libdivecomputer.c:333 #, c-format msgid "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)" -msgstr "Modèle=%u (0x%08x), firmware=%u (0x%08x), port série=%u (0x%08x)" +msgstr "modèle=%u (0x%08x), firmware=%u (0x%08x), port série=%u (0x%08x)" #: statistics.c:501 #, c-format msgid "more than %d days" -msgstr "Plus de %d jours" +msgstr "plus de %d jours" #: libdivecomputer.c:80 msgid "none" @@ -1226,18 +1219,19 @@ msgstr "surface" #: libdivecomputer.c:85 msgid "tissue level warning" -msgstr "Attention: niveau gaz tissue" +msgstr "Avertissement de niveau « tissue »" #. ++GETTEXT the term translator-credits is magic - list the names of the tranlators here #: gtk-gui.c:859 msgid "translator-credits" msgstr "" "Pierre-Yves Chibon\n" -"Jean-Noël Rouchon" +"Jean-Noël Rouchon\n" +"Stéphane Raimbault" #: libdivecomputer.c:81 msgid "transmitter" -msgstr "transmiteur" +msgstr "transmetteur" #: equipment.c:1386 equipment.c:1406 msgid "unkn" @@ -1249,7 +1243,7 @@ msgstr "inconnu" #: equipment.c:544 msgid "unspecified" -msgstr "non-specifié" +msgstr "non specifié" #: libdivecomputer.c:81 msgid "violation" @@ -1262,6 +1256,3 @@ msgstr "poids" #: libdivecomputer.c:80 msgid "workload" msgstr "charge" - -#~ msgid "About" -#~ msgstr "À propos" diff --git a/po/nl_NL.po b/po/nl_NL.po index 59fc56813..7e1c173a3 100644 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: 2.0.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-10-21 20:59-0700\n" -"PO-Revision-Date: 2012-10-11 13:08+0100\n" -"Last-Translator: Dirk Hohndel <dirk@hohndel.org>\n" +"PO-Revision-Date: 2012-10-28 20:24+0100\n" +"Last-Translator: Reinout Hoornweg <reinout@xs4all.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" "MIME-Version: 1.0\n" @@ -30,7 +30,7 @@ msgstr " Selecteer duikcomputer en aansluiting. " #: statistics.c:160 msgid "#" -msgstr "" +msgstr "Nr." #: statistics.c:553 statistics.c:625 statistics.c:627 statistics.c:629 #, c-format @@ -41,25 +41,25 @@ msgstr "%.*f %s/min" #: print.c:72 #, c-format msgid "%1$s%2$s, %3$s %4$d, %5$d %6$d:%7$02d" -msgstr "" +msgstr "%1$s%2$s %4$d %3$s %5$d %6$02d:%7$02d" #. ++GETTEXT 160 chars: weekday, monthname, day, year, hour, min #: print.c:229 #, c-format msgid "%1$s, %2$s %3$d, %4$d %5$dh%6$02d" -msgstr "" +msgstr "%1$s %3$d %2$s %4$d %5$02d:%6$02d" #. ++GETTEXT 60 char buffer weekday, monthname, day of month, year, hour:min #: divelist.c:385 #, c-format msgid "%1$s, %2$s %3$d, %4$d %5$02d:%6$02d" -msgstr "" +msgstr "%1$s %3$d %2$s %4$d %5$02d:%6$02d" #. ++GETTEXT 80 chars: weekday, monthname, day, year, hour, min #: statistics.c:529 -#, fuzzy, c-format +#, c-format msgid "%1$s, %2$s %3$d, %4$d %5$2d:%6$02d" -msgstr "Duik #%d - %s %02d/%02d/%04d om %d:%02d" +msgstr "%1$s %3$d %2$s %4$d %5$02d:%6$02d" #: print.c:254 statistics.c:536 #, c-format @@ -69,12 +69,12 @@ msgstr "%d min" #: statistics.c:507 #, c-format msgid "%dd %dh %dmin" -msgstr "%dt %dst %dmin" +msgstr "%dd %du %dmin" #: statistics.c:509 #, c-format msgid "%dh %dmin" -msgstr "%dst %dmin" +msgstr "%du %dmin" #: dive.c:618 #, c-format @@ -83,7 +83,7 @@ msgstr "(%s) of (%s)" #: gtk-gui.c:851 gtk-gui.c:923 msgid "About Subsurface" -msgstr "" +msgstr "Over Subsurface" #: gtk-gui.c:917 msgid "Add Dive..." @@ -99,11 +99,11 @@ msgstr "Trip hierboven toevoegen" #: main.c:46 msgid "Apr" -msgstr "Apr" +msgstr "apr" #: main.c:47 msgid "Aug" -msgstr "Aug" +msgstr "aug" #: gtk-gui.c:932 msgid "Autogroup" @@ -143,11 +143,11 @@ msgstr "Gem. gasverbruik" #: statistics.c:675 msgid "Avg Temp" -msgstr "Gem. Temperatuur" +msgstr "Gem. temp." #: statistics.c:682 msgid "Avg Time" -msgstr "Gemiddelde tijd" +msgstr "Gem. tijd" #: gtk-gui.c:592 msgid "Bar" @@ -159,7 +159,7 @@ msgstr "Buddy" #: gtk-gui.c:602 msgid "Celsius" -msgstr "Celsius" +msgstr "celsius" #: gtk-gui.c:522 msgid "Choose Default XML File" @@ -171,11 +171,11 @@ msgstr "Kies de XML bestanden om te importeren in huidig data bestand" #: gtk-gui.c:913 msgid "Close" -msgstr "" +msgstr "Sluiten" #: divelist.c:2119 msgid "Collapse all" -msgstr "Alle uitklappen" +msgstr "Alles inklappen" #: divelist.c:2092 msgid "Create new trip above" @@ -211,7 +211,7 @@ msgstr "Datum:" #: main.c:47 msgid "Dec" -msgstr "Dec" +msgstr "dec" #: gtk-gui.c:669 msgid "Default XML Data File" @@ -244,7 +244,7 @@ msgstr "Diepte (%s):" #: uemis.c:161 msgid "Depth Limit Exceeded" -msgstr "Diepte Limiet overschreden" +msgstr "Dieptelimiet overschreden" #: gtk-gui.c:586 msgid "Depth:" @@ -256,23 +256,23 @@ msgstr "Apparaatnaam" #. ++GETTEXT 80 char buffer: dive nr, weekday, month, day, year, hour, min #: info.c:107 -#, fuzzy, c-format +#, c-format msgid "Dive #%1$d - %2$s %3$02d/%4$02d/%5$04d at %6$d:%7$02d" -msgstr "Duik #%d - %s %02d/%02d/%04d om %d:%02d" +msgstr "Duik nr. %1$d - %2$s %4$02d-%3$02d-%5$04d om %6$02d:%7$02d" #: info.c:159 print.c:67 #, c-format msgid "Dive #%d - " -msgstr "Duik #%d - " +msgstr "Duik nr. %d - " #: libdivecomputer.c:254 #, c-format msgid "Dive %d: %s %d %04d" -msgstr "Duik #%d: %s %d %04d" +msgstr "Duik nr. %d: %s %d %04d" #: gtk-gui.c:1134 info.c:700 statistics.c:711 msgid "Dive Info" -msgstr "Duik informatie" +msgstr "Duikinformatie" #: gtk-gui.c:1126 msgid "Dive Notes" @@ -296,7 +296,7 @@ msgstr "Duikcomputer" #: libdivecomputer.c:373 msgid "Dive data import error" -msgstr "" +msgstr "Fout bij importeren van duikdata" #: print.c:476 msgid "Dive details" @@ -304,19 +304,19 @@ msgstr "Duikdetails" #: info.c:514 msgid "Dive master" -msgstr "Duik-instructeur" +msgstr "Duikleider" #: print.c:155 msgid "Dive#" -msgstr "Duik Nr." +msgstr "Duik nr." #: gtk-gui.c:652 msgid "Divelist Font" -msgstr "Duiklijst Font" +msgstr "Duiklijst font" #: info.c:941 msgid "Divemaster" -msgstr "Duik-instructeur" +msgstr "Duikleider" #: statistics.c:672 msgid "Dives" @@ -368,7 +368,7 @@ msgstr "Trip overzicht bewerken" #: gtk-gui.c:773 msgid "Enable / Disable Events" -msgstr "Inschakelen / uitschakelen Evenementen" +msgstr "In-/uitschakelen gebeurtenissen" #: equipment.c:973 equipment.c:1497 msgid "End" @@ -380,56 +380,56 @@ msgstr "Uitrusting" #: libdivecomputer.c:240 msgid "Error parsing the datetime" -msgstr "" +msgstr "Fout bij verwerken van de datum en tijd" #: libdivecomputer.c:259 msgid "Error parsing the divetime" -msgstr "" +msgstr "Fout bij verwerken van de duikduur" #: libdivecomputer.c:286 msgid "Error parsing the gas mix" -msgstr "" +msgstr "Fout bij het verwerken van het gasmengsel" #: libdivecomputer.c:279 msgid "Error parsing the gas mix count" -msgstr "" +msgstr "Fout bij het verwerken van het aantal gasmengsels" #: libdivecomputer.c:269 msgid "Error parsing the maxdepth" -msgstr "" +msgstr "Fout bij het verwerken van de maximum duikdiepte" #: libdivecomputer.c:294 msgid "Error parsing the samples" -msgstr "" +msgstr "Fout bij het verwerken van de samples" #: libdivecomputer.c:369 msgid "Error registering the cancellation handler." -msgstr "" +msgstr "Fout bij het registreren van de cancellation handler." #: libdivecomputer.c:231 msgid "Error registering the data" -msgstr "" +msgstr "Fout bij het registreren van de data" #: libdivecomputer.c:364 msgid "Error registering the event handler." -msgstr "" +msgstr "Fout bij het registreren van de event handler." #: libdivecomputer.c:339 #, c-format msgid "Event: systime=%<PRId64>, devtime=%u\n" -msgstr "" +msgstr "Event: systime=%<PRId64>, devtime=%u\n" #: libdivecomputer.c:325 msgid "Event: waiting for user action" -msgstr "" +msgstr "Event: wachten op handeling van gebruiker" #: divelist.c:2116 msgid "Expand all" -msgstr "Alle uitklappen" +msgstr "Alles uitklappen" #: gtk-gui.c:603 msgid "Fahrenheit" -msgstr "Fahrenheit" +msgstr "fahrenheit" #: gtk-gui.c:140 #, c-format @@ -458,11 +458,11 @@ msgstr "Fout bij lezen van '%s'.\n" #: main.c:46 msgid "Feb" -msgstr "Feb" +msgstr "feb" #: gtk-gui.c:588 msgid "Feet" -msgstr "Voet" +msgstr "voet" #: gtk-gui.c:904 msgid "File" @@ -490,7 +490,7 @@ msgstr "Help" #: gtk-gui.c:915 msgid "Import XML File(s)..." -msgstr "Import XML bestand(en)..." +msgstr "Importeer XML bestand(en)..." #: gtk-gui.c:926 msgid "Info" @@ -499,15 +499,15 @@ msgstr "Informatie" #. ++GETTEXT: these are three letter months - we allow up to six code bytes #: main.c:46 msgid "Jan" -msgstr "Jan" +msgstr "jan" #: main.c:47 msgid "Jul" -msgstr "Jul" +msgstr "jul" #: main.c:46 msgid "Jun" -msgstr "Jun" +msgstr "jun" #: gtk-gui.c:857 msgid "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012" @@ -519,7 +519,7 @@ msgstr "Lijst" #: gtk-gui.c:597 msgid "Liter" -msgstr "Liter" +msgstr "liter" #: divelist.c:1273 info.c:487 info.c:509 info.c:936 print.c:156 msgid "Location" @@ -544,11 +544,11 @@ msgstr "Alarm: Lege batterij" #: uemis.c:173 msgid "Low Battery Warning" -msgstr "Warnung:Lege batterij" +msgstr "Waarschuwing:Lege batterij" #: main.c:46 msgid "Mar" -msgstr "Mar" +msgstr "mar" #: uemis.c:169 msgid "Marker" @@ -560,19 +560,19 @@ msgstr "Master" #: uemis.c:163 msgid "Max Deco Time Warning" -msgstr "Warnung: Maximale Deco tijd" +msgstr "Waarschuwing: Maximale deco-tijd" #: statistics.c:690 statistics.c:728 msgid "Max Depth" -msgstr "Max. Diepte" +msgstr "Max. diepte" #: statistics.c:698 msgid "Max SAC" -msgstr "Max. Gasverbruik" +msgstr "Max. gasverbruik" #: statistics.c:673 msgid "Max Temp" -msgstr "Max. Temp." +msgstr "Max. temp." #: print.c:95 #, c-format @@ -581,13 +581,13 @@ msgid "" "Duration: %d min\n" "%s" msgstr "" -"Max. Diepte: %.*f %s\n" +"Max. diepte: %.*f %s\n" "Duur: %d min\n" "%s" #: equipment.c:1495 msgid "MaxPress" -msgstr "Max.Druk" +msgstr "Max. druk" #: statistics.c:170 msgctxt "Depth" @@ -606,7 +606,7 @@ msgstr "Grootste" #: main.c:46 msgid "May" -msgstr "Mei" +msgstr "mei" #: divelist.c:2039 msgid "Merge trip with trip above" @@ -618,7 +618,7 @@ msgstr "Trip met onderstaande samenvoegen" #: gtk-gui.c:587 msgid "Meter" -msgstr "Meter" +msgstr "meter" #: statistics.c:691 msgid "Min Depth" @@ -626,11 +626,11 @@ msgstr "Min. diepte" #: statistics.c:699 msgid "Min SAC" -msgstr "Min. Gasverbruik" +msgstr "Min. gasverbruik" #: statistics.c:674 msgid "Min Temp" -msgstr "Min. Temp." +msgstr "Min. temp." #: statistics.c:169 msgctxt "Depth" @@ -657,19 +657,19 @@ msgstr "Ma" #: gtk-gui.c:853 msgid "Multi-platform divelog software in C" -msgstr "Multi-Platform Duikprogramma in C" +msgstr "Multi-platform Duikprogramma in C" #: gtk-gui.c:909 msgid "New" -msgstr "" +msgstr "Nieuw" #: gtk-gui.c:813 msgid "New starting number" -msgstr "Nieuw begin nummer" +msgstr "Nieuw beginnummer" #: uemis.c:171 msgid "No Tank Data" -msgstr "Geen fles informatie" +msgstr "Geen flesinformatie" #: info.c:492 info.c:527 info.c:950 msgid "Notes" @@ -677,11 +677,11 @@ msgstr "Notities" #: main.c:47 msgid "Nov" -msgstr "Nov" +msgstr "nov" #: libdivecomputer.c:84 msgid "OLF" -msgstr "" +msgstr "OLF" #: divelist.c:1272 gtk-gui.c:637 statistics.c:737 msgid "OTU" @@ -689,11 +689,11 @@ msgstr "OTU" #: main.c:47 msgid "Oct" -msgstr "Okt" +msgstr "okt" #: libdivecomputer.c:427 msgid "Odd pthread error return" -msgstr "" +msgstr "Onbekende pthread foutmelding" #: gtk-gui.c:315 msgid "Open File" @@ -701,15 +701,15 @@ msgstr "Bestand openen" #: gtk-gui.c:910 msgid "Open..." -msgstr "Bestand openen..." +msgstr "Openen..." #: libdivecomputer.c:84 msgid "PO2" -msgstr "" +msgstr "PO2" #: uemis.c:149 msgid "PO2 Ascend Alarm" -msgstr "Alarm: Opstijging" +msgstr "Alarm: Opstijging / PO2" #: uemis.c:147 msgid "PO2 Ascend Warning" @@ -745,7 +745,7 @@ msgstr "Mooi afdrukken" #: print.c:507 msgid "Print only selected dives" -msgstr "Alleen de geselecteerde duiken printen" +msgstr "Alleen geselecteerde duiken afdrukken" #: print.c:502 msgid "Print selection" @@ -753,7 +753,7 @@ msgstr "Selectie afdrukken" #: print.c:480 msgid "Print type" -msgstr "Print type" +msgstr "Afdruktype" #: gtk-gui.c:914 msgid "Print..." @@ -765,15 +765,15 @@ msgstr "Profiel" #: gtk-gui.c:922 msgid "Quit" -msgstr "" +msgstr "Afsluiten" #: uemis.c:157 msgid "RGT Alert" -msgstr "Alarm: resterende Gas-tijd" +msgstr "Alarm: resterende gas-tijd" #: uemis.c:155 msgid "RGT Warning" -msgstr "Warnung: resterende Gas-tijd" +msgstr "Waarschuwing: resterende gas-tijd" #: info.c:520 info.c:947 msgid "Rating" @@ -826,7 +826,7 @@ msgstr "Za" #: gtk-gui.c:912 msgid "Save As..." -msgstr "Bestand opslaan als..." +msgstr "Opslaan als..." #: gtk-gui.c:228 msgid "Save Changes?" @@ -850,7 +850,7 @@ msgstr "gebeurtenissen selecteren..." #: main.c:47 msgid "Sep" -msgstr "Sept" +msgstr "sept" #: uemis-downloader.c:30 msgid "" @@ -883,7 +883,7 @@ msgstr "Alarm: snelheid" #: uemis.c:142 msgid "Speed Warning" -msgstr "Warnung: snelheid" +msgstr "Waarschuwing: snelheid" #: equipment.c:970 equipment.c:1496 msgid "Start" @@ -912,7 +912,7 @@ msgstr "Oppervlaktetijd" #: print.c:490 msgid "Table print" -msgstr "Tabellenafdruk" +msgstr "Afdrukken in tabelvorm" #: uemis.c:159 msgid "Tank Change Suggested" @@ -964,8 +964,8 @@ msgstr "Totale tijd" #, c-format msgid "Trip %1$s, %2$s %3$d, %4$d (%5$d dive)" msgid_plural "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Trip %1$s %3$d %2$s %4$d (%5$d duik)" +msgstr[1] "Trip %1$s %3$d %2$s %4$d (%5$d duiken)" #: main.c:37 msgid "Tue" @@ -997,21 +997,21 @@ msgstr "" #: uemis-downloader.c:559 msgid "Uemis init failed" -msgstr "Uemis niet geinitialiseerd" +msgstr "Uemis niet geïnitialiseerd" #: libdivecomputer.c:390 msgid "Unable to create libdivecomputer context" -msgstr "" +msgstr "Kan geen context creëren voor libdivecomputer" #: libdivecomputer.c:225 #, c-format msgid "Unable to create parser for %s %s" -msgstr "" +msgstr "Kan geen parser creëren voor %s %s" #: libdivecomputer.c:392 -#, fuzzy, c-format +#, c-format msgid "Unable to open %s %s (%s)" -msgstr "Fout bij openen van %i bestanden." +msgstr "Fout bij openen van %s %s (%s)" #: gtk-gui.c:579 msgid "Units" @@ -1019,7 +1019,7 @@ msgstr "Eenheden" #: gtk-gui.c:906 msgid "View" -msgstr "Aanzicht" +msgstr "Weergave" #: gtk-gui.c:596 msgid "Volume:" @@ -1051,7 +1051,7 @@ msgstr "XML bestand" #: statistics.c:160 msgid "Year" -msgstr "" +msgstr "Jaar" #: gtk-gui.c:920 statistics.c:368 msgid "Yearly Statistics" @@ -1063,7 +1063,7 @@ msgid "" "Would you like to save those before closing the datafile?" msgstr "" "U heeft onopgeslagen wijzigingen.\n" -"Wilt u deze opslaan voordat u het databestand sluit?" +"Wilt u deze opslaan voordat u het databestand afsluit?" #: gtk-gui.c:241 gtk-gui.c:244 #, c-format @@ -1071,8 +1071,8 @@ msgid "" "You have unsaved changes to file: %s \n" "Would you like to save those before closing the datafile?" msgstr "" -"U hebt niet opgeslagen veranderingen in bestand: %s \n" -"Wilt u deze nu opslaan voordat u het data bestand afsluit?" +"U heeft onopgeslagen wijzigingen in bestand: %s \n" +"Wilt u deze opslaan voordat u het databestand afsluit?" #: divelist.c:639 msgid "air" @@ -1080,7 +1080,7 @@ msgstr "lucht" #: libdivecomputer.c:84 msgid "airtime" -msgstr "" +msgstr "resterende luchttijd" #: equipment.c:832 msgid "ankle" @@ -1088,11 +1088,11 @@ msgstr "enkel" #: libdivecomputer.c:80 msgid "ascent" -msgstr "" +msgstr "opstijging" #: equipment.c:833 msgid "backplate weight" -msgstr "" +msgstr "backplate-gewicht" #: dive.c:45 msgid "bar" @@ -1104,15 +1104,15 @@ msgstr "riem" #: libdivecomputer.c:81 msgid "bookmark" -msgstr "" +msgstr "bladwijzer" #: libdivecomputer.c:80 msgid "ceiling" -msgstr "" +msgstr "plafond" #: libdivecomputer.c:83 msgid "ceiling (safety stop)" -msgstr "" +msgstr "plafond (veiligheidsstop)" #: equipment.c:834 msgid "clip-on" @@ -1120,19 +1120,19 @@ msgstr "clip-on" #: dive.c:88 msgid "cuft" -msgstr "" +msgstr "cuft" #: libdivecomputer.c:80 msgid "deco" -msgstr "" +msgstr "deco" #: libdivecomputer.c:83 msgid "deepstop" -msgstr "" +msgstr "diepe stop" #: libdivecomputer.c:83 msgid "divetime" -msgstr "" +msgstr "duiktijd" #: dive.c:113 divelist.c:1264 info.c:867 msgid "ft" @@ -1140,19 +1140,19 @@ msgstr "ft" #: libdivecomputer.c:82 msgid "gaschange" -msgstr "" +msgstr "gaswissel" #: libdivecomputer.c:84 msgid "heading" -msgstr "" +msgstr "koers" #: equipment.c:830 msgid "integrated" -msgstr "Geintergreerd" +msgstr "Geïntegreerd" #: libdivecomputer.c:103 msgid "invalid event number" -msgstr "" +msgstr "ongeldig event-nummer" #: dive.c:136 equipment.c:1045 gtk-gui.c:607 msgid "kg" @@ -1160,20 +1160,19 @@ msgstr "kg" #: dive.c:83 msgid "l" -msgstr "" +msgstr "l" #: dive.c:132 divelist.c:1267 equipment.c:1047 gtk-gui.c:608 msgid "lbs" -msgstr "US Pond" +msgstr "US pond" #: dive.c:108 info.c:867 msgid "m" -msgstr "" +msgstr "m" #: libdivecomputer.c:84 -#, fuzzy msgid "maxdepth" -msgstr "Max. Diepte" +msgstr "Max. diepte" #: divelist.c:1265 msgid "min" @@ -1182,73 +1181,75 @@ msgstr "min" #: libdivecomputer.c:333 #, c-format msgid "model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)" -msgstr "" +msgstr "model=%u (0x%08x), firmware=%u (0x%08x), serienummer=%u (0x%08x)" #: statistics.c:501 #, c-format msgid "more than %d days" -msgstr "Meer dan %d dagen" +msgstr "meer dan %d dagen" #: libdivecomputer.c:80 msgid "none" -msgstr "" +msgstr "geen" #: dive.c:41 msgid "pascal" -msgstr "" +msgstr "Pa" #: dive.c:49 msgid "psi" -msgstr "" +msgstr "psi" #: libdivecomputer.c:80 msgid "rbt" -msgstr "" +msgstr "RBT" #: libdivecomputer.c:84 msgid "rgbm" -msgstr "" +msgstr "RGBM" #: libdivecomputer.c:81 msgid "safety stop" -msgstr "" +msgstr "veiligheidsstop" #: libdivecomputer.c:82 msgid "safety stop (mandatory)" -msgstr "" +msgstr "veiligheidsstop (verplicht)" #: libdivecomputer.c:82 msgid "safety stop (voluntary)" -msgstr "" +msgstr "veiigheidsstop (vrijwillig)" #: libdivecomputer.c:81 msgid "surface" -msgstr "" +msgstr "oppervlakte" #: libdivecomputer.c:85 msgid "tissue level warning" -msgstr "" +msgstr "waarschuwing stikstofbelasting" #. ++GETTEXT the term translator-credits is magic - list the names of the tranlators here #: gtk-gui.c:859 msgid "translator-credits" -msgstr "Jacco van Koll" +msgstr "" +"Jacco van Koll\n" +"Reinout Hoornweg" #: libdivecomputer.c:81 msgid "transmitter" -msgstr "" +msgstr "zender" #: equipment.c:1386 equipment.c:1406 msgid "unkn" -msgstr "Onbek" +msgstr "onbek" #: libdivecomputer.c:83 statistics.c:541 msgid "unknown" -msgstr "Onbekend" +msgstr "onbekend" #: equipment.c:544 msgid "unspecified" -msgstr "Niet gespecificeert" +msgstr "Niet gespecificeerd" #: libdivecomputer.c:81 msgid "violation" @@ -1260,7 +1261,7 @@ msgstr "Gewicht" #: libdivecomputer.c:80 msgid "workload" -msgstr "" +msgstr "werklast" #, fuzzy #~ msgctxt "Depth" @@ -254,9 +254,8 @@ static void plot_text(struct graphics_context *gc, const text_render_options_t * cairo_set_font_size(cr, tro->size * plot_scale); cairo_font_extents(cr, &fe); cairo_text_extents(cr, buffer, &extents); - dx = tro->hpos * extents.width + extents.x_bearing; - dy = tro->vpos * extents.height + fe.descent; - + dx = tro->hpos * (extents.width + extents.x_bearing); + dy = tro->vpos * (extents.height + fe.descent); move_to(gc, x, y); cairo_rel_move_to(cr, dx, dy); @@ -463,6 +462,26 @@ static void plot_minmax_profile(struct graphics_context *gc, struct plot_info *p plot_minmax_profile_minute(gc, pi, 0); } +static void plot_depth_scale(struct graphics_context *gc, struct plot_info *pi) +{ + int i, maxdepth, marker; + static const text_render_options_t tro = {10, SAMPLE_DEEP, RIGHT, MIDDLE}; + + /* Depth markers: every 30 ft or 10 m*/ + maxdepth = get_maxdepth(pi); + gc->topy = 0; gc->bottomy = maxdepth; + + switch (output_units.length) { + case METERS: marker = 10000; break; + case FEET: marker = 9144; break; /* 30 ft */ + } + set_source_rgba(gc, DEPTH_GRID); + for (i = marker; i < maxdepth; i += marker) { + double d = get_depth_units(i, NULL, NULL); + plot_text(gc, &tro, -0.002, i, "%.0f", d); + } +} + static void plot_depth_profile(struct graphics_context *gc, struct plot_info *pi) { int i, incr; @@ -1423,13 +1442,14 @@ void plot(struct graphics_context *gc, cairo_rectangle_t *drawing_area, struct d pi = create_plot_info(dive, nr, sample); + /* shift the drawing area so we have a nice margin around it */ cairo_translate(gc->cr, drawing_area->x, drawing_area->y); cairo_set_line_width_scaled(gc->cr, 1); cairo_set_line_cap(gc->cr, CAIRO_LINE_CAP_ROUND); cairo_set_line_join(gc->cr, CAIRO_LINE_JOIN_ROUND); /* - * We can use "cairo_translate()" because that doesn't + * We don't use "cairo_translate()" because that doesn't * scale line width etc. But the actual scaling we need * do set up ourselves.. * @@ -1466,5 +1486,14 @@ void plot(struct graphics_context *gc, cairo_rectangle_t *drawing_area, struct d cairo_close_path(gc->cr); cairo_stroke(gc->cr); + /* now shift the translation back by half the margin; + * this way we can draw the vertical scales on both sides */ + cairo_translate(gc->cr, -drawing_area->x / 2.0, 0); + gc->maxx += drawing_area->x; + gc->leftx = -(drawing_area->x / drawing_area->width) / 2.0; + gc->rightx = 1.0 - gc->leftx; + + plot_depth_scale(gc, pi); + free(pi); } diff --git a/save-xml.c b/save-xml.c index f386814f3..fb62651d6 100644 --- a/save-xml.c +++ b/save-xml.c @@ -329,6 +329,8 @@ static void save_dive(FILE *f, struct dive *dive) fprintf(f, " tripflag='%s'", tripflag_names[dive->tripflag]); if (dive->rating) fprintf(f, " rating='%d'", dive->rating); + if (dive->visibility) + fprintf(f, " visibility='%d'", dive->visibility); fprintf(f, " date='%04u-%02u-%02u'", tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday); fprintf(f, " time='%02u:%02u:%02u'", diff --git a/statistics.c b/statistics.c index 0f58b61bd..08fb73814 100644 --- a/statistics.c +++ b/statistics.c @@ -27,7 +27,9 @@ typedef struct { *surf_intv, *max_depth, *avg_depth, + *viz, *water_temp, + *air_temp, *sac, *otu, *o2he, @@ -543,11 +545,17 @@ static void show_single_dive_stats(struct dive *dive) set_label(single_w.max_depth, "%.*f %s", decimals, value, unit); value = get_depth_units(dive->meandepth.mm, &decimals, &unit); set_label(single_w.avg_depth, "%.*f %s", decimals, value, unit); + set_label(single_w.viz, star_strings[dive->visibility]); if (dive->watertemp.mkelvin) { value = get_temp_units(dive->watertemp.mkelvin, &unit); set_label(single_w.water_temp, "%.1f %s", value, unit); } else set_label(single_w.water_temp, ""); + if (dive->airtemp.mkelvin) { + value = get_temp_units(dive->airtemp.mkelvin, &unit); + set_label(single_w.air_temp, "%.1f %s", value, unit); + } else + set_label(single_w.air_temp, ""); value = get_volume_units(dive->sac, &decimals, &unit); if (value > 0) { set_label(single_w.sac, _("%.*f %s/min"), decimals, value, unit); @@ -727,12 +735,19 @@ GtkWidget *single_stats_widget(void) single_w.max_depth = new_info_label_in_frame(hbox, _("Max Depth")); single_w.avg_depth = new_info_label_in_frame(hbox, _("Avg Depth")); - single_w.water_temp = new_info_label_in_frame(hbox, _("Water Temp")); + single_w.viz = new_info_label_in_frame(hbox, _("Visibility")); /* third row */ hbox = gtk_hbox_new(FALSE, 3); gtk_box_pack_start(GTK_BOX(framebox), hbox, TRUE, FALSE, 3); + single_w.water_temp = new_info_label_in_frame(hbox, _("Water Temp")); + single_w.air_temp = new_info_label_in_frame(hbox, _("Air Temp")); + + /* fourth row */ + hbox = gtk_hbox_new(FALSE, 3); + gtk_box_pack_start(GTK_BOX(framebox), hbox, TRUE, FALSE, 3); + single_w.sac = new_info_label_in_frame(hbox, _("SAC")); single_w.otu = new_info_label_in_frame(hbox, _("OTU")); single_w.o2he = new_info_label_in_frame(hbox, "O" UTF8_SUBSCRIPT_2 " / He"); @@ -748,7 +763,9 @@ void clear_stats_widgets(void) set_label(single_w.surf_intv, ""); set_label(single_w.max_depth, ""); set_label(single_w.avg_depth, ""); + set_label(single_w.viz, ""); set_label(single_w.water_temp, ""); + set_label(single_w.air_temp, ""); set_label(single_w.sac, ""); set_label(single_w.sac, ""); set_label(single_w.otu, ""); @@ -192,6 +192,8 @@ void uemis_parse_divelog_binary(char *base64, void *datap) { datalen = uemis_convert_base64(base64, &data); + dive->airtemp.mkelvin = *(uint16_t *)(data + 45) * 100 + 273150; + /* dive template in use: 0 = air 1 = nitrox (B) |