From 1082e79cc4ee8fd83d48799a916a44334ce4fdb5 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 5 Dec 2011 12:45:53 +0100 Subject: [PATCH] merge patch for translation of call duration in logs --- gtk/calllogs.c | 19 ++++++++++++++----- mediastreamer2 | 2 +- po/cs.po | 25 ++++++++++++++++++++++++- po/de.po | 23 ++++++++++++++++++++++- po/es.po | 23 ++++++++++++++++++++++- po/fr.po | 28 ++++++++++++++++++++++++++-- po/hu.po | 23 ++++++++++++++++++++++- po/it.po | 23 ++++++++++++++++++++++- po/ja.po | 23 ++++++++++++++++++++++- po/nb_NO.po | 23 ++++++++++++++++++++++- po/nl.po | 23 ++++++++++++++++++++++- po/pl.po | 23 ++++++++++++++++++++++- po/pt_BR.po | 23 ++++++++++++++++++++++- po/ru.po | 23 ++++++++++++++++++++++- po/sv.po | 23 ++++++++++++++++++++++- po/zh_CN.po | 21 ++++++++++++++++++++- po/zh_TW.po | 21 ++++++++++++++++++++- 17 files changed, 347 insertions(+), 22 deletions(-) diff --git a/gtk/calllogs.c b/gtk/calllogs.c index 1700077ed..734496da3 100644 --- a/gtk/calllogs.c +++ b/gtk/calllogs.c @@ -55,7 +55,7 @@ void linphone_gtk_call_log_update(GtkWidget *w){ LinphoneAddress *la=cl->dir==LinphoneCallIncoming ? cl->from : cl->to; char *addr= linphone_address_as_string_uri_only (la); const char *display; - gchar *logtxt; + gchar *logtxt, *minutes, *seconds; gchar quality[20]; display=linphone_address_get_display_name (la); @@ -67,10 +67,19 @@ void linphone_gtk_call_log_update(GtkWidget *w){ if (cl->quality!=-1){ snprintf(quality,sizeof(quality),"%.1f",cl->quality); } - logtxt=g_markup_printf_escaped("%s\t%s\tQuality: %s\n" - "%s\t%i minutes %i seconds\t",display, addr, cl->quality!=-1 ? quality : _("n/a"), - cl->start_date, - cl->duration/60,cl->duration%60); + minutes=g_markup_printf_escaped( + ngettext("%i minute", "%i minutes", cl->duration/60), + cl->duration/60); + seconds=g_markup_printf_escaped( + ngettext("%i second", "%i seconds", cl->duration%60), + cl->duration%60); + logtxt=g_markup_printf_escaped( + _("%s\t%s\t" + "Quality: %s\n%s\t%s %s\t"), + display, addr, cl->quality!=-1 ? quality : _("n/a"), + cl->start_date, minutes, seconds); + g_free(minutes); + g_free(seconds); gtk_list_store_append (store,&iter); gtk_list_store_set (store,&iter, 0, cl->dir==LinphoneCallOutgoing ? GTK_STOCK_GO_UP : GTK_STOCK_GO_DOWN, diff --git a/mediastreamer2 b/mediastreamer2 index e83722c77..b5944d8d2 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit e83722c77eedce9eadcfcf54eff1de054dc2a2e9 +Subproject commit b5944d8d25bec0acd992288fee03a5016a6b02ca diff --git a/po/cs.po b/po/cs.po index 02875f816..c9c2885de 100644 --- a/po/cs.po +++ b/po/cs.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: linphone-3.4.99.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-02 16:47+0100\n" +"POT-Creation-Date: 2011-12-05 12:41+0100\n" "PO-Revision-Date: 2011-11-04 22:30+0100\n" "Last-Translator: Petr Pisar \n" "Language-Team: Czech \n" @@ -28,6 +28,29 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #: ../gtk/calllogs.c:71 +#, c-format +msgid "%i minute" +msgid_plural "%i minutes" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: ../gtk/calllogs.c:74 +#, c-format +msgid "%i second" +msgid_plural "%i seconds" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: ../gtk/calllogs.c:77 +#, c-format +msgid "" +"%s\t%s\tQuality: %s\n" +"%s\t%s %s\t" +msgstr "" + +#: ../gtk/calllogs.c:79 msgid "n/a" msgstr "–" diff --git a/po/de.po b/po/de.po index 12924c98b..06e280eeb 100644 --- a/po/de.po +++ b/po/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: linphone 0.7.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-02 16:47+0100\n" +"POT-Creation-Date: 2011-12-05 12:41+0100\n" "PO-Revision-Date: 2011-11-27 23:42+0100\n" "Last-Translator: Gerhard Stengel \n" "Language-Team: German \n" @@ -18,6 +18,27 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: ../gtk/calllogs.c:71 +#, c-format +msgid "%i minute" +msgid_plural "%i minutes" +msgstr[0] "" +msgstr[1] "" + +#: ../gtk/calllogs.c:74 +#, c-format +msgid "%i second" +msgid_plural "%i seconds" +msgstr[0] "" +msgstr[1] "" + +#: ../gtk/calllogs.c:77 +#, c-format +msgid "" +"%s\t%s\tQuality: %s\n" +"%s\t%s %s\t" +msgstr "" + +#: ../gtk/calllogs.c:79 msgid "n/a" msgstr "nicht verfügbar" diff --git a/po/es.po b/po/es.po index 728616e46..f87483dee 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Linphone 0.9.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-02 16:47+0100\n" +"POT-Creation-Date: 2011-12-05 12:41+0100\n" "PO-Revision-Date: 2002-10-15 HO:MI+ZONE\n" "Last-Translator: Nelson Benitez \n" "Language-Team: es \n" @@ -17,6 +17,27 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: ../gtk/calllogs.c:71 +#, c-format +msgid "%i minute" +msgid_plural "%i minutes" +msgstr[0] "" +msgstr[1] "" + +#: ../gtk/calllogs.c:74 +#, c-format +msgid "%i second" +msgid_plural "%i seconds" +msgstr[0] "" +msgstr[1] "" + +#: ../gtk/calllogs.c:77 +#, c-format +msgid "" +"%s\t%s\tQuality: %s\n" +"%s\t%s %s\t" +msgstr "" + +#: ../gtk/calllogs.c:79 msgid "n/a" msgstr "" diff --git a/po/fr.po b/po/fr.po index 3330070e0..44a3b46e9 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Linphone 0.9.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-02 16:47+0100\n" +"POT-Creation-Date: 2011-12-05 12:41+0100\n" "PO-Revision-Date: 2002-12-06 17:33+0100\n" "Last-Translator: Simon Morlat \n" "Language-Team: french \n" @@ -16,6 +16,27 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: ../gtk/calllogs.c:71 +#, c-format +msgid "%i minute" +msgid_plural "%i minutes" +msgstr[0] "" +msgstr[1] "" + +#: ../gtk/calllogs.c:74 +#, c-format +msgid "%i second" +msgid_plural "%i seconds" +msgstr[0] "" +msgstr[1] "" + +#: ../gtk/calllogs.c:77 +#, c-format +msgid "" +"%s\t%s\tQuality: %s\n" +"%s\t%s %s\t" +msgstr "" + +#: ../gtk/calllogs.c:79 msgid "n/a" msgstr "inconnu" @@ -912,7 +933,10 @@ msgstr "Video" msgid "" "Adaptive rate control is a technique to dynamically guess the available " "bandwidth during a call." -msgstr "Le control de débit adaptatif est une technique pour adapter la qualité de l'audio et de la video en fonction de la bande passante disponible, durant l'appel." +msgstr "" +"Le control de débit adaptatif est une technique pour adapter la qualité " +"de l'audio et de la video en fonction de la bande passante disponible, " +"durant l'appel." #: ../gtk/parameters.ui.h:15 msgid "ALSA special device (optional):" diff --git a/po/hu.po b/po/hu.po index 810bd43f2..c654c370d 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-02 16:47+0100\n" +"POT-Creation-Date: 2011-12-05 12:41+0100\n" "PO-Revision-Date: 2007-12-14 11:12+0100\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" @@ -17,6 +17,27 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: ../gtk/calllogs.c:71 +#, c-format +msgid "%i minute" +msgid_plural "%i minutes" +msgstr[0] "" +msgstr[1] "" + +#: ../gtk/calllogs.c:74 +#, c-format +msgid "%i second" +msgid_plural "%i seconds" +msgstr[0] "" +msgstr[1] "" + +#: ../gtk/calllogs.c:77 +#, c-format +msgid "" +"%s\t%s\tQuality: %s\n" +"%s\t%s %s\t" +msgstr "" + +#: ../gtk/calllogs.c:79 msgid "n/a" msgstr "" diff --git a/po/it.po b/po/it.po index f0f1fc46e..e1c1b3e31 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Linphone 3.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-02 16:47+0100\n" +"POT-Creation-Date: 2011-12-05 12:41+0100\n" "PO-Revision-Date: 2002-10-15 HO:MI+ZONE\n" "Last-Translator: Matteo Piazza \n" "Language-Team: it \n" @@ -16,6 +16,27 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: ../gtk/calllogs.c:71 +#, c-format +msgid "%i minute" +msgid_plural "%i minutes" +msgstr[0] "" +msgstr[1] "" + +#: ../gtk/calllogs.c:74 +#, c-format +msgid "%i second" +msgid_plural "%i seconds" +msgstr[0] "" +msgstr[1] "" + +#: ../gtk/calllogs.c:77 +#, c-format +msgid "" +"%s\t%s\tQuality: %s\n" +"%s\t%s %s\t" +msgstr "" + +#: ../gtk/calllogs.c:79 msgid "n/a" msgstr "" diff --git a/po/ja.po b/po/ja.po index 138b221a2..7d95f6087 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: linphone 0.10\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-02 16:47+0100\n" +"POT-Creation-Date: 2011-12-05 12:41+0100\n" "PO-Revision-Date: 2003-01-21 00:05+9000\n" "Last-Translator: YAMAGUCHI YOSHIYA \n" "Language-Team: \n" @@ -18,6 +18,27 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: ../gtk/calllogs.c:71 +#, c-format +msgid "%i minute" +msgid_plural "%i minutes" +msgstr[0] "" +msgstr[1] "" + +#: ../gtk/calllogs.c:74 +#, c-format +msgid "%i second" +msgid_plural "%i seconds" +msgstr[0] "" +msgstr[1] "" + +#: ../gtk/calllogs.c:77 +#, c-format +msgid "" +"%s\t%s\tQuality: %s\n" +"%s\t%s %s\t" +msgstr "" + +#: ../gtk/calllogs.c:79 msgid "n/a" msgstr "" diff --git a/po/nb_NO.po b/po/nb_NO.po index 41579a75d..906742cb2 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-02 16:47+0100\n" +"POT-Creation-Date: 2011-12-05 12:41+0100\n" "PO-Revision-Date: 2011-04-05 01:56+0200\n" "Last-Translator: Øyvind Sæther \n" "Language-Team: Norwegian Bokmål \n" @@ -18,6 +18,27 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: ../gtk/calllogs.c:71 +#, c-format +msgid "%i minute" +msgid_plural "%i minutes" +msgstr[0] "" +msgstr[1] "" + +#: ../gtk/calllogs.c:74 +#, c-format +msgid "%i second" +msgid_plural "%i seconds" +msgstr[0] "" +msgstr[1] "" + +#: ../gtk/calllogs.c:77 +#, c-format +msgid "" +"%s\t%s\tQuality: %s\n" +"%s\t%s %s\t" +msgstr "" + +#: ../gtk/calllogs.c:79 msgid "n/a" msgstr "" diff --git a/po/nl.po b/po/nl.po index a05a1615e..9926ab14b 100644 --- a/po/nl.po +++ b/po/nl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: nl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-02 16:47+0100\n" +"POT-Creation-Date: 2011-12-05 12:41+0100\n" "PO-Revision-Date: 2007-09-05 10:40+0200\n" "Last-Translator: Hendrik-Jan Heins \n" "Language-Team: Nederlands \n" @@ -20,6 +20,27 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: ../gtk/calllogs.c:71 +#, c-format +msgid "%i minute" +msgid_plural "%i minutes" +msgstr[0] "" +msgstr[1] "" + +#: ../gtk/calllogs.c:74 +#, c-format +msgid "%i second" +msgid_plural "%i seconds" +msgstr[0] "" +msgstr[1] "" + +#: ../gtk/calllogs.c:77 +#, c-format +msgid "" +"%s\t%s\tQuality: %s\n" +"%s\t%s %s\t" +msgstr "" + +#: ../gtk/calllogs.c:79 msgid "n/a" msgstr "" diff --git a/po/pl.po b/po/pl.po index 88772c47a..b9bb368e0 100644 --- a/po/pl.po +++ b/po/pl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: linphone 0.7.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-02 16:47+0100\n" +"POT-Creation-Date: 2011-12-05 12:41+0100\n" "PO-Revision-Date: 2003-08-22 12:50+0200\n" "Last-Translator: Robert Nasiadek \n" "Language-Team: Polski \n" @@ -16,6 +16,27 @@ msgstr "" "Content-Transfer-Encoding: 8-bit\n" #: ../gtk/calllogs.c:71 +#, c-format +msgid "%i minute" +msgid_plural "%i minutes" +msgstr[0] "" +msgstr[1] "" + +#: ../gtk/calllogs.c:74 +#, c-format +msgid "%i second" +msgid_plural "%i seconds" +msgstr[0] "" +msgstr[1] "" + +#: ../gtk/calllogs.c:77 +#, c-format +msgid "" +"%s\t%s\tQuality: %s\n" +"%s\t%s %s\t" +msgstr "" + +#: ../gtk/calllogs.c:79 msgid "n/a" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 68b9ef61f..a95bd71a5 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: linphone-1.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-02 16:47+0100\n" +"POT-Creation-Date: 2011-12-05 12:41+0100\n" "PO-Revision-Date: 2006-07-11 23:30+0200\n" "Last-Translator: Rafael Caesar Lenzi \n" "Language-Team: pt_BR \n" @@ -18,6 +18,27 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: ../gtk/calllogs.c:71 +#, c-format +msgid "%i minute" +msgid_plural "%i minutes" +msgstr[0] "" +msgstr[1] "" + +#: ../gtk/calllogs.c:74 +#, c-format +msgid "%i second" +msgid_plural "%i seconds" +msgstr[0] "" +msgstr[1] "" + +#: ../gtk/calllogs.c:77 +#, c-format +msgid "" +"%s\t%s\tQuality: %s\n" +"%s\t%s %s\t" +msgstr "" + +#: ../gtk/calllogs.c:79 msgid "n/a" msgstr "" diff --git a/po/ru.po b/po/ru.po index 50c68d696..8467df849 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: linphone 0.7.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-02 16:47+0100\n" +"POT-Creation-Date: 2011-12-05 12:41+0100\n" "PO-Revision-Date: 2010-01-22 18:43+0300\n" "Last-Translator: Maxim Prokopyev \n" "Language-Team: Russian \n" @@ -16,6 +16,27 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: ../gtk/calllogs.c:71 +#, c-format +msgid "%i minute" +msgid_plural "%i minutes" +msgstr[0] "" +msgstr[1] "" + +#: ../gtk/calllogs.c:74 +#, c-format +msgid "%i second" +msgid_plural "%i seconds" +msgstr[0] "" +msgstr[1] "" + +#: ../gtk/calllogs.c:77 +#, c-format +msgid "" +"%s\t%s\tQuality: %s\n" +"%s\t%s %s\t" +msgstr "" + +#: ../gtk/calllogs.c:79 msgid "n/a" msgstr "" diff --git a/po/sv.po b/po/sv.po index 75ff16d4d..2d7e13645 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-02 16:47+0100\n" +"POT-Creation-Date: 2011-12-05 12:41+0100\n" "PO-Revision-Date: 2009-02-17 15:22+0100\n" "Last-Translator: Emmanuel Frécon \n" "Language-Team: SWEDISH \n" @@ -17,6 +17,27 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: ../gtk/calllogs.c:71 +#, c-format +msgid "%i minute" +msgid_plural "%i minutes" +msgstr[0] "" +msgstr[1] "" + +#: ../gtk/calllogs.c:74 +#, c-format +msgid "%i second" +msgid_plural "%i seconds" +msgstr[0] "" +msgstr[1] "" + +#: ../gtk/calllogs.c:77 +#, c-format +msgid "" +"%s\t%s\tQuality: %s\n" +"%s\t%s %s\t" +msgstr "" + +#: ../gtk/calllogs.c:79 msgid "n/a" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 3b80d1747..42c481890 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: linphone 3.3.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-02 16:47+0100\n" +"POT-Creation-Date: 2011-12-05 12:41+0100\n" "PO-Revision-Date: 2011-01-08 23:51+0800\n" "Last-Translator: Aron Xu \n" "Language-Team: Chinese (simplified) \n" @@ -19,6 +19,25 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #: ../gtk/calllogs.c:71 +#, c-format +msgid "%i minute" +msgid_plural "%i minutes" +msgstr[0] "" + +#: ../gtk/calllogs.c:74 +#, c-format +msgid "%i second" +msgid_plural "%i seconds" +msgstr[0] "" + +#: ../gtk/calllogs.c:77 +#, c-format +msgid "" +"%s\t%s\tQuality: %s\n" +"%s\t%s %s\t" +msgstr "" + +#: ../gtk/calllogs.c:79 msgid "n/a" msgstr "" diff --git a/po/zh_TW.po b/po/zh_TW.po index c3d603036..220a3436d 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: linphone 3.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-02 16:47+0100\n" +"POT-Creation-Date: 2011-12-05 12:41+0100\n" "PO-Revision-Date: 2011-04-06 21:24+0800\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: \n" @@ -18,6 +18,25 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #: ../gtk/calllogs.c:71 +#, c-format +msgid "%i minute" +msgid_plural "%i minutes" +msgstr[0] "" + +#: ../gtk/calllogs.c:74 +#, c-format +msgid "%i second" +msgid_plural "%i seconds" +msgstr[0] "" + +#: ../gtk/calllogs.c:77 +#, c-format +msgid "" +"%s\t%s\tQuality: %s\n" +"%s\t%s %s\t" +msgstr "" + +#: ../gtk/calllogs.c:79 msgid "n/a" msgstr ""