Skip to content
Snippets Groups Projects
Commit c88af82c authored by Emmanuel Milou's avatar Emmanuel Milou
Browse files

Merge branch 'release'

parents 81eedb83 c3723ef1
Branches
Tags
No related merge requests found
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: SFLphone 0.9.2\n" "Project-Id-Version: SFLphone 0.9.2\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-05-19 15:18-0400\n" "POT-Creation-Date: 2009-05-21 10:45-0400\n"
"PO-Revision-Date: 2008-10-28 14:15\n" "PO-Revision-Date: 2008-10-28 14:15\n"
"Last-Translator: Yun Liu <yun.liu@savoirfairelinux.com>\n" "Last-Translator: Yun Liu <yun.liu@savoirfairelinux.com>\n"
"Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n" "Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n"
...@@ -71,8 +71,9 @@ msgid "%d voice mail" ...@@ -71,8 +71,9 @@ msgid "%d voice mail"
msgstr "%d 个语音信息" msgstr "%d 个语音信息"
#: ../../sflphone-client-gnome/src/actions.c:81 #: ../../sflphone-client-gnome/src/actions.c:81
msgid "Registered to %s (%s)" #, c-format
msgstr "注册到 %s (%s)" msgid "Using %s (%s)"
msgstr ""
#: ../../sflphone-client-gnome/src/actions.c:87 #: ../../sflphone-client-gnome/src/actions.c:87
msgid "No registered account" msgid "No registered account"
...@@ -93,8 +94,8 @@ msgstr "IP 电话 - %s" ...@@ -93,8 +94,8 @@ msgstr "IP 电话 - %s"
#: ../../sflphone-client-gnome/src/actions.c:790 #: ../../sflphone-client-gnome/src/actions.c:790
#, c-format #, c-format
msgid "%s account- %s %s" msgid "Using %s (%s) - Codec: %s"
msgstr "%s 帐户- %s %s" msgstr ""
#: ../../sflphone-client-gnome/src/actions.c:880 #: ../../sflphone-client-gnome/src/actions.c:880
#, c-format #, c-format
...@@ -110,6 +111,7 @@ msgstr "" ...@@ -110,6 +111,7 @@ msgstr ""
"sflphone</b>目录下" "sflphone</b>目录下"
#: ../../sflphone-client-gnome/src/assistant.c:35 #: ../../sflphone-client-gnome/src/assistant.c:35
#, c-format
msgid "" msgid ""
"This assistant is now finished.\n" "This assistant is now finished.\n"
"You can at any time check your registration state or modify your accounts " "You can at any time check your registration state or modify your accounts "
...@@ -425,6 +427,7 @@ msgid "_Show main window" ...@@ -425,6 +427,7 @@ msgid "_Show main window"
msgstr "显示主窗口(S)" msgstr "显示主窗口(S)"
#: ../../sflphone-client-gnome/src/statusicon.c:124 #: ../../sflphone-client-gnome/src/statusicon.c:124
#, c-format
msgid "SFLphone - %i accounts configured" msgid "SFLphone - %i accounts configured"
msgstr "SFLphone - %i 个帐户已配置" msgstr "SFLphone - %i 个帐户已配置"
...@@ -562,8 +565,9 @@ msgid "Name" ...@@ -562,8 +565,9 @@ msgid "Name"
msgstr "名称" msgstr "名称"
#: ../../sflphone-client-gnome/src/config/audioconf.c:155 #: ../../sflphone-client-gnome/src/config/audioconf.c:155
#, c-format
msgid "audio device index for output = %d" msgid "audio device index for output = %d"
msgstr "音频设备输出索引 = %d\n" msgstr "音频设备输出索引 = %d"
#: ../../sflphone-client-gnome/src/config/audioconf.c:579 #: ../../sflphone-client-gnome/src/config/audioconf.c:579
msgid "Frequency" msgid "Frequency"
...@@ -789,6 +793,12 @@ msgstr "查找历史记录" ...@@ -789,6 +793,12 @@ msgstr "查找历史记录"
msgid "Search contact" msgid "Search contact"
msgstr "查找联系人(S)" msgstr "查找联系人(S)"
#~ msgid "Registered to %s (%s)"
#~ msgstr "注册到 %s (%s)"
#~ msgid "%s account- %s %s"
#~ msgstr "%s 帐户- %s %s"
#~ msgid "Books" #~ msgid "Books"
#~ msgstr "钩键" #~ msgstr "钩键"
......
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: SFLphone 0.9.2\n" "Project-Id-Version: SFLphone 0.9.2\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-05-19 15:18-0400\n" "POT-Creation-Date: 2009-05-21 10:45-0400\n"
"PO-Revision-Date: 2008-10-28 14:15\n" "PO-Revision-Date: 2008-10-28 14:15\n"
"Last-Translator: Yun Liu <yun.liu@savoirfairelinux.com>\n" "Last-Translator: Yun Liu <yun.liu@savoirfairelinux.com>\n"
"Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n" "Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n"
...@@ -71,8 +71,9 @@ msgid "%d voice mail" ...@@ -71,8 +71,9 @@ msgid "%d voice mail"
msgstr "%d 個語音郵件" msgstr "%d 個語音郵件"
#: ../../sflphone-client-gnome/src/actions.c:81 #: ../../sflphone-client-gnome/src/actions.c:81
msgid "Registered to %s (%s)" #, c-format
msgstr "註冊到 %s (%s)" msgid "Using %s (%s)"
msgstr ""
#: ../../sflphone-client-gnome/src/actions.c:87 #: ../../sflphone-client-gnome/src/actions.c:87
msgid "No registered account" msgid "No registered account"
...@@ -93,8 +94,8 @@ msgstr "IP電話- %s" ...@@ -93,8 +94,8 @@ msgstr "IP電話- %s"
#: ../../sflphone-client-gnome/src/actions.c:790 #: ../../sflphone-client-gnome/src/actions.c:790
#, c-format #, c-format
msgid "%s account- %s %s" msgid "Using %s (%s) - Codec: %s"
msgstr "%s 帳戶- %s\t\t%s" msgstr ""
#: ../../sflphone-client-gnome/src/actions.c:880 #: ../../sflphone-client-gnome/src/actions.c:880
#, c-format #, c-format
...@@ -110,6 +111,7 @@ msgstr "" ...@@ -110,6 +111,7 @@ msgstr ""
"sflphone</b>目錄下" "sflphone</b>目錄下"
#: ../../sflphone-client-gnome/src/assistant.c:35 #: ../../sflphone-client-gnome/src/assistant.c:35
#, c-format
msgid "" msgid ""
"This assistant is now finished.\n" "This assistant is now finished.\n"
"You can at any time check your registration state or modify your accounts " "You can at any time check your registration state or modify your accounts "
...@@ -424,6 +426,7 @@ msgid "_Show main window" ...@@ -424,6 +426,7 @@ msgid "_Show main window"
msgstr "顯示主窗口(S)" msgstr "顯示主窗口(S)"
#: ../../sflphone-client-gnome/src/statusicon.c:124 #: ../../sflphone-client-gnome/src/statusicon.c:124
#, c-format
msgid "SFLphone - %i accounts configured" msgid "SFLphone - %i accounts configured"
msgstr "SFLphone - %i 個帳戶已配置" msgstr "SFLphone - %i 個帳戶已配置"
...@@ -561,8 +564,9 @@ msgid "Name" ...@@ -561,8 +564,9 @@ msgid "Name"
msgstr "名稱" msgstr "名稱"
#: ../../sflphone-client-gnome/src/config/audioconf.c:155 #: ../../sflphone-client-gnome/src/config/audioconf.c:155
#, c-format
msgid "audio device index for output = %d" msgid "audio device index for output = %d"
msgstr "音訊設備輸出索引 = %d\n" msgstr "音訊設備輸出索引 = %d"
#: ../../sflphone-client-gnome/src/config/audioconf.c:579 #: ../../sflphone-client-gnome/src/config/audioconf.c:579
msgid "Frequency" msgid "Frequency"
...@@ -788,6 +792,12 @@ msgstr "搜尋歷史記錄" ...@@ -788,6 +792,12 @@ msgstr "搜尋歷史記錄"
msgid "Search contact" msgid "Search contact"
msgstr "搜尋聯繫人(S)" msgstr "搜尋聯繫人(S)"
#~ msgid "Registered to %s (%s)"
#~ msgstr "註冊到 %s (%s)"
#~ msgid "%s account- %s %s"
#~ msgstr "%s 帳戶- %s\t\t%s"
#~ msgid "Books" #~ msgid "Books"
#~ msgstr "鉤鍵" #~ msgstr "鉤鍵"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment