From c702e25022cffdbaceda8f12873a118aface2e63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaussoin=20Timoth=C3=A9e?= Date: Wed, 18 Jul 2012 21:54:17 +0200 Subject: [PATCH] - Type error => update the po and pot - Logout temp fix --- i18n/ar.po | 206 ++++++++++----------- i18n/be.po | 206 ++++++++++----------- i18n/br.po | 206 ++++++++++----------- i18n/da.po | 215 +++++++++++----------- i18n/de.po | 220 ++++++++++++----------- i18n/el.po | 218 +++++++++++----------- i18n/eo.po | 218 +++++++++++----------- i18n/es.po | 221 ++++++++++++----------- i18n/fi.po | 215 +++++++++++----------- i18n/fr.po | 228 +++++++++++++----------- i18n/gl.po | 206 ++++++++++----------- i18n/it.po | 206 ++++++++++----------- i18n/ja.po | 221 ++++++++++++----------- i18n/messages.pot | 202 ++++++++++----------- i18n/nl.po | 217 +++++++++++----------- i18n/no.po | 206 ++++++++++----------- i18n/oc.po | 223 ++++++++++++----------- i18n/pt.po | 215 +++++++++++----------- i18n/ro.po | 217 +++++++++++----------- i18n/ru.po | 208 ++++++++++----------- i18n/uk.po | 206 ++++++++++----------- i18n/zh.po | 208 ++++++++++----------- install/index.php | 6 +- system/Conf.php | 2 +- system/Widget/WidgetCommon.php | 2 +- system/Widget/widgets/Help/Help.php | 2 +- system/Widget/widgets/Login/Login.php | 2 +- system/Widget/widgets/Logout/Logout.php | 2 +- 28 files changed, 2400 insertions(+), 2304 deletions(-) diff --git a/i18n/ar.po b/i18n/ar.po index 2e741992e..3b2cf07fd 100644 --- a/i18n/ar.po +++ b/i18n/ar.po @@ -5,10 +5,11 @@ msgid "" msgstr "" "Project-Id-Version: Movim\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-27 21:41+0200\n" +"POT-Creation-Date: 2012-07-18 21:48+0200\n" "PO-Revision-Date: 2011-10-26 21:18+0000\n" "Last-Translator: edhelas \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -57,12 +58,12 @@ msgstr "" #: ../install/index.php:169 #, php-format -msgid "Bosh connection failed with error `%s'" +msgid "Bosh connection failed with error '%s'" msgstr "" #: ../install/index.php:178 #, php-format -msgid "XMPP connection through Bosh failed with error `%s'" +msgid "XMPP connection through Bosh failed with error '%s'" msgstr "" #: ../install/index.php:224 ../install/index.php:228 ../install/index.php:232 @@ -77,7 +78,7 @@ msgstr "" #: ../install/index.php:283 #, php-format -msgid "Database connection failed with error `%s'" +msgid "Database connection failed with error '%s'" msgstr "" #: ../install/part1.php:29 @@ -85,8 +86,7 @@ msgid "Thank you for downloading Movim!" msgstr "" #: ../install/part1.php:30 -msgid "" -"Before you enjoy your social network, a few adjustements are required." +msgid "Before you enjoy your social network, a few adjustements are required." msgstr "" #: ../install/part1.php:31 @@ -176,7 +176,7 @@ msgstr "" #: ../system/Conf.php:38 #, php-format -msgid "Cannot load element value'%s'" +msgid "Cannot load element value '%s'" msgstr "" #: ../system/Conf.php:49 @@ -197,10 +197,6 @@ msgstr "" msgid "jid '%s' is incorrect" msgstr "" -#: ../system/Jabber.php:147 ../system/Widget/widgets/Login/Login.php:108 -msgid "Connecting..." -msgstr "" - #: ../system/Logger.php:27 #, php-format msgid "Cannot open log file '%s'" @@ -348,104 +344,124 @@ msgstr "" msgid "Civil Union" msgstr "" +#: ../system/Utils.php:219 ../system/Widget/widgets/Chat/Chat.php:40 +msgid "Online" +msgstr "" + +#: ../system/Utils.php:220 ../system/Widget/widgets/Chat/Chat.php:41 +msgid "Away" +msgstr "" + +#: ../system/Utils.php:221 ../system/Widget/widgets/Chat/Chat.php:42 +msgid "Do Not Disturb" +msgstr "" + +#: ../system/Utils.php:222 ../system/Widget/widgets/Chat/Chat.php:43 +msgid "Extended Away" +msgstr "" + +#: ../system/Utils.php:223 +msgid "Logout" +msgstr "خروج" + #: ../system/Controller/ControllerMain.php:40 #, php-format msgid "%s - Welcome to Movim" msgstr "%s - MOVIM مرحبا بكم في" #: ../system/Controller/ControllerMain.php:41 -#: ../system/Controller/ControllerMain.php:75 -#: ../system/Controller/ControllerMain.php:99 -#: ../system/Controller/ControllerMain.php:119 -#: ../system/Controller/ControllerMain.php:151 -#: ../system/Controller/ControllerMain.php:167 -#: ../system/Controller/ControllerMain.php:186 -#: ../system/Controller/ControllerMain.php:215 +#: ../system/Controller/ControllerMain.php:71 +#: ../system/Controller/ControllerMain.php:94 +#: ../system/Controller/ControllerMain.php:114 +#: ../system/Controller/ControllerMain.php:146 +#: ../system/Controller/ControllerMain.php:162 +#: ../system/Controller/ControllerMain.php:181 +#: ../system/Controller/ControllerMain.php:210 msgid "Home" msgstr "القائمة الرئيسية" #: ../system/Controller/ControllerMain.php:42 -#: ../system/Controller/ControllerMain.php:78 -#: ../system/Controller/ControllerMain.php:100 -#: ../system/Controller/ControllerMain.php:120 -#: ../system/Controller/ControllerMain.php:216 +#: ../system/Controller/ControllerMain.php:73 +#: ../system/Controller/ControllerMain.php:95 +#: ../system/Controller/ControllerMain.php:115 +#: ../system/Controller/ControllerMain.php:211 #: ../system/Widget/widgets/ContactCard/ContactCard.php:175 msgid "Profile" msgstr "" #: ../system/Controller/ControllerMain.php:43 -#: ../system/Controller/ControllerMain.php:79 -#: ../system/Controller/ControllerMain.php:101 -#: ../system/Controller/ControllerMain.php:121 -#: ../system/Controller/ControllerMain.php:217 +#: ../system/Controller/ControllerMain.php:74 +#: ../system/Controller/ControllerMain.php:96 +#: ../system/Controller/ControllerMain.php:116 +#: ../system/Controller/ControllerMain.php:212 msgid "Configuration" msgstr "التكوين" #: ../system/Controller/ControllerMain.php:44 -#: ../system/Controller/ControllerMain.php:80 -#: ../system/Controller/ControllerMain.php:102 -#: ../system/Controller/ControllerMain.php:122 -#: ../system/Controller/ControllerMain.php:218 +#: ../system/Controller/ControllerMain.php:75 +#: ../system/Controller/ControllerMain.php:97 +#: ../system/Controller/ControllerMain.php:117 +#: ../system/Controller/ControllerMain.php:213 msgid "Help" msgstr "" -#: ../system/Controller/ControllerMain.php:98 +#: ../system/Controller/ControllerMain.php:93 #, php-format msgid "%s - Configuration" msgstr "%s - تكوين" -#: ../system/Controller/ControllerMain.php:118 +#: ../system/Controller/ControllerMain.php:113 #, php-format msgid "%s - Profile" msgstr "" -#: ../system/Controller/ControllerMain.php:150 +#: ../system/Controller/ControllerMain.php:145 #, php-format msgid "%s - Account Creation" msgstr "%s - إنشاء حساب" -#: ../system/Controller/ControllerMain.php:152 -#: ../system/Controller/ControllerMain.php:168 +#: ../system/Controller/ControllerMain.php:147 +#: ../system/Controller/ControllerMain.php:163 msgid "Account Creation" msgstr "إنشاء الحساب" -#: ../system/Controller/ControllerMain.php:166 +#: ../system/Controller/ControllerMain.php:161 #, php-format msgid "%s - Add An Account" msgstr "" -#: ../system/Controller/ControllerMain.php:184 +#: ../system/Controller/ControllerMain.php:179 #, php-format msgid "%s - Login to Movim" msgstr "%s - MOVIM الدخول لل" -#: ../system/Controller/ControllerMain.php:205 +#: ../system/Controller/ControllerMain.php:200 #, php-format msgid "%s - Help Page" msgstr "" #: ../system/Widget/widgets/Account/Account.php:170 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:100 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:101 msgid "Some data are missing !" msgstr "" #: ../system/Widget/widgets/Account/Account.php:176 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:106 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:107 msgid "Wrong ID" msgstr "" #: ../system/Widget/widgets/Account/Account.php:182 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:112 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:113 msgid "You entered different passwords" msgstr "" #: ../system/Widget/widgets/Account/Account.php:188 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:118 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:119 msgid "Invalid name" msgstr "" #: ../system/Widget/widgets/Account/Account.php:194 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:124 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:125 msgid "Username already taken" msgstr "" @@ -477,7 +493,7 @@ msgid "Only alphanumerics elements are authorized" msgstr "" #: ../system/Widget/widgets/Account/Account.php:236 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:150 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:151 #: ../system/Widget/widgets/Login/Login.php:103 msgid "My address" msgstr "عنوان بريدي" @@ -499,7 +515,7 @@ msgid "Example :" msgstr "" #: ../system/Widget/widgets/Account/Account.php:249 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:159 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:160 #: ../system/Widget/widgets/Login/Login.php:105 msgid "Password" msgstr "كلمة ال" @@ -509,7 +525,7 @@ msgid "Same here !" msgstr "" #: ../system/Widget/widgets/Account/Account.php:261 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:169 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:170 msgid "Retype" msgstr "" @@ -518,38 +534,18 @@ msgid "Pseudo" msgstr "" #: ../system/Widget/widgets/Account/Account.php:280 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:177 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:178 msgid "Create" msgstr "" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:130 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:131 msgid "XMPP Domain error, your account is not a correct Jabber ID" msgstr "" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:143 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:144 msgid "Add your login informations" msgstr "" -#: ../system/Widget/widgets/Chat/Chat.php:40 -#: ../system/Widget/widgets/Logout/Logout.php:82 -msgid "Online" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:41 -#: ../system/Widget/widgets/Logout/Logout.php:83 -msgid "Away" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:42 -#: ../system/Widget/widgets/Logout/Logout.php:84 -msgid "Do Not Disturb" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:43 -#: ../system/Widget/widgets/Logout/Logout.php:85 -msgid "Extended Away" -msgstr "" - #: ../system/Widget/widgets/Chat/Chat.php:44 msgid "Offline" msgstr "" @@ -563,8 +559,8 @@ msgid "Language" msgstr "اللغة" #: ../system/Widget/widgets/Config/Config.php:59 -#: ../system/Widget/widgets/Feed/Feed.php:144 -#: ../system/Widget/widgets/Feed/Feed.php:155 +#: ../system/Widget/widgets/Feed/Feed.php:138 +#: ../system/Widget/widgets/Feed/Feed.php:142 #: ../system/Widget/widgets/Vcard/Vcard.php:179 msgid "Submit" msgstr "تقد" @@ -575,23 +571,27 @@ msgid "Reset" msgstr "إعادة تعيي" #: ../system/Widget/widgets/ContactCard/ContactCard.php:61 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:164 msgid "Remove this contact" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:75 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:192 msgid "No" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:178 msgid "Yes" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:100 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:145 msgid "Chat" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:110 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:63 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:71 #: ../system/Widget/widgets/Vcard/Vcard.php:75 msgid "General Informations" msgstr "" @@ -636,27 +636,28 @@ msgid "Avatar" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:129 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:96 #: ../system/Widget/widgets/Vcard/Vcard.php:160 msgid "About Me" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:138 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:111 msgid "Bot" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:139 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:89 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:112 msgid "Desktop" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:140 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:90 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:113 msgid "Phone" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:149 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:106 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:129 msgid "Client Informations" msgstr "" @@ -668,6 +669,14 @@ msgstr "" msgid "Client Type" msgstr "" +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:132 +msgid "Actions" +msgstr "" + +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:202 +msgid "Invite this user" +msgstr "" + #: ../system/Widget/widgets/Feed/Feed.php:43 msgid "Loading your feed ..." msgstr "" @@ -691,23 +700,16 @@ msgid "" "feeds" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:134 -#: ../system/Widget/widgets/Feed/Feed.php:137 -#: ../system/Widget/widgets/Feed/Feed.php:148 -#: ../system/Widget/widgets/Feed/Feed.php:151 -msgid "What's new ?" -msgstr "" - -#: ../system/Widget/widgets/Feed/Feed.php:166 +#: ../system/Widget/widgets/Feed/Feed.php:154 msgid "All" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:167 +#: ../system/Widget/widgets/Feed/Feed.php:155 msgid "My Posts" msgstr "" #: ../system/Widget/widgets/Help/Help.php:32 -msgid "What is Movim ?" +msgid "What is Movim?" msgstr "" #: ../system/Widget/widgets/Help/Help.php:34 @@ -813,20 +815,24 @@ msgid "Account successfully created" msgstr "" #: ../system/Widget/widgets/Login/Login.php:83 -msgid "Movim fail to authenticate. You entered wrong data" +msgid "Movim failed to authenticate. You entered wrong data" msgstr "" #: ../system/Widget/widgets/Login/Login.php:91 msgid "Your web browser is too old to use with Movim." msgstr "" +#: ../system/Widget/widgets/Login/Login.php:108 +msgid "Connecting..." +msgstr "" + #: ../system/Widget/widgets/Login/Login.php:110 msgid "Come in!" msgstr "! يأتي في" #: ../system/Widget/widgets/Login/Login.php:117 #, php-format -msgid "This server host %s accounts" +msgid "This server hosts %s accounts" msgstr "" #: ../system/Widget/widgets/Login/Login.php:122 @@ -837,10 +843,6 @@ msgstr "" msgid "Debug console" msgstr "" -#: ../system/Widget/widgets/Logout/Logout.php:86 -msgid "Logout" -msgstr "خروج" - #: ../system/Widget/widgets/Notifs/Notifs.php:44 msgid "wants to talk with you" msgstr "" @@ -850,36 +852,36 @@ msgid "Accept" msgstr "" #: ../system/Widget/widgets/Notifs/Notifs.php:62 -#: ../system/Widget/widgets/Notifs/Notifs.php:156 -msgid "Validate" +#: ../system/Widget/widgets/Notifs/Notifs.php:125 +msgid "Add" msgstr "" #: ../system/Widget/widgets/Notifs/Notifs.php:68 msgid "Decline" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:120 +#: ../system/Widget/widgets/Notifs/Notifs.php:119 #, php-format msgid "Contacts (%s)" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:126 -msgid "Add" +#: ../system/Widget/widgets/Notifs/Notifs.php:146 +msgid "Alias" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:147 -msgid "Alias" +#: ../system/Widget/widgets/Notifs/Notifs.php:155 +msgid "Send request" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:163 +#: ../system/Widget/widgets/Notifs/Notifs.php:162 msgid "Cancel" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:88 +#: ../system/Widget/widgets/Profile/Profile.php:74 msgid "No profile yet ?" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:89 +#: ../system/Widget/widgets/Profile/Profile.php:75 #: ../system/Widget/widgets/Vcard/Vcard.php:62 msgid "Create my vCard" msgstr "" diff --git a/i18n/be.po b/i18n/be.po index df6832967..6edd95e36 100644 --- a/i18n/be.po +++ b/i18n/be.po @@ -5,10 +5,11 @@ msgid "" msgstr "" "Project-Id-Version: Movim\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-27 21:41+0200\n" +"POT-Creation-Date: 2012-07-18 21:48+0200\n" "PO-Revision-Date: 2011-10-26 21:31+0000\n" "Last-Translator: edhelas \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -57,12 +58,12 @@ msgstr "" #: ../install/index.php:169 #, php-format -msgid "Bosh connection failed with error `%s'" +msgid "Bosh connection failed with error '%s'" msgstr "" #: ../install/index.php:178 #, php-format -msgid "XMPP connection through Bosh failed with error `%s'" +msgid "XMPP connection through Bosh failed with error '%s'" msgstr "" #: ../install/index.php:224 ../install/index.php:228 ../install/index.php:232 @@ -77,7 +78,7 @@ msgstr "" #: ../install/index.php:283 #, php-format -msgid "Database connection failed with error `%s'" +msgid "Database connection failed with error '%s'" msgstr "" #: ../install/part1.php:29 @@ -85,8 +86,7 @@ msgid "Thank you for downloading Movim!" msgstr "" #: ../install/part1.php:30 -msgid "" -"Before you enjoy your social network, a few adjustements are required." +msgid "Before you enjoy your social network, a few adjustements are required." msgstr "" #: ../install/part1.php:31 @@ -176,7 +176,7 @@ msgstr "" #: ../system/Conf.php:38 #, php-format -msgid "Cannot load element value'%s'" +msgid "Cannot load element value '%s'" msgstr "" #: ../system/Conf.php:49 @@ -197,10 +197,6 @@ msgstr "" msgid "jid '%s' is incorrect" msgstr "" -#: ../system/Jabber.php:147 ../system/Widget/widgets/Login/Login.php:108 -msgid "Connecting..." -msgstr "" - #: ../system/Logger.php:27 #, php-format msgid "Cannot open log file '%s'" @@ -348,104 +344,124 @@ msgstr "" msgid "Civil Union" msgstr "" +#: ../system/Utils.php:219 ../system/Widget/widgets/Chat/Chat.php:40 +msgid "Online" +msgstr "" + +#: ../system/Utils.php:220 ../system/Widget/widgets/Chat/Chat.php:41 +msgid "Away" +msgstr "Далёка" + +#: ../system/Utils.php:221 ../system/Widget/widgets/Chat/Chat.php:42 +msgid "Do Not Disturb" +msgstr "" + +#: ../system/Utils.php:222 ../system/Widget/widgets/Chat/Chat.php:43 +msgid "Extended Away" +msgstr "" + +#: ../system/Utils.php:223 +msgid "Logout" +msgstr "Выйсці" + #: ../system/Controller/ControllerMain.php:40 #, php-format msgid "%s - Welcome to Movim" msgstr "%s - Сардэчна запрашаем у Movim" #: ../system/Controller/ControllerMain.php:41 -#: ../system/Controller/ControllerMain.php:75 -#: ../system/Controller/ControllerMain.php:99 -#: ../system/Controller/ControllerMain.php:119 -#: ../system/Controller/ControllerMain.php:151 -#: ../system/Controller/ControllerMain.php:167 -#: ../system/Controller/ControllerMain.php:186 -#: ../system/Controller/ControllerMain.php:215 +#: ../system/Controller/ControllerMain.php:71 +#: ../system/Controller/ControllerMain.php:94 +#: ../system/Controller/ControllerMain.php:114 +#: ../system/Controller/ControllerMain.php:146 +#: ../system/Controller/ControllerMain.php:162 +#: ../system/Controller/ControllerMain.php:181 +#: ../system/Controller/ControllerMain.php:210 msgid "Home" msgstr "Галоўная" #: ../system/Controller/ControllerMain.php:42 -#: ../system/Controller/ControllerMain.php:78 -#: ../system/Controller/ControllerMain.php:100 -#: ../system/Controller/ControllerMain.php:120 -#: ../system/Controller/ControllerMain.php:216 +#: ../system/Controller/ControllerMain.php:73 +#: ../system/Controller/ControllerMain.php:95 +#: ../system/Controller/ControllerMain.php:115 +#: ../system/Controller/ControllerMain.php:211 #: ../system/Widget/widgets/ContactCard/ContactCard.php:175 msgid "Profile" msgstr "" #: ../system/Controller/ControllerMain.php:43 -#: ../system/Controller/ControllerMain.php:79 -#: ../system/Controller/ControllerMain.php:101 -#: ../system/Controller/ControllerMain.php:121 -#: ../system/Controller/ControllerMain.php:217 +#: ../system/Controller/ControllerMain.php:74 +#: ../system/Controller/ControllerMain.php:96 +#: ../system/Controller/ControllerMain.php:116 +#: ../system/Controller/ControllerMain.php:212 msgid "Configuration" msgstr "Канфігурацыя" #: ../system/Controller/ControllerMain.php:44 -#: ../system/Controller/ControllerMain.php:80 -#: ../system/Controller/ControllerMain.php:102 -#: ../system/Controller/ControllerMain.php:122 -#: ../system/Controller/ControllerMain.php:218 +#: ../system/Controller/ControllerMain.php:75 +#: ../system/Controller/ControllerMain.php:97 +#: ../system/Controller/ControllerMain.php:117 +#: ../system/Controller/ControllerMain.php:213 msgid "Help" msgstr "" -#: ../system/Controller/ControllerMain.php:98 +#: ../system/Controller/ControllerMain.php:93 #, php-format msgid "%s - Configuration" msgstr "%s - Канфігурацыя" -#: ../system/Controller/ControllerMain.php:118 +#: ../system/Controller/ControllerMain.php:113 #, php-format msgid "%s - Profile" msgstr "" -#: ../system/Controller/ControllerMain.php:150 +#: ../system/Controller/ControllerMain.php:145 #, php-format msgid "%s - Account Creation" msgstr "%s - Стварэнне логiна" -#: ../system/Controller/ControllerMain.php:152 -#: ../system/Controller/ControllerMain.php:168 +#: ../system/Controller/ControllerMain.php:147 +#: ../system/Controller/ControllerMain.php:163 msgid "Account Creation" msgstr "Стварэнне логiна" -#: ../system/Controller/ControllerMain.php:166 +#: ../system/Controller/ControllerMain.php:161 #, php-format msgid "%s - Add An Account" msgstr "" -#: ../system/Controller/ControllerMain.php:184 +#: ../system/Controller/ControllerMain.php:179 #, php-format msgid "%s - Login to Movim" msgstr "%s - Увайсці ў Movim" -#: ../system/Controller/ControllerMain.php:205 +#: ../system/Controller/ControllerMain.php:200 #, php-format msgid "%s - Help Page" msgstr "" #: ../system/Widget/widgets/Account/Account.php:170 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:100 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:101 msgid "Some data are missing !" msgstr "" #: ../system/Widget/widgets/Account/Account.php:176 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:106 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:107 msgid "Wrong ID" msgstr "" #: ../system/Widget/widgets/Account/Account.php:182 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:112 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:113 msgid "You entered different passwords" msgstr "" #: ../system/Widget/widgets/Account/Account.php:188 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:118 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:119 msgid "Invalid name" msgstr "" #: ../system/Widget/widgets/Account/Account.php:194 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:124 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:125 msgid "Username already taken" msgstr "" @@ -477,7 +493,7 @@ msgid "Only alphanumerics elements are authorized" msgstr "" #: ../system/Widget/widgets/Account/Account.php:236 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:150 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:151 #: ../system/Widget/widgets/Login/Login.php:103 msgid "My address" msgstr "Мой адрас" @@ -499,7 +515,7 @@ msgid "Example :" msgstr "" #: ../system/Widget/widgets/Account/Account.php:249 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:159 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:160 #: ../system/Widget/widgets/Login/Login.php:105 msgid "Password" msgstr "Пароль" @@ -509,7 +525,7 @@ msgid "Same here !" msgstr "" #: ../system/Widget/widgets/Account/Account.php:261 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:169 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:170 msgid "Retype" msgstr "" @@ -518,38 +534,18 @@ msgid "Pseudo" msgstr "" #: ../system/Widget/widgets/Account/Account.php:280 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:177 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:178 msgid "Create" msgstr "" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:130 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:131 msgid "XMPP Domain error, your account is not a correct Jabber ID" msgstr "" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:143 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:144 msgid "Add your login informations" msgstr "" -#: ../system/Widget/widgets/Chat/Chat.php:40 -#: ../system/Widget/widgets/Logout/Logout.php:82 -msgid "Online" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:41 -#: ../system/Widget/widgets/Logout/Logout.php:83 -msgid "Away" -msgstr "Далёка" - -#: ../system/Widget/widgets/Chat/Chat.php:42 -#: ../system/Widget/widgets/Logout/Logout.php:84 -msgid "Do Not Disturb" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:43 -#: ../system/Widget/widgets/Logout/Logout.php:85 -msgid "Extended Away" -msgstr "" - #: ../system/Widget/widgets/Chat/Chat.php:44 msgid "Offline" msgstr "" @@ -563,8 +559,8 @@ msgid "Language" msgstr "Мова" #: ../system/Widget/widgets/Config/Config.php:59 -#: ../system/Widget/widgets/Feed/Feed.php:144 -#: ../system/Widget/widgets/Feed/Feed.php:155 +#: ../system/Widget/widgets/Feed/Feed.php:138 +#: ../system/Widget/widgets/Feed/Feed.php:142 #: ../system/Widget/widgets/Vcard/Vcard.php:179 msgid "Submit" msgstr "Даслаць" @@ -575,23 +571,27 @@ msgid "Reset" msgstr "Скід" #: ../system/Widget/widgets/ContactCard/ContactCard.php:61 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:164 msgid "Remove this contact" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:75 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:192 msgid "No" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:178 msgid "Yes" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:100 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:145 msgid "Chat" msgstr "Чат" #: ../system/Widget/widgets/ContactCard/ContactCard.php:110 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:63 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:71 #: ../system/Widget/widgets/Vcard/Vcard.php:75 msgid "General Informations" msgstr "" @@ -636,27 +636,28 @@ msgid "Avatar" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:129 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:96 #: ../system/Widget/widgets/Vcard/Vcard.php:160 msgid "About Me" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:138 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:111 msgid "Bot" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:139 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:89 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:112 msgid "Desktop" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:140 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:90 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:113 msgid "Phone" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:149 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:106 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:129 msgid "Client Informations" msgstr "" @@ -668,6 +669,14 @@ msgstr "" msgid "Client Type" msgstr "" +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:132 +msgid "Actions" +msgstr "" + +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:202 +msgid "Invite this user" +msgstr "" + #: ../system/Widget/widgets/Feed/Feed.php:43 msgid "Loading your feed ..." msgstr "" @@ -691,23 +700,16 @@ msgid "" "feeds" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:134 -#: ../system/Widget/widgets/Feed/Feed.php:137 -#: ../system/Widget/widgets/Feed/Feed.php:148 -#: ../system/Widget/widgets/Feed/Feed.php:151 -msgid "What's new ?" -msgstr "" - -#: ../system/Widget/widgets/Feed/Feed.php:166 +#: ../system/Widget/widgets/Feed/Feed.php:154 msgid "All" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:167 +#: ../system/Widget/widgets/Feed/Feed.php:155 msgid "My Posts" msgstr "" #: ../system/Widget/widgets/Help/Help.php:32 -msgid "What is Movim ?" +msgid "What is Movim?" msgstr "" #: ../system/Widget/widgets/Help/Help.php:34 @@ -813,20 +815,24 @@ msgid "Account successfully created" msgstr "" #: ../system/Widget/widgets/Login/Login.php:83 -msgid "Movim fail to authenticate. You entered wrong data" +msgid "Movim failed to authenticate. You entered wrong data" msgstr "" #: ../system/Widget/widgets/Login/Login.php:91 msgid "Your web browser is too old to use with Movim." msgstr "" +#: ../system/Widget/widgets/Login/Login.php:108 +msgid "Connecting..." +msgstr "" + #: ../system/Widget/widgets/Login/Login.php:110 msgid "Come in!" msgstr "Заходзьце!" #: ../system/Widget/widgets/Login/Login.php:117 #, php-format -msgid "This server host %s accounts" +msgid "This server hosts %s accounts" msgstr "" #: ../system/Widget/widgets/Login/Login.php:122 @@ -837,10 +843,6 @@ msgstr "" msgid "Debug console" msgstr "Debug console" -#: ../system/Widget/widgets/Logout/Logout.php:86 -msgid "Logout" -msgstr "Выйсці" - #: ../system/Widget/widgets/Notifs/Notifs.php:44 msgid "wants to talk with you" msgstr "" @@ -850,36 +852,36 @@ msgid "Accept" msgstr "" #: ../system/Widget/widgets/Notifs/Notifs.php:62 -#: ../system/Widget/widgets/Notifs/Notifs.php:156 -msgid "Validate" +#: ../system/Widget/widgets/Notifs/Notifs.php:125 +msgid "Add" msgstr "" #: ../system/Widget/widgets/Notifs/Notifs.php:68 msgid "Decline" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:120 +#: ../system/Widget/widgets/Notifs/Notifs.php:119 #, php-format msgid "Contacts (%s)" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:126 -msgid "Add" +#: ../system/Widget/widgets/Notifs/Notifs.php:146 +msgid "Alias" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:147 -msgid "Alias" +#: ../system/Widget/widgets/Notifs/Notifs.php:155 +msgid "Send request" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:163 +#: ../system/Widget/widgets/Notifs/Notifs.php:162 msgid "Cancel" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:88 +#: ../system/Widget/widgets/Profile/Profile.php:74 msgid "No profile yet ?" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:89 +#: ../system/Widget/widgets/Profile/Profile.php:75 #: ../system/Widget/widgets/Vcard/Vcard.php:62 msgid "Create my vCard" msgstr "" diff --git a/i18n/br.po b/i18n/br.po index ab1e9f75b..740b4965c 100644 --- a/i18n/br.po +++ b/i18n/br.po @@ -5,10 +5,11 @@ msgid "" msgstr "" "Project-Id-Version: Movim\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-27 21:41+0200\n" +"POT-Creation-Date: 2012-07-18 21:48+0200\n" "PO-Revision-Date: 2011-10-26 21:31+0000\n" "Last-Translator: edhelas \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -57,12 +58,12 @@ msgstr "" #: ../install/index.php:169 #, php-format -msgid "Bosh connection failed with error `%s'" +msgid "Bosh connection failed with error '%s'" msgstr "" #: ../install/index.php:178 #, php-format -msgid "XMPP connection through Bosh failed with error `%s'" +msgid "XMPP connection through Bosh failed with error '%s'" msgstr "" #: ../install/index.php:224 ../install/index.php:228 ../install/index.php:232 @@ -77,7 +78,7 @@ msgstr "" #: ../install/index.php:283 #, php-format -msgid "Database connection failed with error `%s'" +msgid "Database connection failed with error '%s'" msgstr "" #: ../install/part1.php:29 @@ -85,8 +86,7 @@ msgid "Thank you for downloading Movim!" msgstr "" #: ../install/part1.php:30 -msgid "" -"Before you enjoy your social network, a few adjustements are required." +msgid "Before you enjoy your social network, a few adjustements are required." msgstr "" #: ../install/part1.php:31 @@ -176,7 +176,7 @@ msgstr "" #: ../system/Conf.php:38 #, php-format -msgid "Cannot load element value'%s'" +msgid "Cannot load element value '%s'" msgstr "" #: ../system/Conf.php:49 @@ -197,10 +197,6 @@ msgstr "" msgid "jid '%s' is incorrect" msgstr "" -#: ../system/Jabber.php:147 ../system/Widget/widgets/Login/Login.php:108 -msgid "Connecting..." -msgstr "" - #: ../system/Logger.php:27 #, php-format msgid "Cannot open log file '%s'" @@ -348,104 +344,124 @@ msgstr "" msgid "Civil Union" msgstr "" +#: ../system/Utils.php:219 ../system/Widget/widgets/Chat/Chat.php:40 +msgid "Online" +msgstr "" + +#: ../system/Utils.php:220 ../system/Widget/widgets/Chat/Chat.php:41 +msgid "Away" +msgstr "" + +#: ../system/Utils.php:221 ../system/Widget/widgets/Chat/Chat.php:42 +msgid "Do Not Disturb" +msgstr "" + +#: ../system/Utils.php:222 ../system/Widget/widgets/Chat/Chat.php:43 +msgid "Extended Away" +msgstr "" + +#: ../system/Utils.php:223 +msgid "Logout" +msgstr "" + #: ../system/Controller/ControllerMain.php:40 #, php-format msgid "%s - Welcome to Movim" msgstr "" #: ../system/Controller/ControllerMain.php:41 -#: ../system/Controller/ControllerMain.php:75 -#: ../system/Controller/ControllerMain.php:99 -#: ../system/Controller/ControllerMain.php:119 -#: ../system/Controller/ControllerMain.php:151 -#: ../system/Controller/ControllerMain.php:167 -#: ../system/Controller/ControllerMain.php:186 -#: ../system/Controller/ControllerMain.php:215 +#: ../system/Controller/ControllerMain.php:71 +#: ../system/Controller/ControllerMain.php:94 +#: ../system/Controller/ControllerMain.php:114 +#: ../system/Controller/ControllerMain.php:146 +#: ../system/Controller/ControllerMain.php:162 +#: ../system/Controller/ControllerMain.php:181 +#: ../system/Controller/ControllerMain.php:210 msgid "Home" msgstr "Degemer" #: ../system/Controller/ControllerMain.php:42 -#: ../system/Controller/ControllerMain.php:78 -#: ../system/Controller/ControllerMain.php:100 -#: ../system/Controller/ControllerMain.php:120 -#: ../system/Controller/ControllerMain.php:216 +#: ../system/Controller/ControllerMain.php:73 +#: ../system/Controller/ControllerMain.php:95 +#: ../system/Controller/ControllerMain.php:115 +#: ../system/Controller/ControllerMain.php:211 #: ../system/Widget/widgets/ContactCard/ContactCard.php:175 msgid "Profile" msgstr "" #: ../system/Controller/ControllerMain.php:43 -#: ../system/Controller/ControllerMain.php:79 -#: ../system/Controller/ControllerMain.php:101 -#: ../system/Controller/ControllerMain.php:121 -#: ../system/Controller/ControllerMain.php:217 +#: ../system/Controller/ControllerMain.php:74 +#: ../system/Controller/ControllerMain.php:96 +#: ../system/Controller/ControllerMain.php:116 +#: ../system/Controller/ControllerMain.php:212 msgid "Configuration" msgstr "" #: ../system/Controller/ControllerMain.php:44 -#: ../system/Controller/ControllerMain.php:80 -#: ../system/Controller/ControllerMain.php:102 -#: ../system/Controller/ControllerMain.php:122 -#: ../system/Controller/ControllerMain.php:218 +#: ../system/Controller/ControllerMain.php:75 +#: ../system/Controller/ControllerMain.php:97 +#: ../system/Controller/ControllerMain.php:117 +#: ../system/Controller/ControllerMain.php:213 msgid "Help" msgstr "" -#: ../system/Controller/ControllerMain.php:98 +#: ../system/Controller/ControllerMain.php:93 #, php-format msgid "%s - Configuration" msgstr "" -#: ../system/Controller/ControllerMain.php:118 +#: ../system/Controller/ControllerMain.php:113 #, php-format msgid "%s - Profile" msgstr "" -#: ../system/Controller/ControllerMain.php:150 +#: ../system/Controller/ControllerMain.php:145 #, php-format msgid "%s - Account Creation" msgstr "" -#: ../system/Controller/ControllerMain.php:152 -#: ../system/Controller/ControllerMain.php:168 +#: ../system/Controller/ControllerMain.php:147 +#: ../system/Controller/ControllerMain.php:163 msgid "Account Creation" msgstr "" -#: ../system/Controller/ControllerMain.php:166 +#: ../system/Controller/ControllerMain.php:161 #, php-format msgid "%s - Add An Account" msgstr "" -#: ../system/Controller/ControllerMain.php:184 +#: ../system/Controller/ControllerMain.php:179 #, php-format msgid "%s - Login to Movim" msgstr "" -#: ../system/Controller/ControllerMain.php:205 +#: ../system/Controller/ControllerMain.php:200 #, php-format msgid "%s - Help Page" msgstr "" #: ../system/Widget/widgets/Account/Account.php:170 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:100 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:101 msgid "Some data are missing !" msgstr "" #: ../system/Widget/widgets/Account/Account.php:176 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:106 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:107 msgid "Wrong ID" msgstr "" #: ../system/Widget/widgets/Account/Account.php:182 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:112 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:113 msgid "You entered different passwords" msgstr "" #: ../system/Widget/widgets/Account/Account.php:188 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:118 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:119 msgid "Invalid name" msgstr "" #: ../system/Widget/widgets/Account/Account.php:194 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:124 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:125 msgid "Username already taken" msgstr "" @@ -477,7 +493,7 @@ msgid "Only alphanumerics elements are authorized" msgstr "" #: ../system/Widget/widgets/Account/Account.php:236 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:150 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:151 #: ../system/Widget/widgets/Login/Login.php:103 msgid "My address" msgstr "" @@ -499,7 +515,7 @@ msgid "Example :" msgstr "" #: ../system/Widget/widgets/Account/Account.php:249 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:159 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:160 #: ../system/Widget/widgets/Login/Login.php:105 msgid "Password" msgstr "" @@ -509,7 +525,7 @@ msgid "Same here !" msgstr "" #: ../system/Widget/widgets/Account/Account.php:261 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:169 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:170 msgid "Retype" msgstr "" @@ -518,38 +534,18 @@ msgid "Pseudo" msgstr "" #: ../system/Widget/widgets/Account/Account.php:280 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:177 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:178 msgid "Create" msgstr "" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:130 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:131 msgid "XMPP Domain error, your account is not a correct Jabber ID" msgstr "" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:143 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:144 msgid "Add your login informations" msgstr "" -#: ../system/Widget/widgets/Chat/Chat.php:40 -#: ../system/Widget/widgets/Logout/Logout.php:82 -msgid "Online" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:41 -#: ../system/Widget/widgets/Logout/Logout.php:83 -msgid "Away" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:42 -#: ../system/Widget/widgets/Logout/Logout.php:84 -msgid "Do Not Disturb" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:43 -#: ../system/Widget/widgets/Logout/Logout.php:85 -msgid "Extended Away" -msgstr "" - #: ../system/Widget/widgets/Chat/Chat.php:44 msgid "Offline" msgstr "" @@ -563,8 +559,8 @@ msgid "Language" msgstr "Teod" #: ../system/Widget/widgets/Config/Config.php:59 -#: ../system/Widget/widgets/Feed/Feed.php:144 -#: ../system/Widget/widgets/Feed/Feed.php:155 +#: ../system/Widget/widgets/Feed/Feed.php:138 +#: ../system/Widget/widgets/Feed/Feed.php:142 #: ../system/Widget/widgets/Vcard/Vcard.php:179 msgid "Submit" msgstr "" @@ -575,23 +571,27 @@ msgid "Reset" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:61 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:164 msgid "Remove this contact" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:75 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:192 msgid "No" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:178 msgid "Yes" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:100 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:145 msgid "Chat" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:110 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:63 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:71 #: ../system/Widget/widgets/Vcard/Vcard.php:75 msgid "General Informations" msgstr "" @@ -636,27 +636,28 @@ msgid "Avatar" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:129 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:96 #: ../system/Widget/widgets/Vcard/Vcard.php:160 msgid "About Me" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:138 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:111 msgid "Bot" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:139 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:89 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:112 msgid "Desktop" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:140 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:90 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:113 msgid "Phone" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:149 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:106 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:129 msgid "Client Informations" msgstr "" @@ -668,6 +669,14 @@ msgstr "" msgid "Client Type" msgstr "" +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:132 +msgid "Actions" +msgstr "" + +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:202 +msgid "Invite this user" +msgstr "" + #: ../system/Widget/widgets/Feed/Feed.php:43 msgid "Loading your feed ..." msgstr "" @@ -691,23 +700,16 @@ msgid "" "feeds" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:134 -#: ../system/Widget/widgets/Feed/Feed.php:137 -#: ../system/Widget/widgets/Feed/Feed.php:148 -#: ../system/Widget/widgets/Feed/Feed.php:151 -msgid "What's new ?" -msgstr "" - -#: ../system/Widget/widgets/Feed/Feed.php:166 +#: ../system/Widget/widgets/Feed/Feed.php:154 msgid "All" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:167 +#: ../system/Widget/widgets/Feed/Feed.php:155 msgid "My Posts" msgstr "" #: ../system/Widget/widgets/Help/Help.php:32 -msgid "What is Movim ?" +msgid "What is Movim?" msgstr "" #: ../system/Widget/widgets/Help/Help.php:34 @@ -813,20 +815,24 @@ msgid "Account successfully created" msgstr "" #: ../system/Widget/widgets/Login/Login.php:83 -msgid "Movim fail to authenticate. You entered wrong data" +msgid "Movim failed to authenticate. You entered wrong data" msgstr "" #: ../system/Widget/widgets/Login/Login.php:91 msgid "Your web browser is too old to use with Movim." msgstr "" +#: ../system/Widget/widgets/Login/Login.php:108 +msgid "Connecting..." +msgstr "" + #: ../system/Widget/widgets/Login/Login.php:110 msgid "Come in!" msgstr "" #: ../system/Widget/widgets/Login/Login.php:117 #, php-format -msgid "This server host %s accounts" +msgid "This server hosts %s accounts" msgstr "" #: ../system/Widget/widgets/Login/Login.php:122 @@ -837,10 +843,6 @@ msgstr "" msgid "Debug console" msgstr "" -#: ../system/Widget/widgets/Logout/Logout.php:86 -msgid "Logout" -msgstr "" - #: ../system/Widget/widgets/Notifs/Notifs.php:44 msgid "wants to talk with you" msgstr "" @@ -850,36 +852,36 @@ msgid "Accept" msgstr "" #: ../system/Widget/widgets/Notifs/Notifs.php:62 -#: ../system/Widget/widgets/Notifs/Notifs.php:156 -msgid "Validate" +#: ../system/Widget/widgets/Notifs/Notifs.php:125 +msgid "Add" msgstr "" #: ../system/Widget/widgets/Notifs/Notifs.php:68 msgid "Decline" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:120 +#: ../system/Widget/widgets/Notifs/Notifs.php:119 #, php-format msgid "Contacts (%s)" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:126 -msgid "Add" +#: ../system/Widget/widgets/Notifs/Notifs.php:146 +msgid "Alias" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:147 -msgid "Alias" +#: ../system/Widget/widgets/Notifs/Notifs.php:155 +msgid "Send request" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:163 +#: ../system/Widget/widgets/Notifs/Notifs.php:162 msgid "Cancel" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:88 +#: ../system/Widget/widgets/Profile/Profile.php:74 msgid "No profile yet ?" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:89 +#: ../system/Widget/widgets/Profile/Profile.php:75 #: ../system/Widget/widgets/Vcard/Vcard.php:62 msgid "Create my vCard" msgstr "" diff --git a/i18n/da.po b/i18n/da.po index 0e55b2fc5..f7b3d27c5 100644 --- a/i18n/da.po +++ b/i18n/da.po @@ -5,10 +5,11 @@ msgid "" msgstr "" "Project-Id-Version: Movim\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-27 21:41+0200\n" +"POT-Creation-Date: 2012-07-18 21:48+0200\n" "PO-Revision-Date: 2011-10-26 21:31+0000\n" "Last-Translator: edhelas \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -57,12 +58,12 @@ msgstr "" #: ../install/index.php:169 #, php-format -msgid "Bosh connection failed with error `%s'" +msgid "Bosh connection failed with error '%s'" msgstr "" #: ../install/index.php:178 #, php-format -msgid "XMPP connection through Bosh failed with error `%s'" +msgid "XMPP connection through Bosh failed with error '%s'" msgstr "" #: ../install/index.php:224 ../install/index.php:228 ../install/index.php:232 @@ -77,7 +78,7 @@ msgstr "Kunne ikke oprette konfigurationfil '%s'." #: ../install/index.php:283 #, php-format -msgid "Database connection failed with error `%s'" +msgid "Database connection failed with error '%s'" msgstr "" #: ../install/part1.php:29 @@ -85,8 +86,7 @@ msgid "Thank you for downloading Movim!" msgstr "" #: ../install/part1.php:30 -msgid "" -"Before you enjoy your social network, a few adjustements are required." +msgid "Before you enjoy your social network, a few adjustements are required." msgstr "" #: ../install/part1.php:31 @@ -177,8 +177,8 @@ msgid "Please remove the %s folder in order to complete the installation" msgstr "" #: ../system/Conf.php:38 -#, php-format -msgid "Cannot load element value'%s'" +#, fuzzy, php-format +msgid "Cannot load element value '%s'" msgstr "Kan ikke indlæse element værdi '%s'" #: ../system/Conf.php:49 @@ -199,10 +199,6 @@ msgstr "JID ikke givet." msgid "jid '%s' is incorrect" msgstr "jid '%s' er ikke korrekt" -#: ../system/Jabber.php:147 ../system/Widget/widgets/Login/Login.php:108 -msgid "Connecting..." -msgstr "" - #: ../system/Logger.php:27 #, php-format msgid "Cannot open log file '%s'" @@ -350,104 +346,124 @@ msgstr "" msgid "Civil Union" msgstr "" +#: ../system/Utils.php:219 ../system/Widget/widgets/Chat/Chat.php:40 +msgid "Online" +msgstr "" + +#: ../system/Utils.php:220 ../system/Widget/widgets/Chat/Chat.php:41 +msgid "Away" +msgstr "Ikke tilstede" + +#: ../system/Utils.php:221 ../system/Widget/widgets/Chat/Chat.php:42 +msgid "Do Not Disturb" +msgstr "" + +#: ../system/Utils.php:222 ../system/Widget/widgets/Chat/Chat.php:43 +msgid "Extended Away" +msgstr "" + +#: ../system/Utils.php:223 +msgid "Logout" +msgstr "Log ud" + #: ../system/Controller/ControllerMain.php:40 #, php-format msgid "%s - Welcome to Movim" msgstr "%s - Velkommen til Movim" #: ../system/Controller/ControllerMain.php:41 -#: ../system/Controller/ControllerMain.php:75 -#: ../system/Controller/ControllerMain.php:99 -#: ../system/Controller/ControllerMain.php:119 -#: ../system/Controller/ControllerMain.php:151 -#: ../system/Controller/ControllerMain.php:167 -#: ../system/Controller/ControllerMain.php:186 -#: ../system/Controller/ControllerMain.php:215 +#: ../system/Controller/ControllerMain.php:71 +#: ../system/Controller/ControllerMain.php:94 +#: ../system/Controller/ControllerMain.php:114 +#: ../system/Controller/ControllerMain.php:146 +#: ../system/Controller/ControllerMain.php:162 +#: ../system/Controller/ControllerMain.php:181 +#: ../system/Controller/ControllerMain.php:210 msgid "Home" msgstr "Start" #: ../system/Controller/ControllerMain.php:42 -#: ../system/Controller/ControllerMain.php:78 -#: ../system/Controller/ControllerMain.php:100 -#: ../system/Controller/ControllerMain.php:120 -#: ../system/Controller/ControllerMain.php:216 +#: ../system/Controller/ControllerMain.php:73 +#: ../system/Controller/ControllerMain.php:95 +#: ../system/Controller/ControllerMain.php:115 +#: ../system/Controller/ControllerMain.php:211 #: ../system/Widget/widgets/ContactCard/ContactCard.php:175 msgid "Profile" msgstr "Profil" #: ../system/Controller/ControllerMain.php:43 -#: ../system/Controller/ControllerMain.php:79 -#: ../system/Controller/ControllerMain.php:101 -#: ../system/Controller/ControllerMain.php:121 -#: ../system/Controller/ControllerMain.php:217 +#: ../system/Controller/ControllerMain.php:74 +#: ../system/Controller/ControllerMain.php:96 +#: ../system/Controller/ControllerMain.php:116 +#: ../system/Controller/ControllerMain.php:212 msgid "Configuration" msgstr "Konfiguration" #: ../system/Controller/ControllerMain.php:44 -#: ../system/Controller/ControllerMain.php:80 -#: ../system/Controller/ControllerMain.php:102 -#: ../system/Controller/ControllerMain.php:122 -#: ../system/Controller/ControllerMain.php:218 +#: ../system/Controller/ControllerMain.php:75 +#: ../system/Controller/ControllerMain.php:97 +#: ../system/Controller/ControllerMain.php:117 +#: ../system/Controller/ControllerMain.php:213 msgid "Help" msgstr "" -#: ../system/Controller/ControllerMain.php:98 +#: ../system/Controller/ControllerMain.php:93 #, php-format msgid "%s - Configuration" msgstr "%s - Konfiguration" -#: ../system/Controller/ControllerMain.php:118 +#: ../system/Controller/ControllerMain.php:113 #, php-format msgid "%s - Profile" msgstr "" -#: ../system/Controller/ControllerMain.php:150 +#: ../system/Controller/ControllerMain.php:145 #, php-format msgid "%s - Account Creation" msgstr "%s - Konto oprettelse" -#: ../system/Controller/ControllerMain.php:152 -#: ../system/Controller/ControllerMain.php:168 +#: ../system/Controller/ControllerMain.php:147 +#: ../system/Controller/ControllerMain.php:163 msgid "Account Creation" msgstr "Konto oprettelse" -#: ../system/Controller/ControllerMain.php:166 +#: ../system/Controller/ControllerMain.php:161 #, php-format msgid "%s - Add An Account" msgstr "" -#: ../system/Controller/ControllerMain.php:184 +#: ../system/Controller/ControllerMain.php:179 #, php-format msgid "%s - Login to Movim" msgstr "%s - Log Ind til Movim" -#: ../system/Controller/ControllerMain.php:205 +#: ../system/Controller/ControllerMain.php:200 #, php-format msgid "%s - Help Page" msgstr "" #: ../system/Widget/widgets/Account/Account.php:170 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:100 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:101 msgid "Some data are missing !" msgstr "" #: ../system/Widget/widgets/Account/Account.php:176 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:106 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:107 msgid "Wrong ID" msgstr "" #: ../system/Widget/widgets/Account/Account.php:182 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:112 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:113 msgid "You entered different passwords" msgstr "" #: ../system/Widget/widgets/Account/Account.php:188 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:118 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:119 msgid "Invalid name" msgstr "" #: ../system/Widget/widgets/Account/Account.php:194 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:124 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:125 msgid "Username already taken" msgstr "" @@ -479,7 +495,7 @@ msgid "Only alphanumerics elements are authorized" msgstr "" #: ../system/Widget/widgets/Account/Account.php:236 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:150 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:151 #: ../system/Widget/widgets/Login/Login.php:103 msgid "My address" msgstr "Min adresse" @@ -501,7 +517,7 @@ msgid "Example :" msgstr "" #: ../system/Widget/widgets/Account/Account.php:249 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:159 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:160 #: ../system/Widget/widgets/Login/Login.php:105 msgid "Password" msgstr "Adgangskode" @@ -511,7 +527,7 @@ msgid "Same here !" msgstr "" #: ../system/Widget/widgets/Account/Account.php:261 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:169 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:170 msgid "Retype" msgstr "" @@ -520,38 +536,18 @@ msgid "Pseudo" msgstr "" #: ../system/Widget/widgets/Account/Account.php:280 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:177 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:178 msgid "Create" msgstr "" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:130 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:131 msgid "XMPP Domain error, your account is not a correct Jabber ID" msgstr "" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:143 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:144 msgid "Add your login informations" msgstr "" -#: ../system/Widget/widgets/Chat/Chat.php:40 -#: ../system/Widget/widgets/Logout/Logout.php:82 -msgid "Online" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:41 -#: ../system/Widget/widgets/Logout/Logout.php:83 -msgid "Away" -msgstr "Ikke tilstede" - -#: ../system/Widget/widgets/Chat/Chat.php:42 -#: ../system/Widget/widgets/Logout/Logout.php:84 -msgid "Do Not Disturb" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:43 -#: ../system/Widget/widgets/Logout/Logout.php:85 -msgid "Extended Away" -msgstr "" - #: ../system/Widget/widgets/Chat/Chat.php:44 msgid "Offline" msgstr "" @@ -565,8 +561,8 @@ msgid "Language" msgstr "Sprog" #: ../system/Widget/widgets/Config/Config.php:59 -#: ../system/Widget/widgets/Feed/Feed.php:144 -#: ../system/Widget/widgets/Feed/Feed.php:155 +#: ../system/Widget/widgets/Feed/Feed.php:138 +#: ../system/Widget/widgets/Feed/Feed.php:142 #: ../system/Widget/widgets/Vcard/Vcard.php:179 msgid "Submit" msgstr "Indsend" @@ -577,23 +573,27 @@ msgid "Reset" msgstr "Nulstil" #: ../system/Widget/widgets/ContactCard/ContactCard.php:61 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:164 msgid "Remove this contact" msgstr "Fjern denne kontakt" #: ../system/Widget/widgets/ContactCard/ContactCard.php:75 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:192 msgid "No" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:178 msgid "Yes" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:100 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:145 msgid "Chat" msgstr "Samtale" #: ../system/Widget/widgets/ContactCard/ContactCard.php:110 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:63 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:71 #: ../system/Widget/widgets/Vcard/Vcard.php:75 msgid "General Informations" msgstr "Generelle informationer" @@ -638,27 +638,28 @@ msgid "Avatar" msgstr "Profilbillede" #: ../system/Widget/widgets/ContactCard/ContactCard.php:129 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:96 #: ../system/Widget/widgets/Vcard/Vcard.php:160 msgid "About Me" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:138 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:111 msgid "Bot" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:139 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:89 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:112 msgid "Desktop" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:140 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:90 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:113 msgid "Phone" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:149 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:106 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:129 msgid "Client Informations" msgstr "" @@ -670,6 +671,14 @@ msgstr "" msgid "Client Type" msgstr "" +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:132 +msgid "Actions" +msgstr "" + +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:202 +msgid "Invite this user" +msgstr "" + #: ../system/Widget/widgets/Feed/Feed.php:43 msgid "Loading your feed ..." msgstr "" @@ -693,23 +702,16 @@ msgid "" "feeds" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:134 -#: ../system/Widget/widgets/Feed/Feed.php:137 -#: ../system/Widget/widgets/Feed/Feed.php:148 -#: ../system/Widget/widgets/Feed/Feed.php:151 -msgid "What's new ?" -msgstr "" - -#: ../system/Widget/widgets/Feed/Feed.php:166 +#: ../system/Widget/widgets/Feed/Feed.php:154 msgid "All" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:167 +#: ../system/Widget/widgets/Feed/Feed.php:155 msgid "My Posts" msgstr "" #: ../system/Widget/widgets/Help/Help.php:32 -msgid "What is Movim ?" +msgid "What is Movim?" msgstr "" #: ../system/Widget/widgets/Help/Help.php:34 @@ -815,20 +817,24 @@ msgid "Account successfully created" msgstr "" #: ../system/Widget/widgets/Login/Login.php:83 -msgid "Movim fail to authenticate. You entered wrong data" +msgid "Movim failed to authenticate. You entered wrong data" msgstr "" #: ../system/Widget/widgets/Login/Login.php:91 msgid "Your web browser is too old to use with Movim." msgstr "" +#: ../system/Widget/widgets/Login/Login.php:108 +msgid "Connecting..." +msgstr "" + #: ../system/Widget/widgets/Login/Login.php:110 msgid "Come in!" msgstr "Kom Ind!" #: ../system/Widget/widgets/Login/Login.php:117 #, php-format -msgid "This server host %s accounts" +msgid "This server hosts %s accounts" msgstr "" #: ../system/Widget/widgets/Login/Login.php:122 @@ -839,10 +845,6 @@ msgstr "" msgid "Debug console" msgstr "Fejlsøgningskonsol" -#: ../system/Widget/widgets/Logout/Logout.php:86 -msgid "Logout" -msgstr "Log ud" - #: ../system/Widget/widgets/Notifs/Notifs.php:44 msgid "wants to talk with you" msgstr "ønsker at snakke med dig" @@ -852,36 +854,36 @@ msgid "Accept" msgstr "Godkend" #: ../system/Widget/widgets/Notifs/Notifs.php:62 -#: ../system/Widget/widgets/Notifs/Notifs.php:156 -msgid "Validate" -msgstr "Gyldighedskontrol" +#: ../system/Widget/widgets/Notifs/Notifs.php:125 +msgid "Add" +msgstr "" #: ../system/Widget/widgets/Notifs/Notifs.php:68 msgid "Decline" msgstr "Afvis" -#: ../system/Widget/widgets/Notifs/Notifs.php:120 +#: ../system/Widget/widgets/Notifs/Notifs.php:119 #, php-format msgid "Contacts (%s)" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:126 -msgid "Add" -msgstr "" - -#: ../system/Widget/widgets/Notifs/Notifs.php:147 +#: ../system/Widget/widgets/Notifs/Notifs.php:146 msgid "Alias" msgstr "Alias" -#: ../system/Widget/widgets/Notifs/Notifs.php:163 +#: ../system/Widget/widgets/Notifs/Notifs.php:155 +msgid "Send request" +msgstr "" + +#: ../system/Widget/widgets/Notifs/Notifs.php:162 msgid "Cancel" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:88 +#: ../system/Widget/widgets/Profile/Profile.php:74 msgid "No profile yet ?" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:89 +#: ../system/Widget/widgets/Profile/Profile.php:75 #: ../system/Widget/widgets/Vcard/Vcard.php:62 msgid "Create my vCard" msgstr "" @@ -924,6 +926,9 @@ msgstr "" msgid "Loading the contact feed ..." msgstr "Indlæse kontakt kilde..." +#~ msgid "Validate" +#~ msgstr "Gyldighedskontrol" + #~ msgid "MOVIM - Test Client" #~ msgstr "MOVIM - Test klient" diff --git a/i18n/de.po b/i18n/de.po index 33c724f7c..d4dd82286 100644 --- a/i18n/de.po +++ b/i18n/de.po @@ -5,10 +5,11 @@ msgid "" msgstr "" "Project-Id-Version: Movim\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-27 21:41+0200\n" +"POT-Creation-Date: 2012-07-18 21:48+0200\n" "PO-Revision-Date: 2012-05-09 12:18+0000\n" "Last-Translator: Kilian Holzinger \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -60,12 +61,12 @@ msgstr "oder" #: ../install/index.php:169 #, php-format -msgid "Bosh connection failed with error `%s'" +msgid "Bosh connection failed with error '%s'" msgstr "" #: ../install/index.php:178 #, php-format -msgid "XMPP connection through Bosh failed with error `%s'" +msgid "XMPP connection through Bosh failed with error '%s'" msgstr "" #: ../install/index.php:224 ../install/index.php:228 ../install/index.php:232 @@ -80,7 +81,7 @@ msgstr "Die Konfigurationsdatei '%s' konnte nicht erstellt werden!" #: ../install/index.php:283 #, php-format -msgid "Database connection failed with error `%s'" +msgid "Database connection failed with error '%s'" msgstr "" #: ../install/part1.php:29 @@ -88,8 +89,7 @@ msgid "Thank you for downloading Movim!" msgstr "" #: ../install/part1.php:30 -msgid "" -"Before you enjoy your social network, a few adjustements are required." +msgid "Before you enjoy your social network, a few adjustements are required." msgstr "" #: ../install/part1.php:31 @@ -181,8 +181,8 @@ msgid "Please remove the %s folder in order to complete the installation" msgstr "Bitte entfernen Sie den %s Ordner um die Installation abzuschließen" #: ../system/Conf.php:38 -#, php-format -msgid "Cannot load element value'%s'" +#, fuzzy, php-format +msgid "Cannot load element value '%s'" msgstr "Konnte das Element mit dem Wert '%s' nicht laden." #: ../system/Conf.php:49 @@ -203,10 +203,6 @@ msgstr "Die JID wurde nicht übermittelt" msgid "jid '%s' is incorrect" msgstr "Die JID '%s' ist inkorrekt." -#: ../system/Jabber.php:147 ../system/Widget/widgets/Login/Login.php:108 -msgid "Connecting..." -msgstr "Verbindung wird aufgebaut ..." - #: ../system/Logger.php:27 #, php-format msgid "Cannot open log file '%s'" @@ -354,104 +350,124 @@ msgstr "" msgid "Civil Union" msgstr "" +#: ../system/Utils.php:219 ../system/Widget/widgets/Chat/Chat.php:40 +msgid "Online" +msgstr "Verbunden" + +#: ../system/Utils.php:220 ../system/Widget/widgets/Chat/Chat.php:41 +msgid "Away" +msgstr "Abwesend" + +#: ../system/Utils.php:221 ../system/Widget/widgets/Chat/Chat.php:42 +msgid "Do Not Disturb" +msgstr "Bitte nicht stören" + +#: ../system/Utils.php:222 ../system/Widget/widgets/Chat/Chat.php:43 +msgid "Extended Away" +msgstr "Länger abwesend" + +#: ../system/Utils.php:223 +msgid "Logout" +msgstr "Abmelden" + #: ../system/Controller/ControllerMain.php:40 #, php-format msgid "%s - Welcome to Movim" msgstr "%s – Willkommen bei Movim" #: ../system/Controller/ControllerMain.php:41 -#: ../system/Controller/ControllerMain.php:75 -#: ../system/Controller/ControllerMain.php:99 -#: ../system/Controller/ControllerMain.php:119 -#: ../system/Controller/ControllerMain.php:151 -#: ../system/Controller/ControllerMain.php:167 -#: ../system/Controller/ControllerMain.php:186 -#: ../system/Controller/ControllerMain.php:215 +#: ../system/Controller/ControllerMain.php:71 +#: ../system/Controller/ControllerMain.php:94 +#: ../system/Controller/ControllerMain.php:114 +#: ../system/Controller/ControllerMain.php:146 +#: ../system/Controller/ControllerMain.php:162 +#: ../system/Controller/ControllerMain.php:181 +#: ../system/Controller/ControllerMain.php:210 msgid "Home" msgstr "Start" #: ../system/Controller/ControllerMain.php:42 -#: ../system/Controller/ControllerMain.php:78 -#: ../system/Controller/ControllerMain.php:100 -#: ../system/Controller/ControllerMain.php:120 -#: ../system/Controller/ControllerMain.php:216 +#: ../system/Controller/ControllerMain.php:73 +#: ../system/Controller/ControllerMain.php:95 +#: ../system/Controller/ControllerMain.php:115 +#: ../system/Controller/ControllerMain.php:211 #: ../system/Widget/widgets/ContactCard/ContactCard.php:175 msgid "Profile" msgstr "Profil" #: ../system/Controller/ControllerMain.php:43 -#: ../system/Controller/ControllerMain.php:79 -#: ../system/Controller/ControllerMain.php:101 -#: ../system/Controller/ControllerMain.php:121 -#: ../system/Controller/ControllerMain.php:217 +#: ../system/Controller/ControllerMain.php:74 +#: ../system/Controller/ControllerMain.php:96 +#: ../system/Controller/ControllerMain.php:116 +#: ../system/Controller/ControllerMain.php:212 msgid "Configuration" msgstr "Einstellungen" #: ../system/Controller/ControllerMain.php:44 -#: ../system/Controller/ControllerMain.php:80 -#: ../system/Controller/ControllerMain.php:102 -#: ../system/Controller/ControllerMain.php:122 -#: ../system/Controller/ControllerMain.php:218 +#: ../system/Controller/ControllerMain.php:75 +#: ../system/Controller/ControllerMain.php:97 +#: ../system/Controller/ControllerMain.php:117 +#: ../system/Controller/ControllerMain.php:213 msgid "Help" msgstr "" -#: ../system/Controller/ControllerMain.php:98 +#: ../system/Controller/ControllerMain.php:93 #, php-format msgid "%s - Configuration" msgstr "%s – Einstellungen" -#: ../system/Controller/ControllerMain.php:118 +#: ../system/Controller/ControllerMain.php:113 #, php-format msgid "%s - Profile" msgstr "%s - Profil" -#: ../system/Controller/ControllerMain.php:150 +#: ../system/Controller/ControllerMain.php:145 #, php-format msgid "%s - Account Creation" msgstr "%s – Registrieren" -#: ../system/Controller/ControllerMain.php:152 -#: ../system/Controller/ControllerMain.php:168 +#: ../system/Controller/ControllerMain.php:147 +#: ../system/Controller/ControllerMain.php:163 msgid "Account Creation" msgstr "Registrieren" -#: ../system/Controller/ControllerMain.php:166 +#: ../system/Controller/ControllerMain.php:161 #, php-format msgid "%s - Add An Account" msgstr "" -#: ../system/Controller/ControllerMain.php:184 +#: ../system/Controller/ControllerMain.php:179 #, php-format msgid "%s - Login to Movim" msgstr "%s – Anmelden" -#: ../system/Controller/ControllerMain.php:205 +#: ../system/Controller/ControllerMain.php:200 #, php-format msgid "%s - Help Page" msgstr "" #: ../system/Widget/widgets/Account/Account.php:170 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:100 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:101 msgid "Some data are missing !" msgstr "Es fehlen Daten" #: ../system/Widget/widgets/Account/Account.php:176 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:106 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:107 msgid "Wrong ID" msgstr "Falsche ID" #: ../system/Widget/widgets/Account/Account.php:182 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:112 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:113 msgid "You entered different passwords" msgstr "Die Passwörter stimmen nicht überein" #: ../system/Widget/widgets/Account/Account.php:188 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:118 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:119 msgid "Invalid name" msgstr "Unzulässiger Name" #: ../system/Widget/widgets/Account/Account.php:194 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:124 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:125 msgid "Username already taken" msgstr "Benutzername bereits vergeben" @@ -485,7 +501,7 @@ msgid "Only alphanumerics elements are authorized" msgstr "Es sind nur Buchstaben und Zahlen zugelassen." #: ../system/Widget/widgets/Account/Account.php:236 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:150 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:151 #: ../system/Widget/widgets/Login/Login.php:103 msgid "My address" msgstr "Adresse" @@ -509,7 +525,7 @@ msgid "Example :" msgstr "Beispiel:" #: ../system/Widget/widgets/Account/Account.php:249 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:159 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:160 #: ../system/Widget/widgets/Login/Login.php:105 msgid "Password" msgstr "Passwort" @@ -519,7 +535,7 @@ msgid "Same here !" msgstr "Das gleiche hier." #: ../system/Widget/widgets/Account/Account.php:261 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:169 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:170 msgid "Retype" msgstr "Nochmal" @@ -528,38 +544,18 @@ msgid "Pseudo" msgstr "Pseudo" #: ../system/Widget/widgets/Account/Account.php:280 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:177 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:178 msgid "Create" msgstr "Anlegen" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:130 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:131 msgid "XMPP Domain error, your account is not a correct Jabber ID" msgstr "" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:143 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:144 msgid "Add your login informations" msgstr "" -#: ../system/Widget/widgets/Chat/Chat.php:40 -#: ../system/Widget/widgets/Logout/Logout.php:82 -msgid "Online" -msgstr "Verbunden" - -#: ../system/Widget/widgets/Chat/Chat.php:41 -#: ../system/Widget/widgets/Logout/Logout.php:83 -msgid "Away" -msgstr "Abwesend" - -#: ../system/Widget/widgets/Chat/Chat.php:42 -#: ../system/Widget/widgets/Logout/Logout.php:84 -msgid "Do Not Disturb" -msgstr "Bitte nicht stören" - -#: ../system/Widget/widgets/Chat/Chat.php:43 -#: ../system/Widget/widgets/Logout/Logout.php:85 -msgid "Extended Away" -msgstr "Länger abwesend" - #: ../system/Widget/widgets/Chat/Chat.php:44 msgid "Offline" msgstr "Nicht verbunden" @@ -573,8 +569,8 @@ msgid "Language" msgstr "Sprache" #: ../system/Widget/widgets/Config/Config.php:59 -#: ../system/Widget/widgets/Feed/Feed.php:144 -#: ../system/Widget/widgets/Feed/Feed.php:155 +#: ../system/Widget/widgets/Feed/Feed.php:138 +#: ../system/Widget/widgets/Feed/Feed.php:142 #: ../system/Widget/widgets/Vcard/Vcard.php:179 msgid "Submit" msgstr "Übernehmen" @@ -585,23 +581,27 @@ msgid "Reset" msgstr "Zurücksetzen" #: ../system/Widget/widgets/ContactCard/ContactCard.php:61 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:164 msgid "Remove this contact" msgstr "Kontakt löschen" #: ../system/Widget/widgets/ContactCard/ContactCard.php:75 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:192 msgid "No" msgstr "Nein" #: ../system/Widget/widgets/ContactCard/ContactCard.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:178 msgid "Yes" msgstr "Ja" #: ../system/Widget/widgets/ContactCard/ContactCard.php:100 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:145 msgid "Chat" msgstr "Chat" #: ../system/Widget/widgets/ContactCard/ContactCard.php:110 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:63 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:71 #: ../system/Widget/widgets/Vcard/Vcard.php:75 msgid "General Informations" msgstr "Allgemeine Angaben" @@ -646,27 +646,28 @@ msgid "Avatar" msgstr "Benutzerbild" #: ../system/Widget/widgets/ContactCard/ContactCard.php:129 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:96 #: ../system/Widget/widgets/Vcard/Vcard.php:160 msgid "About Me" msgstr "Persönliche Angaben" #: ../system/Widget/widgets/ContactCard/ContactCard.php:138 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:111 msgid "Bot" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:139 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:89 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:112 msgid "Desktop" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:140 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:90 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:113 msgid "Phone" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:149 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:106 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:129 msgid "Client Informations" msgstr "" @@ -678,6 +679,14 @@ msgstr "" msgid "Client Type" msgstr "" +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:132 +msgid "Actions" +msgstr "" + +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:202 +msgid "Invite this user" +msgstr "" + #: ../system/Widget/widgets/Feed/Feed.php:43 msgid "Loading your feed ..." msgstr "Lade ihr Feed ..." @@ -701,23 +710,16 @@ msgid "" "feeds" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:134 -#: ../system/Widget/widgets/Feed/Feed.php:137 -#: ../system/Widget/widgets/Feed/Feed.php:148 -#: ../system/Widget/widgets/Feed/Feed.php:151 -msgid "What's new ?" -msgstr "Was ist neu ?" - -#: ../system/Widget/widgets/Feed/Feed.php:166 +#: ../system/Widget/widgets/Feed/Feed.php:154 msgid "All" msgstr "Alle" -#: ../system/Widget/widgets/Feed/Feed.php:167 +#: ../system/Widget/widgets/Feed/Feed.php:155 msgid "My Posts" msgstr "Meine Beiträge" #: ../system/Widget/widgets/Help/Help.php:32 -msgid "What is Movim ?" +msgid "What is Movim?" msgstr "" #: ../system/Widget/widgets/Help/Help.php:34 @@ -823,20 +825,24 @@ msgid "Account successfully created" msgstr "Das Konto wurde erfolgreich angelegt." #: ../system/Widget/widgets/Login/Login.php:83 -msgid "Movim fail to authenticate. You entered wrong data" +msgid "Movim failed to authenticate. You entered wrong data" msgstr "" #: ../system/Widget/widgets/Login/Login.php:91 msgid "Your web browser is too old to use with Movim." msgstr "Dein Webbrowser ist zu alt für Movim." +#: ../system/Widget/widgets/Login/Login.php:108 +msgid "Connecting..." +msgstr "Verbindung wird aufgebaut ..." + #: ../system/Widget/widgets/Login/Login.php:110 msgid "Come in!" msgstr "Komm‘ herein!" #: ../system/Widget/widgets/Login/Login.php:117 -#, php-format -msgid "This server host %s accounts" +#, fuzzy, php-format +msgid "This server hosts %s accounts" msgstr "Auf diesem Server befinden sich %s Benutzerkonten" #: ../system/Widget/widgets/Login/Login.php:122 @@ -847,10 +853,6 @@ msgstr "" msgid "Debug console" msgstr "Debug Konsole" -#: ../system/Widget/widgets/Logout/Logout.php:86 -msgid "Logout" -msgstr "Abmelden" - #: ../system/Widget/widgets/Notifs/Notifs.php:44 msgid "wants to talk with you" msgstr "will mit dir sprechen" @@ -860,36 +862,36 @@ msgid "Accept" msgstr "Fertig" #: ../system/Widget/widgets/Notifs/Notifs.php:62 -#: ../system/Widget/widgets/Notifs/Notifs.php:156 -msgid "Validate" -msgstr "Überprüfe" +#: ../system/Widget/widgets/Notifs/Notifs.php:125 +msgid "Add" +msgstr "" #: ../system/Widget/widgets/Notifs/Notifs.php:68 msgid "Decline" msgstr "Ablehnen" -#: ../system/Widget/widgets/Notifs/Notifs.php:120 +#: ../system/Widget/widgets/Notifs/Notifs.php:119 #, php-format msgid "Contacts (%s)" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:126 -msgid "Add" -msgstr "" - -#: ../system/Widget/widgets/Notifs/Notifs.php:147 +#: ../system/Widget/widgets/Notifs/Notifs.php:146 msgid "Alias" msgstr "Alias" -#: ../system/Widget/widgets/Notifs/Notifs.php:163 +#: ../system/Widget/widgets/Notifs/Notifs.php:155 +msgid "Send request" +msgstr "" + +#: ../system/Widget/widgets/Notifs/Notifs.php:162 msgid "Cancel" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:88 +#: ../system/Widget/widgets/Profile/Profile.php:74 msgid "No profile yet ?" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:89 +#: ../system/Widget/widgets/Profile/Profile.php:75 #: ../system/Widget/widgets/Vcard/Vcard.php:62 msgid "Create my vCard" msgstr "" @@ -932,6 +934,12 @@ msgstr "Folgen" msgid "Loading the contact feed ..." msgstr "Lade die Meldungen..." +#~ msgid "What's new ?" +#~ msgstr "Was ist neu ?" + +#~ msgid "Validate" +#~ msgstr "Überprüfe" + #~ msgid "MOVIM - Test Client" #~ msgstr "MOVIM – Test-Instanz" diff --git a/i18n/el.po b/i18n/el.po index b688dadec..80b6fb22d 100644 --- a/i18n/el.po +++ b/i18n/el.po @@ -5,10 +5,11 @@ msgid "" msgstr "" "Project-Id-Version: Movim\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-27 21:41+0200\n" +"POT-Creation-Date: 2012-07-18 21:48+0200\n" "PO-Revision-Date: 2012-03-29 10:16+0000\n" "Last-Translator: Rotaru Dorin \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -59,12 +60,12 @@ msgstr "" #: ../install/index.php:169 #, php-format -msgid "Bosh connection failed with error `%s'" +msgid "Bosh connection failed with error '%s'" msgstr "" #: ../install/index.php:178 #, php-format -msgid "XMPP connection through Bosh failed with error `%s'" +msgid "XMPP connection through Bosh failed with error '%s'" msgstr "" #: ../install/index.php:224 ../install/index.php:228 ../install/index.php:232 @@ -79,7 +80,7 @@ msgstr "Αδύνατη η δημιουργία του αρχείου ρύθμι #: ../install/index.php:283 #, php-format -msgid "Database connection failed with error `%s'" +msgid "Database connection failed with error '%s'" msgstr "" #: ../install/part1.php:29 @@ -87,8 +88,7 @@ msgid "Thank you for downloading Movim!" msgstr "" #: ../install/part1.php:30 -msgid "" -"Before you enjoy your social network, a few adjustements are required." +msgid "Before you enjoy your social network, a few adjustements are required." msgstr "" #: ../install/part1.php:31 @@ -179,8 +179,8 @@ msgid "Please remove the %s folder in order to complete the installation" msgstr "" #: ../system/Conf.php:38 -#, php-format -msgid "Cannot load element value'%s'" +#, fuzzy, php-format +msgid "Cannot load element value '%s'" msgstr "Αδύνατη η φόρτωση του element value'%s'" #: ../system/Conf.php:49 @@ -201,10 +201,6 @@ msgstr "Δεν παρέχονται JID (Jabber Identif. Codes)" msgid "jid '%s' is incorrect" msgstr "Ο jid '%s' είναι λανθασμένος" -#: ../system/Jabber.php:147 ../system/Widget/widgets/Login/Login.php:108 -msgid "Connecting..." -msgstr "" - #: ../system/Logger.php:27 #, php-format msgid "Cannot open log file '%s'" @@ -352,104 +348,124 @@ msgstr "" msgid "Civil Union" msgstr "" +#: ../system/Utils.php:219 ../system/Widget/widgets/Chat/Chat.php:40 +msgid "Online" +msgstr "" + +#: ../system/Utils.php:220 ../system/Widget/widgets/Chat/Chat.php:41 +msgid "Away" +msgstr "Μακριά" + +#: ../system/Utils.php:221 ../system/Widget/widgets/Chat/Chat.php:42 +msgid "Do Not Disturb" +msgstr "" + +#: ../system/Utils.php:222 ../system/Widget/widgets/Chat/Chat.php:43 +msgid "Extended Away" +msgstr "" + +#: ../system/Utils.php:223 +msgid "Logout" +msgstr "Αποσύνδεση" + #: ../system/Controller/ControllerMain.php:40 #, php-format msgid "%s - Welcome to Movim" msgstr "%s - Καλωσήλθατε στο Movim" #: ../system/Controller/ControllerMain.php:41 -#: ../system/Controller/ControllerMain.php:75 -#: ../system/Controller/ControllerMain.php:99 -#: ../system/Controller/ControllerMain.php:119 -#: ../system/Controller/ControllerMain.php:151 -#: ../system/Controller/ControllerMain.php:167 -#: ../system/Controller/ControllerMain.php:186 -#: ../system/Controller/ControllerMain.php:215 +#: ../system/Controller/ControllerMain.php:71 +#: ../system/Controller/ControllerMain.php:94 +#: ../system/Controller/ControllerMain.php:114 +#: ../system/Controller/ControllerMain.php:146 +#: ../system/Controller/ControllerMain.php:162 +#: ../system/Controller/ControllerMain.php:181 +#: ../system/Controller/ControllerMain.php:210 msgid "Home" msgstr "Αρχική Σελίδα" #: ../system/Controller/ControllerMain.php:42 -#: ../system/Controller/ControllerMain.php:78 -#: ../system/Controller/ControllerMain.php:100 -#: ../system/Controller/ControllerMain.php:120 -#: ../system/Controller/ControllerMain.php:216 +#: ../system/Controller/ControllerMain.php:73 +#: ../system/Controller/ControllerMain.php:95 +#: ../system/Controller/ControllerMain.php:115 +#: ../system/Controller/ControllerMain.php:211 #: ../system/Widget/widgets/ContactCard/ContactCard.php:175 msgid "Profile" msgstr "Προφίλ" #: ../system/Controller/ControllerMain.php:43 -#: ../system/Controller/ControllerMain.php:79 -#: ../system/Controller/ControllerMain.php:101 -#: ../system/Controller/ControllerMain.php:121 -#: ../system/Controller/ControllerMain.php:217 +#: ../system/Controller/ControllerMain.php:74 +#: ../system/Controller/ControllerMain.php:96 +#: ../system/Controller/ControllerMain.php:116 +#: ../system/Controller/ControllerMain.php:212 msgid "Configuration" msgstr "Ρύθμιση" #: ../system/Controller/ControllerMain.php:44 -#: ../system/Controller/ControllerMain.php:80 -#: ../system/Controller/ControllerMain.php:102 -#: ../system/Controller/ControllerMain.php:122 -#: ../system/Controller/ControllerMain.php:218 +#: ../system/Controller/ControllerMain.php:75 +#: ../system/Controller/ControllerMain.php:97 +#: ../system/Controller/ControllerMain.php:117 +#: ../system/Controller/ControllerMain.php:213 msgid "Help" msgstr "" -#: ../system/Controller/ControllerMain.php:98 +#: ../system/Controller/ControllerMain.php:93 #, php-format msgid "%s - Configuration" msgstr "%s - Ρύθμιση" -#: ../system/Controller/ControllerMain.php:118 +#: ../system/Controller/ControllerMain.php:113 #, php-format msgid "%s - Profile" msgstr "" -#: ../system/Controller/ControllerMain.php:150 +#: ../system/Controller/ControllerMain.php:145 #, php-format msgid "%s - Account Creation" msgstr "%s - Δημιουργία Λογαριασμού" -#: ../system/Controller/ControllerMain.php:152 -#: ../system/Controller/ControllerMain.php:168 +#: ../system/Controller/ControllerMain.php:147 +#: ../system/Controller/ControllerMain.php:163 msgid "Account Creation" msgstr "Δημιουργία Λογαριασμού" -#: ../system/Controller/ControllerMain.php:166 +#: ../system/Controller/ControllerMain.php:161 #, php-format msgid "%s - Add An Account" msgstr "" -#: ../system/Controller/ControllerMain.php:184 +#: ../system/Controller/ControllerMain.php:179 #, php-format msgid "%s - Login to Movim" msgstr "%s - Είσοδος στο Movim" -#: ../system/Controller/ControllerMain.php:205 +#: ../system/Controller/ControllerMain.php:200 #, php-format msgid "%s - Help Page" msgstr "" #: ../system/Widget/widgets/Account/Account.php:170 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:100 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:101 msgid "Some data are missing !" msgstr "Μερικά δεδομένα λείπουν" #: ../system/Widget/widgets/Account/Account.php:176 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:106 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:107 msgid "Wrong ID" msgstr "Λάθος ID" #: ../system/Widget/widgets/Account/Account.php:182 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:112 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:113 msgid "You entered different passwords" msgstr "Εισάγατε διαφορετικούς κωδικούς" #: ../system/Widget/widgets/Account/Account.php:188 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:118 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:119 msgid "Invalid name" msgstr "" #: ../system/Widget/widgets/Account/Account.php:194 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:124 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:125 msgid "Username already taken" msgstr "Αυτό το όνομα χρήστη χρησιμοποιείται ήδη" @@ -481,7 +497,7 @@ msgid "Only alphanumerics elements are authorized" msgstr "Επιτρέπονται μόνο αλφαριθμιτικά στοιχεία" #: ../system/Widget/widgets/Account/Account.php:236 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:150 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:151 #: ../system/Widget/widgets/Login/Login.php:103 msgid "My address" msgstr "Η διεύθυνσή μου" @@ -503,7 +519,7 @@ msgid "Example :" msgstr "Παράδειγμα" #: ../system/Widget/widgets/Account/Account.php:249 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:159 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:160 #: ../system/Widget/widgets/Login/Login.php:105 msgid "Password" msgstr "Κωδικός πρόσβασης" @@ -513,7 +529,7 @@ msgid "Same here !" msgstr "Το ίδιο και εδώ" #: ../system/Widget/widgets/Account/Account.php:261 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:169 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:170 msgid "Retype" msgstr "Επαναπληκτρολόγηση" @@ -522,38 +538,18 @@ msgid "Pseudo" msgstr "" #: ../system/Widget/widgets/Account/Account.php:280 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:177 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:178 msgid "Create" msgstr "Δημιούργησε" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:130 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:131 msgid "XMPP Domain error, your account is not a correct Jabber ID" msgstr "" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:143 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:144 msgid "Add your login informations" msgstr "" -#: ../system/Widget/widgets/Chat/Chat.php:40 -#: ../system/Widget/widgets/Logout/Logout.php:82 -msgid "Online" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:41 -#: ../system/Widget/widgets/Logout/Logout.php:83 -msgid "Away" -msgstr "Μακριά" - -#: ../system/Widget/widgets/Chat/Chat.php:42 -#: ../system/Widget/widgets/Logout/Logout.php:84 -msgid "Do Not Disturb" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:43 -#: ../system/Widget/widgets/Logout/Logout.php:85 -msgid "Extended Away" -msgstr "" - #: ../system/Widget/widgets/Chat/Chat.php:44 msgid "Offline" msgstr "" @@ -567,8 +563,8 @@ msgid "Language" msgstr "Γλώσσα" #: ../system/Widget/widgets/Config/Config.php:59 -#: ../system/Widget/widgets/Feed/Feed.php:144 -#: ../system/Widget/widgets/Feed/Feed.php:155 +#: ../system/Widget/widgets/Feed/Feed.php:138 +#: ../system/Widget/widgets/Feed/Feed.php:142 #: ../system/Widget/widgets/Vcard/Vcard.php:179 msgid "Submit" msgstr "Υποβολή" @@ -579,23 +575,27 @@ msgid "Reset" msgstr "Επαναφορά" #: ../system/Widget/widgets/ContactCard/ContactCard.php:61 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:164 msgid "Remove this contact" msgstr "Διαγραφή αυτής της επαφής" #: ../system/Widget/widgets/ContactCard/ContactCard.php:75 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:192 msgid "No" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:178 msgid "Yes" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:100 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:145 msgid "Chat" msgstr "Συνομιλία" #: ../system/Widget/widgets/ContactCard/ContactCard.php:110 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:63 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:71 #: ../system/Widget/widgets/Vcard/Vcard.php:75 msgid "General Informations" msgstr "Γενικές πληροφορίες" @@ -640,27 +640,28 @@ msgid "Avatar" msgstr "Avatar" #: ../system/Widget/widgets/ContactCard/ContactCard.php:129 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:96 #: ../system/Widget/widgets/Vcard/Vcard.php:160 msgid "About Me" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:138 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:111 msgid "Bot" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:139 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:89 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:112 msgid "Desktop" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:140 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:90 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:113 msgid "Phone" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:149 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:106 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:129 msgid "Client Informations" msgstr "" @@ -672,6 +673,14 @@ msgstr "" msgid "Client Type" msgstr "" +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:132 +msgid "Actions" +msgstr "" + +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:202 +msgid "Invite this user" +msgstr "" + #: ../system/Widget/widgets/Feed/Feed.php:43 msgid "Loading your feed ..." msgstr "" @@ -695,23 +704,16 @@ msgid "" "feeds" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:134 -#: ../system/Widget/widgets/Feed/Feed.php:137 -#: ../system/Widget/widgets/Feed/Feed.php:148 -#: ../system/Widget/widgets/Feed/Feed.php:151 -msgid "What's new ?" -msgstr "Νέα" - -#: ../system/Widget/widgets/Feed/Feed.php:166 +#: ../system/Widget/widgets/Feed/Feed.php:154 msgid "All" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:167 +#: ../system/Widget/widgets/Feed/Feed.php:155 msgid "My Posts" msgstr "" #: ../system/Widget/widgets/Help/Help.php:32 -msgid "What is Movim ?" +msgid "What is Movim?" msgstr "" #: ../system/Widget/widgets/Help/Help.php:34 @@ -817,20 +819,24 @@ msgid "Account successfully created" msgstr "Ο λογαριασμός δημιουργήθηκε επιτυχώς" #: ../system/Widget/widgets/Login/Login.php:83 -msgid "Movim fail to authenticate. You entered wrong data" +msgid "Movim failed to authenticate. You entered wrong data" msgstr "" #: ../system/Widget/widgets/Login/Login.php:91 msgid "Your web browser is too old to use with Movim." msgstr "Ο περιηγητης σας είναι αρκετά παλιός για να χρησιμοποιηθεί με Movim" +#: ../system/Widget/widgets/Login/Login.php:108 +msgid "Connecting..." +msgstr "" + #: ../system/Widget/widgets/Login/Login.php:110 msgid "Come in!" msgstr "Έλα μέσα!" #: ../system/Widget/widgets/Login/Login.php:117 #, php-format -msgid "This server host %s accounts" +msgid "This server hosts %s accounts" msgstr "" #: ../system/Widget/widgets/Login/Login.php:122 @@ -841,10 +847,6 @@ msgstr "" msgid "Debug console" msgstr "Κονσόλα αποσφαλμάτωσης" -#: ../system/Widget/widgets/Logout/Logout.php:86 -msgid "Logout" -msgstr "Αποσύνδεση" - #: ../system/Widget/widgets/Notifs/Notifs.php:44 msgid "wants to talk with you" msgstr "θέλει να μιλήσει μαζί σου" @@ -854,36 +856,36 @@ msgid "Accept" msgstr "Αποδοχή" #: ../system/Widget/widgets/Notifs/Notifs.php:62 -#: ../system/Widget/widgets/Notifs/Notifs.php:156 -msgid "Validate" -msgstr "Επικύρωση" +#: ../system/Widget/widgets/Notifs/Notifs.php:125 +msgid "Add" +msgstr "" #: ../system/Widget/widgets/Notifs/Notifs.php:68 msgid "Decline" msgstr "Απόρριψη" -#: ../system/Widget/widgets/Notifs/Notifs.php:120 +#: ../system/Widget/widgets/Notifs/Notifs.php:119 #, php-format msgid "Contacts (%s)" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:126 -msgid "Add" -msgstr "" - -#: ../system/Widget/widgets/Notifs/Notifs.php:147 +#: ../system/Widget/widgets/Notifs/Notifs.php:146 msgid "Alias" msgstr "Ψευδώνυμο" -#: ../system/Widget/widgets/Notifs/Notifs.php:163 +#: ../system/Widget/widgets/Notifs/Notifs.php:155 +msgid "Send request" +msgstr "" + +#: ../system/Widget/widgets/Notifs/Notifs.php:162 msgid "Cancel" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:88 +#: ../system/Widget/widgets/Profile/Profile.php:74 msgid "No profile yet ?" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:89 +#: ../system/Widget/widgets/Profile/Profile.php:75 #: ../system/Widget/widgets/Vcard/Vcard.php:62 msgid "Create my vCard" msgstr "" @@ -926,6 +928,12 @@ msgstr "" msgid "Loading the contact feed ..." msgstr "Φορτώνεται το contact feed ..." +#~ msgid "What's new ?" +#~ msgstr "Νέα" + +#~ msgid "Validate" +#~ msgstr "Επικύρωση" + #~ msgid "MOVIM - Test Client" #~ msgstr "MOVIM - Test Client" diff --git a/i18n/eo.po b/i18n/eo.po index fc2ead73a..f7de63dea 100644 --- a/i18n/eo.po +++ b/i18n/eo.po @@ -5,10 +5,11 @@ msgid "" msgstr "" "Project-Id-Version: Movim\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-27 21:41+0200\n" +"POT-Creation-Date: 2012-07-18 21:48+0200\n" "PO-Revision-Date: 2012-05-19 08:53+0000\n" "Last-Translator: Eliovir \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -25,8 +26,7 @@ msgstr "Actuala versio: " #: ../install/index.php:86 msgid "Update your PHP version or contact your server administrator" -msgstr "" -"Ĝisdatigu vian PHP-an version aŭ kontaktu vian servilan administranton" +msgstr "Ĝisdatigu vian PHP-an version aŭ kontaktu vian servilan administranton" #: ../install/index.php:89 ../install/index.php:93 ../install/index.php:97 #: ../install/index.php:115 @@ -58,12 +58,12 @@ msgstr "aŭ" #: ../install/index.php:169 #, php-format -msgid "Bosh connection failed with error `%s'" +msgid "Bosh connection failed with error '%s'" msgstr "" #: ../install/index.php:178 #, php-format -msgid "XMPP connection through Bosh failed with error `%s'" +msgid "XMPP connection through Bosh failed with error '%s'" msgstr "" #: ../install/index.php:224 ../install/index.php:228 ../install/index.php:232 @@ -78,7 +78,7 @@ msgstr "Ne povas krei agorddosieron “%s”." #: ../install/index.php:283 #, php-format -msgid "Database connection failed with error `%s'" +msgid "Database connection failed with error '%s'" msgstr "" #: ../install/part1.php:29 @@ -86,8 +86,7 @@ msgid "Thank you for downloading Movim!" msgstr "" #: ../install/part1.php:30 -msgid "" -"Before you enjoy your social network, a few adjustements are required." +msgid "Before you enjoy your social network, a few adjustements are required." msgstr "" #: ../install/part1.php:31 @@ -178,8 +177,8 @@ msgid "Please remove the %s folder in order to complete the installation" msgstr "" #: ../system/Conf.php:38 -#, php-format -msgid "Cannot load element value'%s'" +#, fuzzy, php-format +msgid "Cannot load element value '%s'" msgstr "Ne povas ŝargi valuon “%s” de la elemento." #: ../system/Conf.php:49 @@ -200,10 +199,6 @@ msgstr "JID maldisponebla" msgid "jid '%s' is incorrect" msgstr "JID “%s” malkorekta" -#: ../system/Jabber.php:147 ../system/Widget/widgets/Login/Login.php:108 -msgid "Connecting..." -msgstr "Konektante..." - #: ../system/Logger.php:27 #, php-format msgid "Cannot open log file '%s'" @@ -351,104 +346,124 @@ msgstr "" msgid "Civil Union" msgstr "" +#: ../system/Utils.php:219 ../system/Widget/widgets/Chat/Chat.php:40 +msgid "Online" +msgstr "" + +#: ../system/Utils.php:220 ../system/Widget/widgets/Chat/Chat.php:41 +msgid "Away" +msgstr "For" + +#: ../system/Utils.php:221 ../system/Widget/widgets/Chat/Chat.php:42 +msgid "Do Not Disturb" +msgstr "" + +#: ../system/Utils.php:222 ../system/Widget/widgets/Chat/Chat.php:43 +msgid "Extended Away" +msgstr "" + +#: ../system/Utils.php:223 +msgid "Logout" +msgstr "Elsaluti" + #: ../system/Controller/ControllerMain.php:40 #, php-format msgid "%s - Welcome to Movim" msgstr "%s - Bonvenon al Movim" #: ../system/Controller/ControllerMain.php:41 -#: ../system/Controller/ControllerMain.php:75 -#: ../system/Controller/ControllerMain.php:99 -#: ../system/Controller/ControllerMain.php:119 -#: ../system/Controller/ControllerMain.php:151 -#: ../system/Controller/ControllerMain.php:167 -#: ../system/Controller/ControllerMain.php:186 -#: ../system/Controller/ControllerMain.php:215 +#: ../system/Controller/ControllerMain.php:71 +#: ../system/Controller/ControllerMain.php:94 +#: ../system/Controller/ControllerMain.php:114 +#: ../system/Controller/ControllerMain.php:146 +#: ../system/Controller/ControllerMain.php:162 +#: ../system/Controller/ControllerMain.php:181 +#: ../system/Controller/ControllerMain.php:210 msgid "Home" msgstr "Ĉefpaĝo" #: ../system/Controller/ControllerMain.php:42 -#: ../system/Controller/ControllerMain.php:78 -#: ../system/Controller/ControllerMain.php:100 -#: ../system/Controller/ControllerMain.php:120 -#: ../system/Controller/ControllerMain.php:216 +#: ../system/Controller/ControllerMain.php:73 +#: ../system/Controller/ControllerMain.php:95 +#: ../system/Controller/ControllerMain.php:115 +#: ../system/Controller/ControllerMain.php:211 #: ../system/Widget/widgets/ContactCard/ContactCard.php:175 msgid "Profile" msgstr "Profilo" #: ../system/Controller/ControllerMain.php:43 -#: ../system/Controller/ControllerMain.php:79 -#: ../system/Controller/ControllerMain.php:101 -#: ../system/Controller/ControllerMain.php:121 -#: ../system/Controller/ControllerMain.php:217 +#: ../system/Controller/ControllerMain.php:74 +#: ../system/Controller/ControllerMain.php:96 +#: ../system/Controller/ControllerMain.php:116 +#: ../system/Controller/ControllerMain.php:212 msgid "Configuration" msgstr "Agordaĵoj" #: ../system/Controller/ControllerMain.php:44 -#: ../system/Controller/ControllerMain.php:80 -#: ../system/Controller/ControllerMain.php:102 -#: ../system/Controller/ControllerMain.php:122 -#: ../system/Controller/ControllerMain.php:218 +#: ../system/Controller/ControllerMain.php:75 +#: ../system/Controller/ControllerMain.php:97 +#: ../system/Controller/ControllerMain.php:117 +#: ../system/Controller/ControllerMain.php:213 msgid "Help" msgstr "" -#: ../system/Controller/ControllerMain.php:98 +#: ../system/Controller/ControllerMain.php:93 #, php-format msgid "%s - Configuration" msgstr "%s - Agordaĵoj" -#: ../system/Controller/ControllerMain.php:118 +#: ../system/Controller/ControllerMain.php:113 #, php-format msgid "%s - Profile" msgstr "" -#: ../system/Controller/ControllerMain.php:150 +#: ../system/Controller/ControllerMain.php:145 #, php-format msgid "%s - Account Creation" msgstr "%s - Kreado de konto" -#: ../system/Controller/ControllerMain.php:152 -#: ../system/Controller/ControllerMain.php:168 +#: ../system/Controller/ControllerMain.php:147 +#: ../system/Controller/ControllerMain.php:163 msgid "Account Creation" msgstr "Kreado de konto" -#: ../system/Controller/ControllerMain.php:166 +#: ../system/Controller/ControllerMain.php:161 #, php-format msgid "%s - Add An Account" msgstr "" -#: ../system/Controller/ControllerMain.php:184 +#: ../system/Controller/ControllerMain.php:179 #, php-format msgid "%s - Login to Movim" msgstr "%s - Ensaluti al Movim" -#: ../system/Controller/ControllerMain.php:205 +#: ../system/Controller/ControllerMain.php:200 #, php-format msgid "%s - Help Page" msgstr "" #: ../system/Widget/widgets/Account/Account.php:170 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:100 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:101 msgid "Some data are missing !" msgstr "" #: ../system/Widget/widgets/Account/Account.php:176 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:106 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:107 msgid "Wrong ID" msgstr "" #: ../system/Widget/widgets/Account/Account.php:182 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:112 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:113 msgid "You entered different passwords" msgstr "Vi tajpis malsamajn pasvortojn" #: ../system/Widget/widgets/Account/Account.php:188 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:118 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:119 msgid "Invalid name" msgstr "Nevalida uzantnomo" #: ../system/Widget/widgets/Account/Account.php:194 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:124 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:125 msgid "Username already taken" msgstr "Uzantnomo jam uzata" @@ -480,7 +495,7 @@ msgid "Only alphanumerics elements are authorized" msgstr "" #: ../system/Widget/widgets/Account/Account.php:236 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:150 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:151 #: ../system/Widget/widgets/Login/Login.php:103 msgid "My address" msgstr "Mia adreso" @@ -502,7 +517,7 @@ msgid "Example :" msgstr "" #: ../system/Widget/widgets/Account/Account.php:249 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:159 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:160 #: ../system/Widget/widgets/Login/Login.php:105 msgid "Password" msgstr "Pasvorto" @@ -512,7 +527,7 @@ msgid "Same here !" msgstr "" #: ../system/Widget/widgets/Account/Account.php:261 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:169 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:170 msgid "Retype" msgstr "" @@ -521,38 +536,18 @@ msgid "Pseudo" msgstr "" #: ../system/Widget/widgets/Account/Account.php:280 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:177 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:178 msgid "Create" msgstr "" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:130 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:131 msgid "XMPP Domain error, your account is not a correct Jabber ID" msgstr "" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:143 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:144 msgid "Add your login informations" msgstr "" -#: ../system/Widget/widgets/Chat/Chat.php:40 -#: ../system/Widget/widgets/Logout/Logout.php:82 -msgid "Online" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:41 -#: ../system/Widget/widgets/Logout/Logout.php:83 -msgid "Away" -msgstr "For" - -#: ../system/Widget/widgets/Chat/Chat.php:42 -#: ../system/Widget/widgets/Logout/Logout.php:84 -msgid "Do Not Disturb" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:43 -#: ../system/Widget/widgets/Logout/Logout.php:85 -msgid "Extended Away" -msgstr "" - #: ../system/Widget/widgets/Chat/Chat.php:44 msgid "Offline" msgstr "" @@ -566,8 +561,8 @@ msgid "Language" msgstr "Lingvo" #: ../system/Widget/widgets/Config/Config.php:59 -#: ../system/Widget/widgets/Feed/Feed.php:144 -#: ../system/Widget/widgets/Feed/Feed.php:155 +#: ../system/Widget/widgets/Feed/Feed.php:138 +#: ../system/Widget/widgets/Feed/Feed.php:142 #: ../system/Widget/widgets/Vcard/Vcard.php:179 msgid "Submit" msgstr "Sendi" @@ -578,23 +573,27 @@ msgid "Reset" msgstr "Nuligi" #: ../system/Widget/widgets/ContactCard/ContactCard.php:61 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:164 msgid "Remove this contact" msgstr "Forigi tiun kontakton" #: ../system/Widget/widgets/ContactCard/ContactCard.php:75 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:192 msgid "No" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:178 msgid "Yes" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:100 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:145 msgid "Chat" msgstr "Tujmesaĝilo" #: ../system/Widget/widgets/ContactCard/ContactCard.php:110 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:63 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:71 #: ../system/Widget/widgets/Vcard/Vcard.php:75 msgid "General Informations" msgstr "Generalaj informoj" @@ -639,27 +638,28 @@ msgid "Avatar" msgstr "Avataro" #: ../system/Widget/widgets/ContactCard/ContactCard.php:129 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:96 #: ../system/Widget/widgets/Vcard/Vcard.php:160 msgid "About Me" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:138 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:111 msgid "Bot" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:139 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:89 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:112 msgid "Desktop" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:140 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:90 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:113 msgid "Phone" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:149 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:106 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:129 msgid "Client Informations" msgstr "" @@ -671,6 +671,14 @@ msgstr "" msgid "Client Type" msgstr "" +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:132 +msgid "Actions" +msgstr "" + +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:202 +msgid "Invite this user" +msgstr "" + #: ../system/Widget/widgets/Feed/Feed.php:43 msgid "Loading your feed ..." msgstr "" @@ -694,23 +702,16 @@ msgid "" "feeds" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:134 -#: ../system/Widget/widgets/Feed/Feed.php:137 -#: ../system/Widget/widgets/Feed/Feed.php:148 -#: ../system/Widget/widgets/Feed/Feed.php:151 -msgid "What's new ?" -msgstr "" - -#: ../system/Widget/widgets/Feed/Feed.php:166 +#: ../system/Widget/widgets/Feed/Feed.php:154 msgid "All" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:167 +#: ../system/Widget/widgets/Feed/Feed.php:155 msgid "My Posts" msgstr "" #: ../system/Widget/widgets/Help/Help.php:32 -msgid "What is Movim ?" +msgid "What is Movim?" msgstr "" #: ../system/Widget/widgets/Help/Help.php:34 @@ -816,20 +817,24 @@ msgid "Account successfully created" msgstr "" #: ../system/Widget/widgets/Login/Login.php:83 -msgid "Movim fail to authenticate. You entered wrong data" +msgid "Movim failed to authenticate. You entered wrong data" msgstr "" #: ../system/Widget/widgets/Login/Login.php:91 msgid "Your web browser is too old to use with Movim." msgstr "" +#: ../system/Widget/widgets/Login/Login.php:108 +msgid "Connecting..." +msgstr "Konektante..." + #: ../system/Widget/widgets/Login/Login.php:110 msgid "Come in!" msgstr "Envenu!" #: ../system/Widget/widgets/Login/Login.php:117 #, php-format -msgid "This server host %s accounts" +msgid "This server hosts %s accounts" msgstr "" #: ../system/Widget/widgets/Login/Login.php:122 @@ -840,10 +845,6 @@ msgstr "" msgid "Debug console" msgstr "Sencimiga konzolo" -#: ../system/Widget/widgets/Logout/Logout.php:86 -msgid "Logout" -msgstr "Elsaluti" - #: ../system/Widget/widgets/Notifs/Notifs.php:44 msgid "wants to talk with you" msgstr "volas paroli kun vi" @@ -853,36 +854,36 @@ msgid "Accept" msgstr "Akcepti" #: ../system/Widget/widgets/Notifs/Notifs.php:62 -#: ../system/Widget/widgets/Notifs/Notifs.php:156 -msgid "Validate" -msgstr "Validigi" +#: ../system/Widget/widgets/Notifs/Notifs.php:125 +msgid "Add" +msgstr "" #: ../system/Widget/widgets/Notifs/Notifs.php:68 msgid "Decline" msgstr "Malakcepti" -#: ../system/Widget/widgets/Notifs/Notifs.php:120 +#: ../system/Widget/widgets/Notifs/Notifs.php:119 #, php-format msgid "Contacts (%s)" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:126 -msgid "Add" -msgstr "" - -#: ../system/Widget/widgets/Notifs/Notifs.php:147 +#: ../system/Widget/widgets/Notifs/Notifs.php:146 msgid "Alias" msgstr "Kromnomo" -#: ../system/Widget/widgets/Notifs/Notifs.php:163 +#: ../system/Widget/widgets/Notifs/Notifs.php:155 +msgid "Send request" +msgstr "" + +#: ../system/Widget/widgets/Notifs/Notifs.php:162 msgid "Cancel" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:88 +#: ../system/Widget/widgets/Profile/Profile.php:74 msgid "No profile yet ?" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:89 +#: ../system/Widget/widgets/Profile/Profile.php:75 #: ../system/Widget/widgets/Vcard/Vcard.php:62 msgid "Create my vCard" msgstr "" @@ -925,6 +926,9 @@ msgstr "" msgid "Loading the contact feed ..." msgstr "Ŝarĝante la kontakta fluo…" +#~ msgid "Validate" +#~ msgstr "Validigi" + #~ msgid "MOVIM - Test Client" #~ msgstr "MOVIM - Testkliento" diff --git a/i18n/es.po b/i18n/es.po index 3785b6e8a..9e645bf84 100644 --- a/i18n/es.po +++ b/i18n/es.po @@ -5,10 +5,11 @@ msgid "" msgstr "" "Project-Id-Version: Movim\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-27 21:41+0200\n" +"POT-Creation-Date: 2012-07-18 21:48+0200\n" "PO-Revision-Date: 2011-11-10 11:28+0000\n" "Last-Translator: Ricardo Sánchez Baamonde \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -58,12 +59,12 @@ msgstr "o" #: ../install/index.php:169 #, php-format -msgid "Bosh connection failed with error `%s'" +msgid "Bosh connection failed with error '%s'" msgstr "" #: ../install/index.php:178 #, php-format -msgid "XMPP connection through Bosh failed with error `%s'" +msgid "XMPP connection through Bosh failed with error '%s'" msgstr "" #: ../install/index.php:224 ../install/index.php:228 ../install/index.php:232 @@ -78,7 +79,7 @@ msgstr "No pudo crear el archivo de configuración '%s'." #: ../install/index.php:283 #, php-format -msgid "Database connection failed with error `%s'" +msgid "Database connection failed with error '%s'" msgstr "" #: ../install/part1.php:29 @@ -86,8 +87,7 @@ msgid "Thank you for downloading Movim!" msgstr "" #: ../install/part1.php:30 -msgid "" -"Before you enjoy your social network, a few adjustements are required." +msgid "Before you enjoy your social network, a few adjustements are required." msgstr "" #: ../install/part1.php:31 @@ -170,8 +170,7 @@ msgstr "El esquema de la base de datos de Movin se ha instalado" #: ../install/part2.php:23 #, php-format msgid "You can now access your shiny Movim instance %sJump In !%s" -msgstr "" -"Ahora puedes acceder a tu brillante Movim de ejemplo %s¡Entra ahora!%s" +msgstr "Ahora puedes acceder a tu brillante Movim de ejemplo %s¡Entra ahora!%s" #: ../install/part2.php:24 ../system/Widget/widgets/Login/Login.php:133 #, php-format @@ -179,8 +178,8 @@ msgid "Please remove the %s folder in order to complete the installation" msgstr "Por favor, borra la %s carpeta para poder completar la instalación" #: ../system/Conf.php:38 -#, php-format -msgid "Cannot load element value'%s'" +#, fuzzy, php-format +msgid "Cannot load element value '%s'" msgstr "No se pudo cargar el valor '%s'" #: ../system/Conf.php:49 @@ -201,10 +200,6 @@ msgstr "Identidad de Jabber no proveída" msgid "jid '%s' is incorrect" msgstr "Identidad de Jabber '%s' no es correcta" -#: ../system/Jabber.php:147 ../system/Widget/widgets/Login/Login.php:108 -msgid "Connecting..." -msgstr "Conectando…" - #: ../system/Logger.php:27 #, php-format msgid "Cannot open log file '%s'" @@ -352,104 +347,124 @@ msgstr "" msgid "Civil Union" msgstr "" +#: ../system/Utils.php:219 ../system/Widget/widgets/Chat/Chat.php:40 +msgid "Online" +msgstr "" + +#: ../system/Utils.php:220 ../system/Widget/widgets/Chat/Chat.php:41 +msgid "Away" +msgstr "Ausente" + +#: ../system/Utils.php:221 ../system/Widget/widgets/Chat/Chat.php:42 +msgid "Do Not Disturb" +msgstr "" + +#: ../system/Utils.php:222 ../system/Widget/widgets/Chat/Chat.php:43 +msgid "Extended Away" +msgstr "" + +#: ../system/Utils.php:223 +msgid "Logout" +msgstr "Salir" + #: ../system/Controller/ControllerMain.php:40 #, php-format msgid "%s - Welcome to Movim" msgstr "%s - Bienvenido a Movim" #: ../system/Controller/ControllerMain.php:41 -#: ../system/Controller/ControllerMain.php:75 -#: ../system/Controller/ControllerMain.php:99 -#: ../system/Controller/ControllerMain.php:119 -#: ../system/Controller/ControllerMain.php:151 -#: ../system/Controller/ControllerMain.php:167 -#: ../system/Controller/ControllerMain.php:186 -#: ../system/Controller/ControllerMain.php:215 +#: ../system/Controller/ControllerMain.php:71 +#: ../system/Controller/ControllerMain.php:94 +#: ../system/Controller/ControllerMain.php:114 +#: ../system/Controller/ControllerMain.php:146 +#: ../system/Controller/ControllerMain.php:162 +#: ../system/Controller/ControllerMain.php:181 +#: ../system/Controller/ControllerMain.php:210 msgid "Home" msgstr "Inicio" #: ../system/Controller/ControllerMain.php:42 -#: ../system/Controller/ControllerMain.php:78 -#: ../system/Controller/ControllerMain.php:100 -#: ../system/Controller/ControllerMain.php:120 -#: ../system/Controller/ControllerMain.php:216 +#: ../system/Controller/ControllerMain.php:73 +#: ../system/Controller/ControllerMain.php:95 +#: ../system/Controller/ControllerMain.php:115 +#: ../system/Controller/ControllerMain.php:211 #: ../system/Widget/widgets/ContactCard/ContactCard.php:175 msgid "Profile" msgstr "Perfil" #: ../system/Controller/ControllerMain.php:43 -#: ../system/Controller/ControllerMain.php:79 -#: ../system/Controller/ControllerMain.php:101 -#: ../system/Controller/ControllerMain.php:121 -#: ../system/Controller/ControllerMain.php:217 +#: ../system/Controller/ControllerMain.php:74 +#: ../system/Controller/ControllerMain.php:96 +#: ../system/Controller/ControllerMain.php:116 +#: ../system/Controller/ControllerMain.php:212 msgid "Configuration" msgstr "Configuración" #: ../system/Controller/ControllerMain.php:44 -#: ../system/Controller/ControllerMain.php:80 -#: ../system/Controller/ControllerMain.php:102 -#: ../system/Controller/ControllerMain.php:122 -#: ../system/Controller/ControllerMain.php:218 +#: ../system/Controller/ControllerMain.php:75 +#: ../system/Controller/ControllerMain.php:97 +#: ../system/Controller/ControllerMain.php:117 +#: ../system/Controller/ControllerMain.php:213 msgid "Help" msgstr "" -#: ../system/Controller/ControllerMain.php:98 +#: ../system/Controller/ControllerMain.php:93 #, php-format msgid "%s - Configuration" msgstr "%s - Configuración" -#: ../system/Controller/ControllerMain.php:118 +#: ../system/Controller/ControllerMain.php:113 #, php-format msgid "%s - Profile" msgstr "" -#: ../system/Controller/ControllerMain.php:150 +#: ../system/Controller/ControllerMain.php:145 #, php-format msgid "%s - Account Creation" msgstr "%s - Crear cuenta" -#: ../system/Controller/ControllerMain.php:152 -#: ../system/Controller/ControllerMain.php:168 +#: ../system/Controller/ControllerMain.php:147 +#: ../system/Controller/ControllerMain.php:163 msgid "Account Creation" msgstr "Crear cuenta" -#: ../system/Controller/ControllerMain.php:166 +#: ../system/Controller/ControllerMain.php:161 #, php-format msgid "%s - Add An Account" msgstr "" -#: ../system/Controller/ControllerMain.php:184 +#: ../system/Controller/ControllerMain.php:179 #, php-format msgid "%s - Login to Movim" msgstr "%s - Connectarse a Movim" -#: ../system/Controller/ControllerMain.php:205 +#: ../system/Controller/ControllerMain.php:200 #, php-format msgid "%s - Help Page" msgstr "" #: ../system/Widget/widgets/Account/Account.php:170 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:100 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:101 msgid "Some data are missing !" msgstr "" #: ../system/Widget/widgets/Account/Account.php:176 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:106 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:107 msgid "Wrong ID" msgstr "" #: ../system/Widget/widgets/Account/Account.php:182 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:112 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:113 msgid "You entered different passwords" msgstr "" #: ../system/Widget/widgets/Account/Account.php:188 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:118 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:119 msgid "Invalid name" msgstr "" #: ../system/Widget/widgets/Account/Account.php:194 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:124 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:125 msgid "Username already taken" msgstr "" @@ -481,7 +496,7 @@ msgid "Only alphanumerics elements are authorized" msgstr "" #: ../system/Widget/widgets/Account/Account.php:236 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:150 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:151 #: ../system/Widget/widgets/Login/Login.php:103 msgid "My address" msgstr "Mi dirección" @@ -503,7 +518,7 @@ msgid "Example :" msgstr "" #: ../system/Widget/widgets/Account/Account.php:249 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:159 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:160 #: ../system/Widget/widgets/Login/Login.php:105 msgid "Password" msgstr "Contraseña" @@ -513,7 +528,7 @@ msgid "Same here !" msgstr "" #: ../system/Widget/widgets/Account/Account.php:261 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:169 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:170 msgid "Retype" msgstr "" @@ -522,38 +537,18 @@ msgid "Pseudo" msgstr "" #: ../system/Widget/widgets/Account/Account.php:280 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:177 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:178 msgid "Create" msgstr "" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:130 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:131 msgid "XMPP Domain error, your account is not a correct Jabber ID" msgstr "" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:143 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:144 msgid "Add your login informations" msgstr "" -#: ../system/Widget/widgets/Chat/Chat.php:40 -#: ../system/Widget/widgets/Logout/Logout.php:82 -msgid "Online" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:41 -#: ../system/Widget/widgets/Logout/Logout.php:83 -msgid "Away" -msgstr "Ausente" - -#: ../system/Widget/widgets/Chat/Chat.php:42 -#: ../system/Widget/widgets/Logout/Logout.php:84 -msgid "Do Not Disturb" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:43 -#: ../system/Widget/widgets/Logout/Logout.php:85 -msgid "Extended Away" -msgstr "" - #: ../system/Widget/widgets/Chat/Chat.php:44 msgid "Offline" msgstr "" @@ -567,8 +562,8 @@ msgid "Language" msgstr "Idioma" #: ../system/Widget/widgets/Config/Config.php:59 -#: ../system/Widget/widgets/Feed/Feed.php:144 -#: ../system/Widget/widgets/Feed/Feed.php:155 +#: ../system/Widget/widgets/Feed/Feed.php:138 +#: ../system/Widget/widgets/Feed/Feed.php:142 #: ../system/Widget/widgets/Vcard/Vcard.php:179 msgid "Submit" msgstr "Enviar" @@ -579,23 +574,27 @@ msgid "Reset" msgstr "Reiniciar" #: ../system/Widget/widgets/ContactCard/ContactCard.php:61 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:164 msgid "Remove this contact" msgstr "Borrar contacto" #: ../system/Widget/widgets/ContactCard/ContactCard.php:75 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:192 msgid "No" msgstr "No" #: ../system/Widget/widgets/ContactCard/ContactCard.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:178 msgid "Yes" msgstr "Sí" #: ../system/Widget/widgets/ContactCard/ContactCard.php:100 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:145 msgid "Chat" msgstr "Chat" #: ../system/Widget/widgets/ContactCard/ContactCard.php:110 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:63 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:71 #: ../system/Widget/widgets/Vcard/Vcard.php:75 msgid "General Informations" msgstr "Informaciones generales" @@ -640,27 +639,28 @@ msgid "Avatar" msgstr "Imagen de perfil" #: ../system/Widget/widgets/ContactCard/ContactCard.php:129 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:96 #: ../system/Widget/widgets/Vcard/Vcard.php:160 msgid "About Me" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:138 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:111 msgid "Bot" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:139 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:89 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:112 msgid "Desktop" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:140 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:90 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:113 msgid "Phone" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:149 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:106 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:129 msgid "Client Informations" msgstr "" @@ -672,6 +672,14 @@ msgstr "" msgid "Client Type" msgstr "" +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:132 +msgid "Actions" +msgstr "" + +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:202 +msgid "Invite this user" +msgstr "" + #: ../system/Widget/widgets/Feed/Feed.php:43 msgid "Loading your feed ..." msgstr "Cargando tu canal" @@ -695,23 +703,16 @@ msgid "" "feeds" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:134 -#: ../system/Widget/widgets/Feed/Feed.php:137 -#: ../system/Widget/widgets/Feed/Feed.php:148 -#: ../system/Widget/widgets/Feed/Feed.php:151 -msgid "What's new ?" -msgstr "¿Algo nuevo?" - -#: ../system/Widget/widgets/Feed/Feed.php:166 +#: ../system/Widget/widgets/Feed/Feed.php:154 msgid "All" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:167 +#: ../system/Widget/widgets/Feed/Feed.php:155 msgid "My Posts" msgstr "" #: ../system/Widget/widgets/Help/Help.php:32 -msgid "What is Movim ?" +msgid "What is Movim?" msgstr "" #: ../system/Widget/widgets/Help/Help.php:34 @@ -817,20 +818,24 @@ msgid "Account successfully created" msgstr "" #: ../system/Widget/widgets/Login/Login.php:83 -msgid "Movim fail to authenticate. You entered wrong data" +msgid "Movim failed to authenticate. You entered wrong data" msgstr "" #: ../system/Widget/widgets/Login/Login.php:91 msgid "Your web browser is too old to use with Movim." msgstr "Tu navegador web es demasiado antiguo para usar Movim" +#: ../system/Widget/widgets/Login/Login.php:108 +msgid "Connecting..." +msgstr "Conectando…" + #: ../system/Widget/widgets/Login/Login.php:110 msgid "Come in!" msgstr "Apuntate!" #: ../system/Widget/widgets/Login/Login.php:117 #, php-format -msgid "This server host %s accounts" +msgid "This server hosts %s accounts" msgstr "" #: ../system/Widget/widgets/Login/Login.php:122 @@ -841,10 +846,6 @@ msgstr "" msgid "Debug console" msgstr "Consola de depuración" -#: ../system/Widget/widgets/Logout/Logout.php:86 -msgid "Logout" -msgstr "Salir" - #: ../system/Widget/widgets/Notifs/Notifs.php:44 msgid "wants to talk with you" msgstr "quiere charlar contigo" @@ -854,36 +855,36 @@ msgid "Accept" msgstr "Aceptar" #: ../system/Widget/widgets/Notifs/Notifs.php:62 -#: ../system/Widget/widgets/Notifs/Notifs.php:156 -msgid "Validate" -msgstr "Confirmar" +#: ../system/Widget/widgets/Notifs/Notifs.php:125 +msgid "Add" +msgstr "" #: ../system/Widget/widgets/Notifs/Notifs.php:68 msgid "Decline" msgstr "Denegar" -#: ../system/Widget/widgets/Notifs/Notifs.php:120 +#: ../system/Widget/widgets/Notifs/Notifs.php:119 #, php-format msgid "Contacts (%s)" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:126 -msgid "Add" -msgstr "" - -#: ../system/Widget/widgets/Notifs/Notifs.php:147 +#: ../system/Widget/widgets/Notifs/Notifs.php:146 msgid "Alias" msgstr "Apodo" -#: ../system/Widget/widgets/Notifs/Notifs.php:163 +#: ../system/Widget/widgets/Notifs/Notifs.php:155 +msgid "Send request" +msgstr "" + +#: ../system/Widget/widgets/Notifs/Notifs.php:162 msgid "Cancel" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:88 +#: ../system/Widget/widgets/Profile/Profile.php:74 msgid "No profile yet ?" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:89 +#: ../system/Widget/widgets/Profile/Profile.php:75 #: ../system/Widget/widgets/Vcard/Vcard.php:62 msgid "Create my vCard" msgstr "" @@ -926,6 +927,12 @@ msgstr "Seguir" msgid "Loading the contact feed ..." msgstr "Cargando el canal del contacto..." +#~ msgid "What's new ?" +#~ msgstr "¿Algo nuevo?" + +#~ msgid "Validate" +#~ msgstr "Confirmar" + #~ msgid "MOVIM - Test Client" #~ msgstr "MOVIM - Cliente de prueba" diff --git a/i18n/fi.po b/i18n/fi.po index b340bf3fc..de0d5bee2 100644 --- a/i18n/fi.po +++ b/i18n/fi.po @@ -5,10 +5,11 @@ msgid "" msgstr "" "Project-Id-Version: Movim\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-27 21:41+0200\n" +"POT-Creation-Date: 2012-07-18 21:48+0200\n" "PO-Revision-Date: 2011-10-13 19:51+0000\n" "Last-Translator: edhelas \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -57,12 +58,12 @@ msgstr "" #: ../install/index.php:169 #, php-format -msgid "Bosh connection failed with error `%s'" +msgid "Bosh connection failed with error '%s'" msgstr "" #: ../install/index.php:178 #, php-format -msgid "XMPP connection through Bosh failed with error `%s'" +msgid "XMPP connection through Bosh failed with error '%s'" msgstr "" #: ../install/index.php:224 ../install/index.php:228 ../install/index.php:232 @@ -77,7 +78,7 @@ msgstr "Ei voitu luoda asetustiedostoa '%s'" #: ../install/index.php:283 #, php-format -msgid "Database connection failed with error `%s'" +msgid "Database connection failed with error '%s'" msgstr "" #: ../install/part1.php:29 @@ -85,8 +86,7 @@ msgid "Thank you for downloading Movim!" msgstr "" #: ../install/part1.php:30 -msgid "" -"Before you enjoy your social network, a few adjustements are required." +msgid "Before you enjoy your social network, a few adjustements are required." msgstr "" #: ../install/part1.php:31 @@ -177,8 +177,8 @@ msgid "Please remove the %s folder in order to complete the installation" msgstr "" #: ../system/Conf.php:38 -#, php-format -msgid "Cannot load element value'%s'" +#, fuzzy, php-format +msgid "Cannot load element value '%s'" msgstr "Ei voitu ladata elementin arvoa '%s'" #: ../system/Conf.php:49 @@ -199,10 +199,6 @@ msgstr "JID ei määritetty." msgid "jid '%s' is incorrect" msgstr "jid '%s' on väärin" -#: ../system/Jabber.php:147 ../system/Widget/widgets/Login/Login.php:108 -msgid "Connecting..." -msgstr "" - #: ../system/Logger.php:27 #, php-format msgid "Cannot open log file '%s'" @@ -350,104 +346,124 @@ msgstr "" msgid "Civil Union" msgstr "" +#: ../system/Utils.php:219 ../system/Widget/widgets/Chat/Chat.php:40 +msgid "Online" +msgstr "" + +#: ../system/Utils.php:220 ../system/Widget/widgets/Chat/Chat.php:41 +msgid "Away" +msgstr "Poissa" + +#: ../system/Utils.php:221 ../system/Widget/widgets/Chat/Chat.php:42 +msgid "Do Not Disturb" +msgstr "" + +#: ../system/Utils.php:222 ../system/Widget/widgets/Chat/Chat.php:43 +msgid "Extended Away" +msgstr "" + +#: ../system/Utils.php:223 +msgid "Logout" +msgstr "Kirjaudu ulos" + #: ../system/Controller/ControllerMain.php:40 #, php-format msgid "%s - Welcome to Movim" msgstr "%s - Tervetuloa käyttämään Movimia" #: ../system/Controller/ControllerMain.php:41 -#: ../system/Controller/ControllerMain.php:75 -#: ../system/Controller/ControllerMain.php:99 -#: ../system/Controller/ControllerMain.php:119 -#: ../system/Controller/ControllerMain.php:151 -#: ../system/Controller/ControllerMain.php:167 -#: ../system/Controller/ControllerMain.php:186 -#: ../system/Controller/ControllerMain.php:215 +#: ../system/Controller/ControllerMain.php:71 +#: ../system/Controller/ControllerMain.php:94 +#: ../system/Controller/ControllerMain.php:114 +#: ../system/Controller/ControllerMain.php:146 +#: ../system/Controller/ControllerMain.php:162 +#: ../system/Controller/ControllerMain.php:181 +#: ../system/Controller/ControllerMain.php:210 msgid "Home" msgstr "Koti" #: ../system/Controller/ControllerMain.php:42 -#: ../system/Controller/ControllerMain.php:78 -#: ../system/Controller/ControllerMain.php:100 -#: ../system/Controller/ControllerMain.php:120 -#: ../system/Controller/ControllerMain.php:216 +#: ../system/Controller/ControllerMain.php:73 +#: ../system/Controller/ControllerMain.php:95 +#: ../system/Controller/ControllerMain.php:115 +#: ../system/Controller/ControllerMain.php:211 #: ../system/Widget/widgets/ContactCard/ContactCard.php:175 msgid "Profile" msgstr "Profiili" #: ../system/Controller/ControllerMain.php:43 -#: ../system/Controller/ControllerMain.php:79 -#: ../system/Controller/ControllerMain.php:101 -#: ../system/Controller/ControllerMain.php:121 -#: ../system/Controller/ControllerMain.php:217 +#: ../system/Controller/ControllerMain.php:74 +#: ../system/Controller/ControllerMain.php:96 +#: ../system/Controller/ControllerMain.php:116 +#: ../system/Controller/ControllerMain.php:212 msgid "Configuration" msgstr "Konfiguraatio" #: ../system/Controller/ControllerMain.php:44 -#: ../system/Controller/ControllerMain.php:80 -#: ../system/Controller/ControllerMain.php:102 -#: ../system/Controller/ControllerMain.php:122 -#: ../system/Controller/ControllerMain.php:218 +#: ../system/Controller/ControllerMain.php:75 +#: ../system/Controller/ControllerMain.php:97 +#: ../system/Controller/ControllerMain.php:117 +#: ../system/Controller/ControllerMain.php:213 msgid "Help" msgstr "" -#: ../system/Controller/ControllerMain.php:98 +#: ../system/Controller/ControllerMain.php:93 #, php-format msgid "%s - Configuration" msgstr "%s - Konfigurointi" -#: ../system/Controller/ControllerMain.php:118 +#: ../system/Controller/ControllerMain.php:113 #, php-format msgid "%s - Profile" msgstr "" -#: ../system/Controller/ControllerMain.php:150 +#: ../system/Controller/ControllerMain.php:145 #, php-format msgid "%s - Account Creation" msgstr "%s - Tilin luominen" -#: ../system/Controller/ControllerMain.php:152 -#: ../system/Controller/ControllerMain.php:168 +#: ../system/Controller/ControllerMain.php:147 +#: ../system/Controller/ControllerMain.php:163 msgid "Account Creation" msgstr "Käyttäjätilin luominen" -#: ../system/Controller/ControllerMain.php:166 +#: ../system/Controller/ControllerMain.php:161 #, php-format msgid "%s - Add An Account" msgstr "" -#: ../system/Controller/ControllerMain.php:184 +#: ../system/Controller/ControllerMain.php:179 #, php-format msgid "%s - Login to Movim" msgstr "%s - Kirjaudu Movimiin" -#: ../system/Controller/ControllerMain.php:205 +#: ../system/Controller/ControllerMain.php:200 #, php-format msgid "%s - Help Page" msgstr "" #: ../system/Widget/widgets/Account/Account.php:170 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:100 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:101 msgid "Some data are missing !" msgstr "" #: ../system/Widget/widgets/Account/Account.php:176 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:106 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:107 msgid "Wrong ID" msgstr "" #: ../system/Widget/widgets/Account/Account.php:182 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:112 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:113 msgid "You entered different passwords" msgstr "" #: ../system/Widget/widgets/Account/Account.php:188 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:118 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:119 msgid "Invalid name" msgstr "" #: ../system/Widget/widgets/Account/Account.php:194 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:124 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:125 msgid "Username already taken" msgstr "" @@ -479,7 +495,7 @@ msgid "Only alphanumerics elements are authorized" msgstr "" #: ../system/Widget/widgets/Account/Account.php:236 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:150 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:151 #: ../system/Widget/widgets/Login/Login.php:103 msgid "My address" msgstr "Oma osoite" @@ -501,7 +517,7 @@ msgid "Example :" msgstr "" #: ../system/Widget/widgets/Account/Account.php:249 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:159 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:160 #: ../system/Widget/widgets/Login/Login.php:105 msgid "Password" msgstr "Salasana" @@ -511,7 +527,7 @@ msgid "Same here !" msgstr "" #: ../system/Widget/widgets/Account/Account.php:261 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:169 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:170 msgid "Retype" msgstr "" @@ -520,38 +536,18 @@ msgid "Pseudo" msgstr "" #: ../system/Widget/widgets/Account/Account.php:280 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:177 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:178 msgid "Create" msgstr "" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:130 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:131 msgid "XMPP Domain error, your account is not a correct Jabber ID" msgstr "" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:143 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:144 msgid "Add your login informations" msgstr "" -#: ../system/Widget/widgets/Chat/Chat.php:40 -#: ../system/Widget/widgets/Logout/Logout.php:82 -msgid "Online" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:41 -#: ../system/Widget/widgets/Logout/Logout.php:83 -msgid "Away" -msgstr "Poissa" - -#: ../system/Widget/widgets/Chat/Chat.php:42 -#: ../system/Widget/widgets/Logout/Logout.php:84 -msgid "Do Not Disturb" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:43 -#: ../system/Widget/widgets/Logout/Logout.php:85 -msgid "Extended Away" -msgstr "" - #: ../system/Widget/widgets/Chat/Chat.php:44 msgid "Offline" msgstr "" @@ -565,8 +561,8 @@ msgid "Language" msgstr "Kieli" #: ../system/Widget/widgets/Config/Config.php:59 -#: ../system/Widget/widgets/Feed/Feed.php:144 -#: ../system/Widget/widgets/Feed/Feed.php:155 +#: ../system/Widget/widgets/Feed/Feed.php:138 +#: ../system/Widget/widgets/Feed/Feed.php:142 #: ../system/Widget/widgets/Vcard/Vcard.php:179 msgid "Submit" msgstr "Lähetä" @@ -577,23 +573,27 @@ msgid "Reset" msgstr "Nollaa" #: ../system/Widget/widgets/ContactCard/ContactCard.php:61 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:164 msgid "Remove this contact" msgstr "Poista tämä kontakti" #: ../system/Widget/widgets/ContactCard/ContactCard.php:75 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:192 msgid "No" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:178 msgid "Yes" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:100 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:145 msgid "Chat" msgstr "Chat" #: ../system/Widget/widgets/ContactCard/ContactCard.php:110 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:63 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:71 #: ../system/Widget/widgets/Vcard/Vcard.php:75 msgid "General Informations" msgstr "Perustiedot" @@ -638,27 +638,28 @@ msgid "Avatar" msgstr "Avatar" #: ../system/Widget/widgets/ContactCard/ContactCard.php:129 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:96 #: ../system/Widget/widgets/Vcard/Vcard.php:160 msgid "About Me" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:138 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:111 msgid "Bot" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:139 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:89 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:112 msgid "Desktop" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:140 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:90 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:113 msgid "Phone" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:149 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:106 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:129 msgid "Client Informations" msgstr "" @@ -670,6 +671,14 @@ msgstr "" msgid "Client Type" msgstr "" +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:132 +msgid "Actions" +msgstr "" + +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:202 +msgid "Invite this user" +msgstr "" + #: ../system/Widget/widgets/Feed/Feed.php:43 msgid "Loading your feed ..." msgstr "" @@ -693,23 +702,16 @@ msgid "" "feeds" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:134 -#: ../system/Widget/widgets/Feed/Feed.php:137 -#: ../system/Widget/widgets/Feed/Feed.php:148 -#: ../system/Widget/widgets/Feed/Feed.php:151 -msgid "What's new ?" -msgstr "" - -#: ../system/Widget/widgets/Feed/Feed.php:166 +#: ../system/Widget/widgets/Feed/Feed.php:154 msgid "All" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:167 +#: ../system/Widget/widgets/Feed/Feed.php:155 msgid "My Posts" msgstr "" #: ../system/Widget/widgets/Help/Help.php:32 -msgid "What is Movim ?" +msgid "What is Movim?" msgstr "" #: ../system/Widget/widgets/Help/Help.php:34 @@ -815,20 +817,24 @@ msgid "Account successfully created" msgstr "" #: ../system/Widget/widgets/Login/Login.php:83 -msgid "Movim fail to authenticate. You entered wrong data" +msgid "Movim failed to authenticate. You entered wrong data" msgstr "" #: ../system/Widget/widgets/Login/Login.php:91 msgid "Your web browser is too old to use with Movim." msgstr "" +#: ../system/Widget/widgets/Login/Login.php:108 +msgid "Connecting..." +msgstr "" + #: ../system/Widget/widgets/Login/Login.php:110 msgid "Come in!" msgstr "Tule sisään!" #: ../system/Widget/widgets/Login/Login.php:117 #, php-format -msgid "This server host %s accounts" +msgid "This server hosts %s accounts" msgstr "" #: ../system/Widget/widgets/Login/Login.php:122 @@ -839,10 +845,6 @@ msgstr "" msgid "Debug console" msgstr "Debug konsoli" -#: ../system/Widget/widgets/Logout/Logout.php:86 -msgid "Logout" -msgstr "Kirjaudu ulos" - #: ../system/Widget/widgets/Notifs/Notifs.php:44 msgid "wants to talk with you" msgstr "haluaa jutella kanssasi" @@ -852,36 +854,36 @@ msgid "Accept" msgstr "Hyväksy" #: ../system/Widget/widgets/Notifs/Notifs.php:62 -#: ../system/Widget/widgets/Notifs/Notifs.php:156 -msgid "Validate" -msgstr "Validoi" +#: ../system/Widget/widgets/Notifs/Notifs.php:125 +msgid "Add" +msgstr "" #: ../system/Widget/widgets/Notifs/Notifs.php:68 msgid "Decline" msgstr "Hylkää" -#: ../system/Widget/widgets/Notifs/Notifs.php:120 +#: ../system/Widget/widgets/Notifs/Notifs.php:119 #, php-format msgid "Contacts (%s)" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:126 -msgid "Add" -msgstr "" - -#: ../system/Widget/widgets/Notifs/Notifs.php:147 +#: ../system/Widget/widgets/Notifs/Notifs.php:146 msgid "Alias" msgstr "Alias" -#: ../system/Widget/widgets/Notifs/Notifs.php:163 +#: ../system/Widget/widgets/Notifs/Notifs.php:155 +msgid "Send request" +msgstr "" + +#: ../system/Widget/widgets/Notifs/Notifs.php:162 msgid "Cancel" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:88 +#: ../system/Widget/widgets/Profile/Profile.php:74 msgid "No profile yet ?" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:89 +#: ../system/Widget/widgets/Profile/Profile.php:75 #: ../system/Widget/widgets/Vcard/Vcard.php:62 msgid "Create my vCard" msgstr "" @@ -924,6 +926,9 @@ msgstr "" msgid "Loading the contact feed ..." msgstr "Ladataan kontaktit-feediä" +#~ msgid "Validate" +#~ msgstr "Validoi" + #~ msgid "MOVIM - Test Client" #~ msgstr "Movim - testiasiakas" diff --git a/i18n/fr.po b/i18n/fr.po index 89cedeed2..67bb9eef4 100644 --- a/i18n/fr.po +++ b/i18n/fr.po @@ -5,10 +5,11 @@ msgid "" msgstr "" "Project-Id-Version: Movim\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-27 21:41+0200\n" +"POT-Creation-Date: 2012-07-18 21:48+0200\n" "PO-Revision-Date: 2012-05-27 19:51+0000\n" "Last-Translator: edhelas \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -61,13 +62,13 @@ msgid "or" msgstr "ou" #: ../install/index.php:169 -#, php-format -msgid "Bosh connection failed with error `%s'" +#, fuzzy, php-format +msgid "Bosh connection failed with error '%s'" msgstr "Échec de la connexion Bosh, erreur `%s'" #: ../install/index.php:178 -#, php-format -msgid "XMPP connection through Bosh failed with error `%s'" +#, fuzzy, php-format +msgid "XMPP connection through Bosh failed with error '%s'" msgstr "Échec de la connexion XMPP via Bosh, erreur `%s'" #: ../install/index.php:224 ../install/index.php:228 ../install/index.php:232 @@ -81,8 +82,8 @@ msgid "Couldn't create configuration file '%s'." msgstr "La création du fichier de configuration '%s' est impossible." #: ../install/index.php:283 -#, php-format -msgid "Database connection failed with error `%s'" +#, fuzzy, php-format +msgid "Database connection failed with error '%s'" msgstr "Échec de la connexion avec la base de donnée, erreur `%s'" #: ../install/part1.php:29 @@ -90,8 +91,7 @@ msgid "Thank you for downloading Movim!" msgstr "Merci d'avoir téléchargé Movim!" #: ../install/part1.php:30 -msgid "" -"Before you enjoy your social network, a few adjustements are required." +msgid "Before you enjoy your social network, a few adjustements are required." msgstr "" "Avant que vous utilisiez votre réseau social, quelques ajustements sont " "nécessaires." @@ -191,8 +191,8 @@ msgid "Please remove the %s folder in order to complete the installation" msgstr "Veuillez supprimer le dossier %s pour terminer l'installation" #: ../system/Conf.php:38 -#, php-format -msgid "Cannot load element value'%s'" +#, fuzzy, php-format +msgid "Cannot load element value '%s'" msgstr "L'élément de valeur '%s' ne peut pas être chargé" #: ../system/Conf.php:49 @@ -213,10 +213,6 @@ msgstr "JID indisponible." msgid "jid '%s' is incorrect" msgstr "Le JID '%s' n'est pas valide" -#: ../system/Jabber.php:147 ../system/Widget/widgets/Login/Login.php:108 -msgid "Connecting..." -msgstr "Connexion…" - #: ../system/Logger.php:27 #, php-format msgid "Cannot open log file '%s'" @@ -364,104 +360,124 @@ msgstr "En concubinage" msgid "Civil Union" msgstr "Union civile" +#: ../system/Utils.php:219 ../system/Widget/widgets/Chat/Chat.php:40 +msgid "Online" +msgstr "Connecté" + +#: ../system/Utils.php:220 ../system/Widget/widgets/Chat/Chat.php:41 +msgid "Away" +msgstr "Absent" + +#: ../system/Utils.php:221 ../system/Widget/widgets/Chat/Chat.php:42 +msgid "Do Not Disturb" +msgstr "Ne pas déranger" + +#: ../system/Utils.php:222 ../system/Widget/widgets/Chat/Chat.php:43 +msgid "Extended Away" +msgstr "Absence prolongée" + +#: ../system/Utils.php:223 +msgid "Logout" +msgstr "Se déconnecter" + #: ../system/Controller/ControllerMain.php:40 #, php-format msgid "%s - Welcome to Movim" msgstr "%s - Bienvenue sur Movim" #: ../system/Controller/ControllerMain.php:41 -#: ../system/Controller/ControllerMain.php:75 -#: ../system/Controller/ControllerMain.php:99 -#: ../system/Controller/ControllerMain.php:119 -#: ../system/Controller/ControllerMain.php:151 -#: ../system/Controller/ControllerMain.php:167 -#: ../system/Controller/ControllerMain.php:186 -#: ../system/Controller/ControllerMain.php:215 +#: ../system/Controller/ControllerMain.php:71 +#: ../system/Controller/ControllerMain.php:94 +#: ../system/Controller/ControllerMain.php:114 +#: ../system/Controller/ControllerMain.php:146 +#: ../system/Controller/ControllerMain.php:162 +#: ../system/Controller/ControllerMain.php:181 +#: ../system/Controller/ControllerMain.php:210 msgid "Home" msgstr "Accueil" #: ../system/Controller/ControllerMain.php:42 -#: ../system/Controller/ControllerMain.php:78 -#: ../system/Controller/ControllerMain.php:100 -#: ../system/Controller/ControllerMain.php:120 -#: ../system/Controller/ControllerMain.php:216 +#: ../system/Controller/ControllerMain.php:73 +#: ../system/Controller/ControllerMain.php:95 +#: ../system/Controller/ControllerMain.php:115 +#: ../system/Controller/ControllerMain.php:211 #: ../system/Widget/widgets/ContactCard/ContactCard.php:175 msgid "Profile" msgstr "Profil" #: ../system/Controller/ControllerMain.php:43 -#: ../system/Controller/ControllerMain.php:79 -#: ../system/Controller/ControllerMain.php:101 -#: ../system/Controller/ControllerMain.php:121 -#: ../system/Controller/ControllerMain.php:217 +#: ../system/Controller/ControllerMain.php:74 +#: ../system/Controller/ControllerMain.php:96 +#: ../system/Controller/ControllerMain.php:116 +#: ../system/Controller/ControllerMain.php:212 msgid "Configuration" msgstr "Configuration" #: ../system/Controller/ControllerMain.php:44 -#: ../system/Controller/ControllerMain.php:80 -#: ../system/Controller/ControllerMain.php:102 -#: ../system/Controller/ControllerMain.php:122 -#: ../system/Controller/ControllerMain.php:218 +#: ../system/Controller/ControllerMain.php:75 +#: ../system/Controller/ControllerMain.php:97 +#: ../system/Controller/ControllerMain.php:117 +#: ../system/Controller/ControllerMain.php:213 msgid "Help" msgstr "Aide" -#: ../system/Controller/ControllerMain.php:98 +#: ../system/Controller/ControllerMain.php:93 #, php-format msgid "%s - Configuration" msgstr "%s - Configuration" -#: ../system/Controller/ControllerMain.php:118 +#: ../system/Controller/ControllerMain.php:113 #, php-format msgid "%s - Profile" msgstr "%s - Profil" -#: ../system/Controller/ControllerMain.php:150 +#: ../system/Controller/ControllerMain.php:145 #, php-format msgid "%s - Account Creation" msgstr "%s - Création de compte" -#: ../system/Controller/ControllerMain.php:152 -#: ../system/Controller/ControllerMain.php:168 +#: ../system/Controller/ControllerMain.php:147 +#: ../system/Controller/ControllerMain.php:163 msgid "Account Creation" msgstr "Création de compte" -#: ../system/Controller/ControllerMain.php:166 +#: ../system/Controller/ControllerMain.php:161 #, php-format msgid "%s - Add An Account" msgstr "%s - Ajouter Un Compte" -#: ../system/Controller/ControllerMain.php:184 +#: ../system/Controller/ControllerMain.php:179 #, php-format msgid "%s - Login to Movim" msgstr "%s - Connexion à Movim" -#: ../system/Controller/ControllerMain.php:205 +#: ../system/Controller/ControllerMain.php:200 #, php-format msgid "%s - Help Page" msgstr "%s - Page d'Aide" #: ../system/Widget/widgets/Account/Account.php:170 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:100 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:101 msgid "Some data are missing !" msgstr "Il manque des informations !" #: ../system/Widget/widgets/Account/Account.php:176 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:106 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:107 msgid "Wrong ID" msgstr "Mauvais identifiant" #: ../system/Widget/widgets/Account/Account.php:182 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:112 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:113 msgid "You entered different passwords" msgstr "Vous avez entré des mots de passe différents" #: ../system/Widget/widgets/Account/Account.php:188 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:118 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:119 msgid "Invalid name" msgstr "Ce nom n'est pas valide." #: ../system/Widget/widgets/Account/Account.php:194 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:124 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:125 msgid "Username already taken" msgstr "Nom d'utilisateur déjà existant" @@ -495,7 +511,7 @@ msgid "Only alphanumerics elements are authorized" msgstr "Seul des éléments alphanumériques sont autorisés" #: ../system/Widget/widgets/Account/Account.php:236 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:150 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:151 #: ../system/Widget/widgets/Login/Login.php:103 msgid "My address" msgstr "Mon adresse" @@ -519,7 +535,7 @@ msgid "Example :" msgstr "Exemple :" #: ../system/Widget/widgets/Account/Account.php:249 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:159 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:160 #: ../system/Widget/widgets/Login/Login.php:105 msgid "Password" msgstr "Mot de passe" @@ -529,7 +545,7 @@ msgid "Same here !" msgstr "Même chôse ici !" #: ../system/Widget/widgets/Account/Account.php:261 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:169 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:170 msgid "Retype" msgstr "Retaper" @@ -538,39 +554,19 @@ msgid "Pseudo" msgstr "Pseudo" #: ../system/Widget/widgets/Account/Account.php:280 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:177 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:178 msgid "Create" msgstr "Créer" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:130 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:131 msgid "XMPP Domain error, your account is not a correct Jabber ID" msgstr "" "Erreur de domaine XMPP, votre compte n'est pas un identifiant jabber correct" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:143 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:144 msgid "Add your login informations" msgstr "Ajoutez vos informations de connexion" -#: ../system/Widget/widgets/Chat/Chat.php:40 -#: ../system/Widget/widgets/Logout/Logout.php:82 -msgid "Online" -msgstr "Connecté" - -#: ../system/Widget/widgets/Chat/Chat.php:41 -#: ../system/Widget/widgets/Logout/Logout.php:83 -msgid "Away" -msgstr "Absent" - -#: ../system/Widget/widgets/Chat/Chat.php:42 -#: ../system/Widget/widgets/Logout/Logout.php:84 -msgid "Do Not Disturb" -msgstr "Ne pas déranger" - -#: ../system/Widget/widgets/Chat/Chat.php:43 -#: ../system/Widget/widgets/Logout/Logout.php:85 -msgid "Extended Away" -msgstr "Absence prolongée" - #: ../system/Widget/widgets/Chat/Chat.php:44 msgid "Offline" msgstr "Hors ligne" @@ -584,8 +580,8 @@ msgid "Language" msgstr "Langue" #: ../system/Widget/widgets/Config/Config.php:59 -#: ../system/Widget/widgets/Feed/Feed.php:144 -#: ../system/Widget/widgets/Feed/Feed.php:155 +#: ../system/Widget/widgets/Feed/Feed.php:138 +#: ../system/Widget/widgets/Feed/Feed.php:142 #: ../system/Widget/widgets/Vcard/Vcard.php:179 msgid "Submit" msgstr "Soumettre" @@ -596,23 +592,27 @@ msgid "Reset" msgstr "Réinitialiser" #: ../system/Widget/widgets/ContactCard/ContactCard.php:61 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:164 msgid "Remove this contact" msgstr "Supprimer ce contact" #: ../system/Widget/widgets/ContactCard/ContactCard.php:75 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:192 msgid "No" msgstr "Non" #: ../system/Widget/widgets/ContactCard/ContactCard.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:178 msgid "Yes" msgstr "Oui" #: ../system/Widget/widgets/ContactCard/ContactCard.php:100 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:145 msgid "Chat" msgstr "Chat" #: ../system/Widget/widgets/ContactCard/ContactCard.php:110 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:63 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:71 #: ../system/Widget/widgets/Vcard/Vcard.php:75 msgid "General Informations" msgstr "Informations Générales" @@ -657,27 +657,28 @@ msgid "Avatar" msgstr "Avatar" #: ../system/Widget/widgets/ContactCard/ContactCard.php:129 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:96 #: ../system/Widget/widgets/Vcard/Vcard.php:160 msgid "About Me" msgstr "À propos de moi" #: ../system/Widget/widgets/ContactCard/ContactCard.php:138 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:111 msgid "Bot" msgstr "Robot" #: ../system/Widget/widgets/ContactCard/ContactCard.php:139 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:89 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:112 msgid "Desktop" msgstr "Bureau" #: ../system/Widget/widgets/ContactCard/ContactCard.php:140 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:90 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:113 msgid "Phone" msgstr "Téléphone" #: ../system/Widget/widgets/ContactCard/ContactCard.php:149 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:106 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:129 msgid "Client Informations" msgstr "Informations sur le client" @@ -689,6 +690,14 @@ msgstr "Nom du client" msgid "Client Type" msgstr "Type de Client" +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:132 +msgid "Actions" +msgstr "" + +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:202 +msgid "Invite this user" +msgstr "" + #: ../system/Widget/widgets/Feed/Feed.php:43 msgid "Loading your feed ..." msgstr "Chargement de votre flux ..." @@ -714,23 +723,17 @@ msgstr "" "Votre serveur ne gère pas la publication des billets, vous ne pouvez que " "lire les flux de vos contacts." -#: ../system/Widget/widgets/Feed/Feed.php:134 -#: ../system/Widget/widgets/Feed/Feed.php:137 -#: ../system/Widget/widgets/Feed/Feed.php:148 -#: ../system/Widget/widgets/Feed/Feed.php:151 -msgid "What's new ?" -msgstr "Quoi de neuf ?" - -#: ../system/Widget/widgets/Feed/Feed.php:166 +#: ../system/Widget/widgets/Feed/Feed.php:154 msgid "All" msgstr "Tous" -#: ../system/Widget/widgets/Feed/Feed.php:167 +#: ../system/Widget/widgets/Feed/Feed.php:155 msgid "My Posts" msgstr "Mes posts" #: ../system/Widget/widgets/Help/Help.php:32 -msgid "What is Movim ?" +#, fuzzy +msgid "What is Movim?" msgstr "Qu'est ce que Movim ?" #: ../system/Widget/widgets/Help/Help.php:34 @@ -852,7 +855,8 @@ msgid "Account successfully created" msgstr "Compte créé avec succès" #: ../system/Widget/widgets/Login/Login.php:83 -msgid "Movim fail to authenticate. You entered wrong data" +#, fuzzy +msgid "Movim failed to authenticate. You entered wrong data" msgstr "" "Erreur d'authentification de Movim. Les données saisies ne sont pas " "correctes." @@ -861,13 +865,17 @@ msgstr "" msgid "Your web browser is too old to use with Movim." msgstr "Votre navigateur est trop vieux pour supporter Movim" +#: ../system/Widget/widgets/Login/Login.php:108 +msgid "Connecting..." +msgstr "Connexion…" + #: ../system/Widget/widgets/Login/Login.php:110 msgid "Come in!" msgstr "Entrez!" #: ../system/Widget/widgets/Login/Login.php:117 -#, php-format -msgid "This server host %s accounts" +#, fuzzy, php-format +msgid "This server hosts %s accounts" msgstr "Ce serveur héberge %s comptes" #: ../system/Widget/widgets/Login/Login.php:122 @@ -878,10 +886,6 @@ msgstr "Lier mon compte actuel" msgid "Debug console" msgstr "Console de débogage" -#: ../system/Widget/widgets/Logout/Logout.php:86 -msgid "Logout" -msgstr "Se déconnecter" - #: ../system/Widget/widgets/Notifs/Notifs.php:44 msgid "wants to talk with you" msgstr "veut discuter avec vous" @@ -891,36 +895,36 @@ msgid "Accept" msgstr "Accepter" #: ../system/Widget/widgets/Notifs/Notifs.php:62 -#: ../system/Widget/widgets/Notifs/Notifs.php:156 -msgid "Validate" -msgstr "Valider" +#: ../system/Widget/widgets/Notifs/Notifs.php:125 +msgid "Add" +msgstr "Ajouter" #: ../system/Widget/widgets/Notifs/Notifs.php:68 msgid "Decline" msgstr "Refuser" -#: ../system/Widget/widgets/Notifs/Notifs.php:120 +#: ../system/Widget/widgets/Notifs/Notifs.php:119 #, php-format msgid "Contacts (%s)" msgstr "Contacts (%s)" -#: ../system/Widget/widgets/Notifs/Notifs.php:126 -msgid "Add" -msgstr "Ajouter" - -#: ../system/Widget/widgets/Notifs/Notifs.php:147 +#: ../system/Widget/widgets/Notifs/Notifs.php:146 msgid "Alias" msgstr "Alias" -#: ../system/Widget/widgets/Notifs/Notifs.php:163 +#: ../system/Widget/widgets/Notifs/Notifs.php:155 +msgid "Send request" +msgstr "" + +#: ../system/Widget/widgets/Notifs/Notifs.php:162 msgid "Cancel" msgstr "Annuler" -#: ../system/Widget/widgets/Profile/Profile.php:88 +#: ../system/Widget/widgets/Profile/Profile.php:74 msgid "No profile yet ?" msgstr "Pas encore de profil ?" -#: ../system/Widget/widgets/Profile/Profile.php:89 +#: ../system/Widget/widgets/Profile/Profile.php:75 #: ../system/Widget/widgets/Vcard/Vcard.php:62 msgid "Create my vCard" msgstr "Créer ma vCard" @@ -963,6 +967,12 @@ msgstr "Suivre" msgid "Loading the contact feed ..." msgstr "Chargement du flux ..." +#~ msgid "What's new ?" +#~ msgstr "Quoi de neuf ?" + +#~ msgid "Validate" +#~ msgstr "Valider" + #~ msgid "MOVIM - Test Client" #~ msgstr "MOVIM - Client de test" diff --git a/i18n/gl.po b/i18n/gl.po index c9eef18e1..50d0ec820 100644 --- a/i18n/gl.po +++ b/i18n/gl.po @@ -5,10 +5,11 @@ msgid "" msgstr "" "Project-Id-Version: Movim\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-27 21:41+0200\n" +"POT-Creation-Date: 2012-07-18 21:48+0200\n" "PO-Revision-Date: 2011-10-26 21:33+0000\n" "Last-Translator: edhelas \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -57,12 +58,12 @@ msgstr "" #: ../install/index.php:169 #, php-format -msgid "Bosh connection failed with error `%s'" +msgid "Bosh connection failed with error '%s'" msgstr "" #: ../install/index.php:178 #, php-format -msgid "XMPP connection through Bosh failed with error `%s'" +msgid "XMPP connection through Bosh failed with error '%s'" msgstr "" #: ../install/index.php:224 ../install/index.php:228 ../install/index.php:232 @@ -77,7 +78,7 @@ msgstr "" #: ../install/index.php:283 #, php-format -msgid "Database connection failed with error `%s'" +msgid "Database connection failed with error '%s'" msgstr "" #: ../install/part1.php:29 @@ -85,8 +86,7 @@ msgid "Thank you for downloading Movim!" msgstr "" #: ../install/part1.php:30 -msgid "" -"Before you enjoy your social network, a few adjustements are required." +msgid "Before you enjoy your social network, a few adjustements are required." msgstr "" #: ../install/part1.php:31 @@ -176,7 +176,7 @@ msgstr "" #: ../system/Conf.php:38 #, php-format -msgid "Cannot load element value'%s'" +msgid "Cannot load element value '%s'" msgstr "" #: ../system/Conf.php:49 @@ -197,10 +197,6 @@ msgstr "" msgid "jid '%s' is incorrect" msgstr "" -#: ../system/Jabber.php:147 ../system/Widget/widgets/Login/Login.php:108 -msgid "Connecting..." -msgstr "" - #: ../system/Logger.php:27 #, php-format msgid "Cannot open log file '%s'" @@ -348,104 +344,124 @@ msgstr "" msgid "Civil Union" msgstr "" +#: ../system/Utils.php:219 ../system/Widget/widgets/Chat/Chat.php:40 +msgid "Online" +msgstr "" + +#: ../system/Utils.php:220 ../system/Widget/widgets/Chat/Chat.php:41 +msgid "Away" +msgstr "Fóra" + +#: ../system/Utils.php:221 ../system/Widget/widgets/Chat/Chat.php:42 +msgid "Do Not Disturb" +msgstr "" + +#: ../system/Utils.php:222 ../system/Widget/widgets/Chat/Chat.php:43 +msgid "Extended Away" +msgstr "" + +#: ../system/Utils.php:223 +msgid "Logout" +msgstr "Saír" + #: ../system/Controller/ControllerMain.php:40 #, php-format msgid "%s - Welcome to Movim" msgstr "%s - Benvindo ao MOVIM" #: ../system/Controller/ControllerMain.php:41 -#: ../system/Controller/ControllerMain.php:75 -#: ../system/Controller/ControllerMain.php:99 -#: ../system/Controller/ControllerMain.php:119 -#: ../system/Controller/ControllerMain.php:151 -#: ../system/Controller/ControllerMain.php:167 -#: ../system/Controller/ControllerMain.php:186 -#: ../system/Controller/ControllerMain.php:215 +#: ../system/Controller/ControllerMain.php:71 +#: ../system/Controller/ControllerMain.php:94 +#: ../system/Controller/ControllerMain.php:114 +#: ../system/Controller/ControllerMain.php:146 +#: ../system/Controller/ControllerMain.php:162 +#: ../system/Controller/ControllerMain.php:181 +#: ../system/Controller/ControllerMain.php:210 msgid "Home" msgstr "Inicio" #: ../system/Controller/ControllerMain.php:42 -#: ../system/Controller/ControllerMain.php:78 -#: ../system/Controller/ControllerMain.php:100 -#: ../system/Controller/ControllerMain.php:120 -#: ../system/Controller/ControllerMain.php:216 +#: ../system/Controller/ControllerMain.php:73 +#: ../system/Controller/ControllerMain.php:95 +#: ../system/Controller/ControllerMain.php:115 +#: ../system/Controller/ControllerMain.php:211 #: ../system/Widget/widgets/ContactCard/ContactCard.php:175 msgid "Profile" msgstr "" #: ../system/Controller/ControllerMain.php:43 -#: ../system/Controller/ControllerMain.php:79 -#: ../system/Controller/ControllerMain.php:101 -#: ../system/Controller/ControllerMain.php:121 -#: ../system/Controller/ControllerMain.php:217 +#: ../system/Controller/ControllerMain.php:74 +#: ../system/Controller/ControllerMain.php:96 +#: ../system/Controller/ControllerMain.php:116 +#: ../system/Controller/ControllerMain.php:212 msgid "Configuration" msgstr "Configuración" #: ../system/Controller/ControllerMain.php:44 -#: ../system/Controller/ControllerMain.php:80 -#: ../system/Controller/ControllerMain.php:102 -#: ../system/Controller/ControllerMain.php:122 -#: ../system/Controller/ControllerMain.php:218 +#: ../system/Controller/ControllerMain.php:75 +#: ../system/Controller/ControllerMain.php:97 +#: ../system/Controller/ControllerMain.php:117 +#: ../system/Controller/ControllerMain.php:213 msgid "Help" msgstr "" -#: ../system/Controller/ControllerMain.php:98 +#: ../system/Controller/ControllerMain.php:93 #, php-format msgid "%s - Configuration" msgstr "Configuración de %s" -#: ../system/Controller/ControllerMain.php:118 +#: ../system/Controller/ControllerMain.php:113 #, php-format msgid "%s - Profile" msgstr "" -#: ../system/Controller/ControllerMain.php:150 +#: ../system/Controller/ControllerMain.php:145 #, php-format msgid "%s - Account Creation" msgstr "Creación de Conta %s" -#: ../system/Controller/ControllerMain.php:152 -#: ../system/Controller/ControllerMain.php:168 +#: ../system/Controller/ControllerMain.php:147 +#: ../system/Controller/ControllerMain.php:163 msgid "Account Creation" msgstr "Creación dunha Conta" -#: ../system/Controller/ControllerMain.php:166 +#: ../system/Controller/ControllerMain.php:161 #, php-format msgid "%s - Add An Account" msgstr "" -#: ../system/Controller/ControllerMain.php:184 +#: ../system/Controller/ControllerMain.php:179 #, php-format msgid "%s - Login to Movim" msgstr "%s - Iniciar a MOVIM" -#: ../system/Controller/ControllerMain.php:205 +#: ../system/Controller/ControllerMain.php:200 #, php-format msgid "%s - Help Page" msgstr "" #: ../system/Widget/widgets/Account/Account.php:170 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:100 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:101 msgid "Some data are missing !" msgstr "" #: ../system/Widget/widgets/Account/Account.php:176 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:106 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:107 msgid "Wrong ID" msgstr "" #: ../system/Widget/widgets/Account/Account.php:182 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:112 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:113 msgid "You entered different passwords" msgstr "" #: ../system/Widget/widgets/Account/Account.php:188 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:118 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:119 msgid "Invalid name" msgstr "" #: ../system/Widget/widgets/Account/Account.php:194 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:124 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:125 msgid "Username already taken" msgstr "" @@ -477,7 +493,7 @@ msgid "Only alphanumerics elements are authorized" msgstr "" #: ../system/Widget/widgets/Account/Account.php:236 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:150 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:151 #: ../system/Widget/widgets/Login/Login.php:103 msgid "My address" msgstr "Meu Enderezo" @@ -499,7 +515,7 @@ msgid "Example :" msgstr "" #: ../system/Widget/widgets/Account/Account.php:249 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:159 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:160 #: ../system/Widget/widgets/Login/Login.php:105 msgid "Password" msgstr "Contrasinal" @@ -509,7 +525,7 @@ msgid "Same here !" msgstr "" #: ../system/Widget/widgets/Account/Account.php:261 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:169 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:170 msgid "Retype" msgstr "" @@ -518,38 +534,18 @@ msgid "Pseudo" msgstr "" #: ../system/Widget/widgets/Account/Account.php:280 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:177 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:178 msgid "Create" msgstr "" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:130 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:131 msgid "XMPP Domain error, your account is not a correct Jabber ID" msgstr "" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:143 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:144 msgid "Add your login informations" msgstr "" -#: ../system/Widget/widgets/Chat/Chat.php:40 -#: ../system/Widget/widgets/Logout/Logout.php:82 -msgid "Online" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:41 -#: ../system/Widget/widgets/Logout/Logout.php:83 -msgid "Away" -msgstr "Fóra" - -#: ../system/Widget/widgets/Chat/Chat.php:42 -#: ../system/Widget/widgets/Logout/Logout.php:84 -msgid "Do Not Disturb" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:43 -#: ../system/Widget/widgets/Logout/Logout.php:85 -msgid "Extended Away" -msgstr "" - #: ../system/Widget/widgets/Chat/Chat.php:44 msgid "Offline" msgstr "" @@ -563,8 +559,8 @@ msgid "Language" msgstr "Linguaxe" #: ../system/Widget/widgets/Config/Config.php:59 -#: ../system/Widget/widgets/Feed/Feed.php:144 -#: ../system/Widget/widgets/Feed/Feed.php:155 +#: ../system/Widget/widgets/Feed/Feed.php:138 +#: ../system/Widget/widgets/Feed/Feed.php:142 #: ../system/Widget/widgets/Vcard/Vcard.php:179 msgid "Submit" msgstr "Enviar" @@ -575,23 +571,27 @@ msgid "Reset" msgstr "Restablecer" #: ../system/Widget/widgets/ContactCard/ContactCard.php:61 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:164 msgid "Remove this contact" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:75 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:192 msgid "No" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:178 msgid "Yes" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:100 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:145 msgid "Chat" msgstr "Chat" #: ../system/Widget/widgets/ContactCard/ContactCard.php:110 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:63 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:71 #: ../system/Widget/widgets/Vcard/Vcard.php:75 msgid "General Informations" msgstr "" @@ -636,27 +636,28 @@ msgid "Avatar" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:129 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:96 #: ../system/Widget/widgets/Vcard/Vcard.php:160 msgid "About Me" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:138 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:111 msgid "Bot" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:139 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:89 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:112 msgid "Desktop" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:140 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:90 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:113 msgid "Phone" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:149 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:106 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:129 msgid "Client Informations" msgstr "" @@ -668,6 +669,14 @@ msgstr "" msgid "Client Type" msgstr "" +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:132 +msgid "Actions" +msgstr "" + +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:202 +msgid "Invite this user" +msgstr "" + #: ../system/Widget/widgets/Feed/Feed.php:43 msgid "Loading your feed ..." msgstr "" @@ -691,23 +700,16 @@ msgid "" "feeds" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:134 -#: ../system/Widget/widgets/Feed/Feed.php:137 -#: ../system/Widget/widgets/Feed/Feed.php:148 -#: ../system/Widget/widgets/Feed/Feed.php:151 -msgid "What's new ?" -msgstr "" - -#: ../system/Widget/widgets/Feed/Feed.php:166 +#: ../system/Widget/widgets/Feed/Feed.php:154 msgid "All" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:167 +#: ../system/Widget/widgets/Feed/Feed.php:155 msgid "My Posts" msgstr "" #: ../system/Widget/widgets/Help/Help.php:32 -msgid "What is Movim ?" +msgid "What is Movim?" msgstr "" #: ../system/Widget/widgets/Help/Help.php:34 @@ -813,20 +815,24 @@ msgid "Account successfully created" msgstr "" #: ../system/Widget/widgets/Login/Login.php:83 -msgid "Movim fail to authenticate. You entered wrong data" +msgid "Movim failed to authenticate. You entered wrong data" msgstr "" #: ../system/Widget/widgets/Login/Login.php:91 msgid "Your web browser is too old to use with Movim." msgstr "" +#: ../system/Widget/widgets/Login/Login.php:108 +msgid "Connecting..." +msgstr "" + #: ../system/Widget/widgets/Login/Login.php:110 msgid "Come in!" msgstr "Entra!" #: ../system/Widget/widgets/Login/Login.php:117 #, php-format -msgid "This server host %s accounts" +msgid "This server hosts %s accounts" msgstr "" #: ../system/Widget/widgets/Login/Login.php:122 @@ -837,10 +843,6 @@ msgstr "" msgid "Debug console" msgstr "Debug da consola" -#: ../system/Widget/widgets/Logout/Logout.php:86 -msgid "Logout" -msgstr "Saír" - #: ../system/Widget/widgets/Notifs/Notifs.php:44 msgid "wants to talk with you" msgstr "" @@ -850,36 +852,36 @@ msgid "Accept" msgstr "" #: ../system/Widget/widgets/Notifs/Notifs.php:62 -#: ../system/Widget/widgets/Notifs/Notifs.php:156 -msgid "Validate" +#: ../system/Widget/widgets/Notifs/Notifs.php:125 +msgid "Add" msgstr "" #: ../system/Widget/widgets/Notifs/Notifs.php:68 msgid "Decline" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:120 +#: ../system/Widget/widgets/Notifs/Notifs.php:119 #, php-format msgid "Contacts (%s)" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:126 -msgid "Add" +#: ../system/Widget/widgets/Notifs/Notifs.php:146 +msgid "Alias" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:147 -msgid "Alias" +#: ../system/Widget/widgets/Notifs/Notifs.php:155 +msgid "Send request" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:163 +#: ../system/Widget/widgets/Notifs/Notifs.php:162 msgid "Cancel" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:88 +#: ../system/Widget/widgets/Profile/Profile.php:74 msgid "No profile yet ?" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:89 +#: ../system/Widget/widgets/Profile/Profile.php:75 #: ../system/Widget/widgets/Vcard/Vcard.php:62 msgid "Create my vCard" msgstr "" diff --git a/i18n/it.po b/i18n/it.po index 2f9019195..cbede408e 100644 --- a/i18n/it.po +++ b/i18n/it.po @@ -5,10 +5,11 @@ msgid "" msgstr "" "Project-Id-Version: Movim\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-27 21:41+0200\n" +"POT-Creation-Date: 2012-07-18 21:48+0200\n" "PO-Revision-Date: 2011-10-26 21:33+0000\n" "Last-Translator: edhelas \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -57,12 +58,12 @@ msgstr "" #: ../install/index.php:169 #, php-format -msgid "Bosh connection failed with error `%s'" +msgid "Bosh connection failed with error '%s'" msgstr "" #: ../install/index.php:178 #, php-format -msgid "XMPP connection through Bosh failed with error `%s'" +msgid "XMPP connection through Bosh failed with error '%s'" msgstr "" #: ../install/index.php:224 ../install/index.php:228 ../install/index.php:232 @@ -77,7 +78,7 @@ msgstr "" #: ../install/index.php:283 #, php-format -msgid "Database connection failed with error `%s'" +msgid "Database connection failed with error '%s'" msgstr "" #: ../install/part1.php:29 @@ -85,8 +86,7 @@ msgid "Thank you for downloading Movim!" msgstr "" #: ../install/part1.php:30 -msgid "" -"Before you enjoy your social network, a few adjustements are required." +msgid "Before you enjoy your social network, a few adjustements are required." msgstr "" #: ../install/part1.php:31 @@ -176,7 +176,7 @@ msgstr "" #: ../system/Conf.php:38 #, php-format -msgid "Cannot load element value'%s'" +msgid "Cannot load element value '%s'" msgstr "" #: ../system/Conf.php:49 @@ -197,10 +197,6 @@ msgstr "" msgid "jid '%s' is incorrect" msgstr "" -#: ../system/Jabber.php:147 ../system/Widget/widgets/Login/Login.php:108 -msgid "Connecting..." -msgstr "" - #: ../system/Logger.php:27 #, php-format msgid "Cannot open log file '%s'" @@ -348,104 +344,124 @@ msgstr "" msgid "Civil Union" msgstr "" +#: ../system/Utils.php:219 ../system/Widget/widgets/Chat/Chat.php:40 +msgid "Online" +msgstr "" + +#: ../system/Utils.php:220 ../system/Widget/widgets/Chat/Chat.php:41 +msgid "Away" +msgstr "" + +#: ../system/Utils.php:221 ../system/Widget/widgets/Chat/Chat.php:42 +msgid "Do Not Disturb" +msgstr "" + +#: ../system/Utils.php:222 ../system/Widget/widgets/Chat/Chat.php:43 +msgid "Extended Away" +msgstr "" + +#: ../system/Utils.php:223 +msgid "Logout" +msgstr "Disconnettiti" + #: ../system/Controller/ControllerMain.php:40 #, php-format msgid "%s - Welcome to Movim" msgstr "%s - Benvenuto su Movim" #: ../system/Controller/ControllerMain.php:41 -#: ../system/Controller/ControllerMain.php:75 -#: ../system/Controller/ControllerMain.php:99 -#: ../system/Controller/ControllerMain.php:119 -#: ../system/Controller/ControllerMain.php:151 -#: ../system/Controller/ControllerMain.php:167 -#: ../system/Controller/ControllerMain.php:186 -#: ../system/Controller/ControllerMain.php:215 +#: ../system/Controller/ControllerMain.php:71 +#: ../system/Controller/ControllerMain.php:94 +#: ../system/Controller/ControllerMain.php:114 +#: ../system/Controller/ControllerMain.php:146 +#: ../system/Controller/ControllerMain.php:162 +#: ../system/Controller/ControllerMain.php:181 +#: ../system/Controller/ControllerMain.php:210 msgid "Home" msgstr "Inizio" #: ../system/Controller/ControllerMain.php:42 -#: ../system/Controller/ControllerMain.php:78 -#: ../system/Controller/ControllerMain.php:100 -#: ../system/Controller/ControllerMain.php:120 -#: ../system/Controller/ControllerMain.php:216 +#: ../system/Controller/ControllerMain.php:73 +#: ../system/Controller/ControllerMain.php:95 +#: ../system/Controller/ControllerMain.php:115 +#: ../system/Controller/ControllerMain.php:211 #: ../system/Widget/widgets/ContactCard/ContactCard.php:175 msgid "Profile" msgstr "" #: ../system/Controller/ControllerMain.php:43 -#: ../system/Controller/ControllerMain.php:79 -#: ../system/Controller/ControllerMain.php:101 -#: ../system/Controller/ControllerMain.php:121 -#: ../system/Controller/ControllerMain.php:217 +#: ../system/Controller/ControllerMain.php:74 +#: ../system/Controller/ControllerMain.php:96 +#: ../system/Controller/ControllerMain.php:116 +#: ../system/Controller/ControllerMain.php:212 msgid "Configuration" msgstr "Configurazione" #: ../system/Controller/ControllerMain.php:44 -#: ../system/Controller/ControllerMain.php:80 -#: ../system/Controller/ControllerMain.php:102 -#: ../system/Controller/ControllerMain.php:122 -#: ../system/Controller/ControllerMain.php:218 +#: ../system/Controller/ControllerMain.php:75 +#: ../system/Controller/ControllerMain.php:97 +#: ../system/Controller/ControllerMain.php:117 +#: ../system/Controller/ControllerMain.php:213 msgid "Help" msgstr "" -#: ../system/Controller/ControllerMain.php:98 +#: ../system/Controller/ControllerMain.php:93 #, php-format msgid "%s - Configuration" msgstr "%s - Configurazione" -#: ../system/Controller/ControllerMain.php:118 +#: ../system/Controller/ControllerMain.php:113 #, php-format msgid "%s - Profile" msgstr "" -#: ../system/Controller/ControllerMain.php:150 +#: ../system/Controller/ControllerMain.php:145 #, php-format msgid "%s - Account Creation" msgstr "%s - Registrazione" -#: ../system/Controller/ControllerMain.php:152 -#: ../system/Controller/ControllerMain.php:168 +#: ../system/Controller/ControllerMain.php:147 +#: ../system/Controller/ControllerMain.php:163 msgid "Account Creation" msgstr "Registrazione" -#: ../system/Controller/ControllerMain.php:166 +#: ../system/Controller/ControllerMain.php:161 #, php-format msgid "%s - Add An Account" msgstr "" -#: ../system/Controller/ControllerMain.php:184 +#: ../system/Controller/ControllerMain.php:179 #, php-format msgid "%s - Login to Movim" msgstr "%s - Entra su Movim" -#: ../system/Controller/ControllerMain.php:205 +#: ../system/Controller/ControllerMain.php:200 #, php-format msgid "%s - Help Page" msgstr "" #: ../system/Widget/widgets/Account/Account.php:170 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:100 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:101 msgid "Some data are missing !" msgstr "" #: ../system/Widget/widgets/Account/Account.php:176 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:106 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:107 msgid "Wrong ID" msgstr "" #: ../system/Widget/widgets/Account/Account.php:182 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:112 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:113 msgid "You entered different passwords" msgstr "" #: ../system/Widget/widgets/Account/Account.php:188 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:118 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:119 msgid "Invalid name" msgstr "" #: ../system/Widget/widgets/Account/Account.php:194 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:124 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:125 msgid "Username already taken" msgstr "" @@ -477,7 +493,7 @@ msgid "Only alphanumerics elements are authorized" msgstr "" #: ../system/Widget/widgets/Account/Account.php:236 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:150 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:151 #: ../system/Widget/widgets/Login/Login.php:103 msgid "My address" msgstr "Il mio indirizzo" @@ -499,7 +515,7 @@ msgid "Example :" msgstr "" #: ../system/Widget/widgets/Account/Account.php:249 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:159 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:160 #: ../system/Widget/widgets/Login/Login.php:105 msgid "Password" msgstr "Password" @@ -509,7 +525,7 @@ msgid "Same here !" msgstr "" #: ../system/Widget/widgets/Account/Account.php:261 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:169 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:170 msgid "Retype" msgstr "" @@ -518,38 +534,18 @@ msgid "Pseudo" msgstr "" #: ../system/Widget/widgets/Account/Account.php:280 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:177 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:178 msgid "Create" msgstr "" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:130 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:131 msgid "XMPP Domain error, your account is not a correct Jabber ID" msgstr "" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:143 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:144 msgid "Add your login informations" msgstr "" -#: ../system/Widget/widgets/Chat/Chat.php:40 -#: ../system/Widget/widgets/Logout/Logout.php:82 -msgid "Online" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:41 -#: ../system/Widget/widgets/Logout/Logout.php:83 -msgid "Away" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:42 -#: ../system/Widget/widgets/Logout/Logout.php:84 -msgid "Do Not Disturb" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:43 -#: ../system/Widget/widgets/Logout/Logout.php:85 -msgid "Extended Away" -msgstr "" - #: ../system/Widget/widgets/Chat/Chat.php:44 msgid "Offline" msgstr "" @@ -563,8 +559,8 @@ msgid "Language" msgstr "Lingua" #: ../system/Widget/widgets/Config/Config.php:59 -#: ../system/Widget/widgets/Feed/Feed.php:144 -#: ../system/Widget/widgets/Feed/Feed.php:155 +#: ../system/Widget/widgets/Feed/Feed.php:138 +#: ../system/Widget/widgets/Feed/Feed.php:142 #: ../system/Widget/widgets/Vcard/Vcard.php:179 msgid "Submit" msgstr "Sottomettere" @@ -575,23 +571,27 @@ msgid "Reset" msgstr "Resettare" #: ../system/Widget/widgets/ContactCard/ContactCard.php:61 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:164 msgid "Remove this contact" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:75 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:192 msgid "No" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:178 msgid "Yes" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:100 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:145 msgid "Chat" msgstr "Chat" #: ../system/Widget/widgets/ContactCard/ContactCard.php:110 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:63 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:71 #: ../system/Widget/widgets/Vcard/Vcard.php:75 msgid "General Informations" msgstr "" @@ -636,27 +636,28 @@ msgid "Avatar" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:129 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:96 #: ../system/Widget/widgets/Vcard/Vcard.php:160 msgid "About Me" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:138 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:111 msgid "Bot" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:139 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:89 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:112 msgid "Desktop" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:140 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:90 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:113 msgid "Phone" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:149 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:106 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:129 msgid "Client Informations" msgstr "" @@ -668,6 +669,14 @@ msgstr "" msgid "Client Type" msgstr "" +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:132 +msgid "Actions" +msgstr "" + +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:202 +msgid "Invite this user" +msgstr "" + #: ../system/Widget/widgets/Feed/Feed.php:43 msgid "Loading your feed ..." msgstr "" @@ -691,23 +700,16 @@ msgid "" "feeds" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:134 -#: ../system/Widget/widgets/Feed/Feed.php:137 -#: ../system/Widget/widgets/Feed/Feed.php:148 -#: ../system/Widget/widgets/Feed/Feed.php:151 -msgid "What's new ?" -msgstr "" - -#: ../system/Widget/widgets/Feed/Feed.php:166 +#: ../system/Widget/widgets/Feed/Feed.php:154 msgid "All" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:167 +#: ../system/Widget/widgets/Feed/Feed.php:155 msgid "My Posts" msgstr "" #: ../system/Widget/widgets/Help/Help.php:32 -msgid "What is Movim ?" +msgid "What is Movim?" msgstr "" #: ../system/Widget/widgets/Help/Help.php:34 @@ -813,20 +815,24 @@ msgid "Account successfully created" msgstr "" #: ../system/Widget/widgets/Login/Login.php:83 -msgid "Movim fail to authenticate. You entered wrong data" +msgid "Movim failed to authenticate. You entered wrong data" msgstr "" #: ../system/Widget/widgets/Login/Login.php:91 msgid "Your web browser is too old to use with Movim." msgstr "" +#: ../system/Widget/widgets/Login/Login.php:108 +msgid "Connecting..." +msgstr "" + #: ../system/Widget/widgets/Login/Login.php:110 msgid "Come in!" msgstr "Entra!" #: ../system/Widget/widgets/Login/Login.php:117 #, php-format -msgid "This server host %s accounts" +msgid "This server hosts %s accounts" msgstr "" #: ../system/Widget/widgets/Login/Login.php:122 @@ -837,10 +843,6 @@ msgstr "" msgid "Debug console" msgstr "" -#: ../system/Widget/widgets/Logout/Logout.php:86 -msgid "Logout" -msgstr "Disconnettiti" - #: ../system/Widget/widgets/Notifs/Notifs.php:44 msgid "wants to talk with you" msgstr "" @@ -850,36 +852,36 @@ msgid "Accept" msgstr "" #: ../system/Widget/widgets/Notifs/Notifs.php:62 -#: ../system/Widget/widgets/Notifs/Notifs.php:156 -msgid "Validate" +#: ../system/Widget/widgets/Notifs/Notifs.php:125 +msgid "Add" msgstr "" #: ../system/Widget/widgets/Notifs/Notifs.php:68 msgid "Decline" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:120 +#: ../system/Widget/widgets/Notifs/Notifs.php:119 #, php-format msgid "Contacts (%s)" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:126 -msgid "Add" +#: ../system/Widget/widgets/Notifs/Notifs.php:146 +msgid "Alias" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:147 -msgid "Alias" +#: ../system/Widget/widgets/Notifs/Notifs.php:155 +msgid "Send request" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:163 +#: ../system/Widget/widgets/Notifs/Notifs.php:162 msgid "Cancel" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:88 +#: ../system/Widget/widgets/Profile/Profile.php:74 msgid "No profile yet ?" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:89 +#: ../system/Widget/widgets/Profile/Profile.php:75 #: ../system/Widget/widgets/Vcard/Vcard.php:62 msgid "Create my vCard" msgstr "" diff --git a/i18n/ja.po b/i18n/ja.po index 3c611a08f..bebc8f74a 100644 --- a/i18n/ja.po +++ b/i18n/ja.po @@ -5,10 +5,11 @@ msgid "" msgstr "" "Project-Id-Version: Movim\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-27 21:41+0200\n" +"POT-Creation-Date: 2012-07-18 21:48+0200\n" "PO-Revision-Date: 2011-10-26 21:33+0000\n" "Last-Translator: edhelas \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -57,12 +58,12 @@ msgstr "" #: ../install/index.php:169 #, php-format -msgid "Bosh connection failed with error `%s'" +msgid "Bosh connection failed with error '%s'" msgstr "" #: ../install/index.php:178 #, php-format -msgid "XMPP connection through Bosh failed with error `%s'" +msgid "XMPP connection through Bosh failed with error '%s'" msgstr "" #: ../install/index.php:224 ../install/index.php:228 ../install/index.php:232 @@ -77,7 +78,7 @@ msgstr "「%s」の設定ファイルをクリエートできませんでした #: ../install/index.php:283 #, php-format -msgid "Database connection failed with error `%s'" +msgid "Database connection failed with error '%s'" msgstr "" #: ../install/part1.php:29 @@ -85,8 +86,7 @@ msgid "Thank you for downloading Movim!" msgstr "" #: ../install/part1.php:30 -msgid "" -"Before you enjoy your social network, a few adjustements are required." +msgid "Before you enjoy your social network, a few adjustements are required." msgstr "" #: ../install/part1.php:31 @@ -108,7 +108,9 @@ msgstr "両立テスト" msgid "" "The following requirements were not met. Please make sure they are all " "satisfied in order to install Movim." -msgstr "次の条件は認めませんでした。Movimをインストールするためには、全部認めるようにしてください。" +msgstr "" +"次の条件は認めませんでした。Movimをインストールするためには、全部認めるように" +"してください。" #: ../install/part1.php:52 msgid "" @@ -175,9 +177,9 @@ msgid "Please remove the %s folder in order to complete the installation" msgstr "" #: ../system/Conf.php:38 -#, php-format -msgid "Cannot load element value'%s'" -msgstr "" +#, fuzzy, php-format +msgid "Cannot load element value '%s'" +msgstr "'%s'というファイルをロードできない" #: ../system/Conf.php:49 #, php-format @@ -197,10 +199,6 @@ msgstr "JIDは備われていない" msgid "jid '%s' is incorrect" msgstr "'%s'というJIDは正しくない" -#: ../system/Jabber.php:147 ../system/Widget/widgets/Login/Login.php:108 -msgid "Connecting..." -msgstr "" - #: ../system/Logger.php:27 #, php-format msgid "Cannot open log file '%s'" @@ -348,104 +346,124 @@ msgstr "" msgid "Civil Union" msgstr "" +#: ../system/Utils.php:219 ../system/Widget/widgets/Chat/Chat.php:40 +msgid "Online" +msgstr "" + +#: ../system/Utils.php:220 ../system/Widget/widgets/Chat/Chat.php:41 +msgid "Away" +msgstr "アウェイ" + +#: ../system/Utils.php:221 ../system/Widget/widgets/Chat/Chat.php:42 +msgid "Do Not Disturb" +msgstr "" + +#: ../system/Utils.php:222 ../system/Widget/widgets/Chat/Chat.php:43 +msgid "Extended Away" +msgstr "" + +#: ../system/Utils.php:223 +msgid "Logout" +msgstr "ログアウト" + #: ../system/Controller/ControllerMain.php:40 #, php-format msgid "%s - Welcome to Movim" msgstr "%s - MOVIMへようこそ" #: ../system/Controller/ControllerMain.php:41 -#: ../system/Controller/ControllerMain.php:75 -#: ../system/Controller/ControllerMain.php:99 -#: ../system/Controller/ControllerMain.php:119 -#: ../system/Controller/ControllerMain.php:151 -#: ../system/Controller/ControllerMain.php:167 -#: ../system/Controller/ControllerMain.php:186 -#: ../system/Controller/ControllerMain.php:215 +#: ../system/Controller/ControllerMain.php:71 +#: ../system/Controller/ControllerMain.php:94 +#: ../system/Controller/ControllerMain.php:114 +#: ../system/Controller/ControllerMain.php:146 +#: ../system/Controller/ControllerMain.php:162 +#: ../system/Controller/ControllerMain.php:181 +#: ../system/Controller/ControllerMain.php:210 msgid "Home" msgstr "ホーム" #: ../system/Controller/ControllerMain.php:42 -#: ../system/Controller/ControllerMain.php:78 -#: ../system/Controller/ControllerMain.php:100 -#: ../system/Controller/ControllerMain.php:120 -#: ../system/Controller/ControllerMain.php:216 +#: ../system/Controller/ControllerMain.php:73 +#: ../system/Controller/ControllerMain.php:95 +#: ../system/Controller/ControllerMain.php:115 +#: ../system/Controller/ControllerMain.php:211 #: ../system/Widget/widgets/ContactCard/ContactCard.php:175 msgid "Profile" msgstr "プロフィール" #: ../system/Controller/ControllerMain.php:43 -#: ../system/Controller/ControllerMain.php:79 -#: ../system/Controller/ControllerMain.php:101 -#: ../system/Controller/ControllerMain.php:121 -#: ../system/Controller/ControllerMain.php:217 +#: ../system/Controller/ControllerMain.php:74 +#: ../system/Controller/ControllerMain.php:96 +#: ../system/Controller/ControllerMain.php:116 +#: ../system/Controller/ControllerMain.php:212 msgid "Configuration" msgstr "設定" #: ../system/Controller/ControllerMain.php:44 -#: ../system/Controller/ControllerMain.php:80 -#: ../system/Controller/ControllerMain.php:102 -#: ../system/Controller/ControllerMain.php:122 -#: ../system/Controller/ControllerMain.php:218 +#: ../system/Controller/ControllerMain.php:75 +#: ../system/Controller/ControllerMain.php:97 +#: ../system/Controller/ControllerMain.php:117 +#: ../system/Controller/ControllerMain.php:213 msgid "Help" msgstr "" -#: ../system/Controller/ControllerMain.php:98 +#: ../system/Controller/ControllerMain.php:93 #, php-format msgid "%s - Configuration" msgstr "%s - 設定" -#: ../system/Controller/ControllerMain.php:118 +#: ../system/Controller/ControllerMain.php:113 #, php-format msgid "%s - Profile" msgstr "" -#: ../system/Controller/ControllerMain.php:150 +#: ../system/Controller/ControllerMain.php:145 #, php-format msgid "%s - Account Creation" msgstr "%s - アカウントの作成" -#: ../system/Controller/ControllerMain.php:152 -#: ../system/Controller/ControllerMain.php:168 +#: ../system/Controller/ControllerMain.php:147 +#: ../system/Controller/ControllerMain.php:163 msgid "Account Creation" msgstr "アカウントの作成" -#: ../system/Controller/ControllerMain.php:166 +#: ../system/Controller/ControllerMain.php:161 #, php-format msgid "%s - Add An Account" msgstr "" -#: ../system/Controller/ControllerMain.php:184 +#: ../system/Controller/ControllerMain.php:179 #, php-format msgid "%s - Login to Movim" msgstr "%s - MOVIMへログインする" -#: ../system/Controller/ControllerMain.php:205 +#: ../system/Controller/ControllerMain.php:200 #, php-format msgid "%s - Help Page" msgstr "" #: ../system/Widget/widgets/Account/Account.php:170 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:100 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:101 msgid "Some data are missing !" msgstr "" #: ../system/Widget/widgets/Account/Account.php:176 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:106 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:107 msgid "Wrong ID" msgstr "" #: ../system/Widget/widgets/Account/Account.php:182 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:112 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:113 msgid "You entered different passwords" msgstr "" #: ../system/Widget/widgets/Account/Account.php:188 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:118 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:119 msgid "Invalid name" msgstr "" #: ../system/Widget/widgets/Account/Account.php:194 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:124 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:125 msgid "Username already taken" msgstr "" @@ -477,7 +495,7 @@ msgid "Only alphanumerics elements are authorized" msgstr "" #: ../system/Widget/widgets/Account/Account.php:236 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:150 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:151 #: ../system/Widget/widgets/Login/Login.php:103 msgid "My address" msgstr "マイアドレス" @@ -499,7 +517,7 @@ msgid "Example :" msgstr "" #: ../system/Widget/widgets/Account/Account.php:249 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:159 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:160 #: ../system/Widget/widgets/Login/Login.php:105 msgid "Password" msgstr "パスワード" @@ -509,7 +527,7 @@ msgid "Same here !" msgstr "" #: ../system/Widget/widgets/Account/Account.php:261 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:169 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:170 msgid "Retype" msgstr "" @@ -518,38 +536,18 @@ msgid "Pseudo" msgstr "" #: ../system/Widget/widgets/Account/Account.php:280 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:177 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:178 msgid "Create" msgstr "" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:130 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:131 msgid "XMPP Domain error, your account is not a correct Jabber ID" msgstr "" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:143 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:144 msgid "Add your login informations" msgstr "" -#: ../system/Widget/widgets/Chat/Chat.php:40 -#: ../system/Widget/widgets/Logout/Logout.php:82 -msgid "Online" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:41 -#: ../system/Widget/widgets/Logout/Logout.php:83 -msgid "Away" -msgstr "アウェイ" - -#: ../system/Widget/widgets/Chat/Chat.php:42 -#: ../system/Widget/widgets/Logout/Logout.php:84 -msgid "Do Not Disturb" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:43 -#: ../system/Widget/widgets/Logout/Logout.php:85 -msgid "Extended Away" -msgstr "" - #: ../system/Widget/widgets/Chat/Chat.php:44 msgid "Offline" msgstr "" @@ -563,8 +561,8 @@ msgid "Language" msgstr "言語" #: ../system/Widget/widgets/Config/Config.php:59 -#: ../system/Widget/widgets/Feed/Feed.php:144 -#: ../system/Widget/widgets/Feed/Feed.php:155 +#: ../system/Widget/widgets/Feed/Feed.php:138 +#: ../system/Widget/widgets/Feed/Feed.php:142 #: ../system/Widget/widgets/Vcard/Vcard.php:179 msgid "Submit" msgstr "送る" @@ -575,23 +573,27 @@ msgid "Reset" msgstr "リセット" #: ../system/Widget/widgets/ContactCard/ContactCard.php:61 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:164 msgid "Remove this contact" msgstr "このコンタクトを削除する" #: ../system/Widget/widgets/ContactCard/ContactCard.php:75 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:192 msgid "No" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:178 msgid "Yes" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:100 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:145 msgid "Chat" msgstr "チャット" #: ../system/Widget/widgets/ContactCard/ContactCard.php:110 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:63 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:71 #: ../system/Widget/widgets/Vcard/Vcard.php:75 msgid "General Informations" msgstr "一般情報" @@ -636,27 +638,28 @@ msgid "Avatar" msgstr "アバター" #: ../system/Widget/widgets/ContactCard/ContactCard.php:129 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:96 #: ../system/Widget/widgets/Vcard/Vcard.php:160 msgid "About Me" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:138 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:111 msgid "Bot" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:139 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:89 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:112 msgid "Desktop" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:140 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:90 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:113 msgid "Phone" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:149 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:106 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:129 msgid "Client Informations" msgstr "" @@ -668,6 +671,14 @@ msgstr "" msgid "Client Type" msgstr "" +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:132 +msgid "Actions" +msgstr "" + +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:202 +msgid "Invite this user" +msgstr "" + #: ../system/Widget/widgets/Feed/Feed.php:43 msgid "Loading your feed ..." msgstr "" @@ -691,23 +702,16 @@ msgid "" "feeds" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:134 -#: ../system/Widget/widgets/Feed/Feed.php:137 -#: ../system/Widget/widgets/Feed/Feed.php:148 -#: ../system/Widget/widgets/Feed/Feed.php:151 -msgid "What's new ?" -msgstr "" - -#: ../system/Widget/widgets/Feed/Feed.php:166 +#: ../system/Widget/widgets/Feed/Feed.php:154 msgid "All" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:167 +#: ../system/Widget/widgets/Feed/Feed.php:155 msgid "My Posts" msgstr "" #: ../system/Widget/widgets/Help/Help.php:32 -msgid "What is Movim ?" +msgid "What is Movim?" msgstr "" #: ../system/Widget/widgets/Help/Help.php:34 @@ -813,20 +817,24 @@ msgid "Account successfully created" msgstr "" #: ../system/Widget/widgets/Login/Login.php:83 -msgid "Movim fail to authenticate. You entered wrong data" +msgid "Movim failed to authenticate. You entered wrong data" msgstr "" #: ../system/Widget/widgets/Login/Login.php:91 msgid "Your web browser is too old to use with Movim." msgstr "" +#: ../system/Widget/widgets/Login/Login.php:108 +msgid "Connecting..." +msgstr "" + #: ../system/Widget/widgets/Login/Login.php:110 msgid "Come in!" msgstr "来てください！" #: ../system/Widget/widgets/Login/Login.php:117 #, php-format -msgid "This server host %s accounts" +msgid "This server hosts %s accounts" msgstr "" #: ../system/Widget/widgets/Login/Login.php:122 @@ -837,10 +845,6 @@ msgstr "" msgid "Debug console" msgstr "デバッグコンソール" -#: ../system/Widget/widgets/Logout/Logout.php:86 -msgid "Logout" -msgstr "ログアウト" - #: ../system/Widget/widgets/Notifs/Notifs.php:44 msgid "wants to talk with you" msgstr "はあなたとチャットしたいそうです。" @@ -850,36 +854,36 @@ msgid "Accept" msgstr "承知する" #: ../system/Widget/widgets/Notifs/Notifs.php:62 -#: ../system/Widget/widgets/Notifs/Notifs.php:156 -msgid "Validate" -msgstr "確認する" +#: ../system/Widget/widgets/Notifs/Notifs.php:125 +msgid "Add" +msgstr "" #: ../system/Widget/widgets/Notifs/Notifs.php:68 msgid "Decline" msgstr "断る" -#: ../system/Widget/widgets/Notifs/Notifs.php:120 +#: ../system/Widget/widgets/Notifs/Notifs.php:119 #, php-format msgid "Contacts (%s)" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:126 -msgid "Add" -msgstr "" - -#: ../system/Widget/widgets/Notifs/Notifs.php:147 +#: ../system/Widget/widgets/Notifs/Notifs.php:146 msgid "Alias" msgstr "アリアス" -#: ../system/Widget/widgets/Notifs/Notifs.php:163 +#: ../system/Widget/widgets/Notifs/Notifs.php:155 +msgid "Send request" +msgstr "" + +#: ../system/Widget/widgets/Notifs/Notifs.php:162 msgid "Cancel" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:88 +#: ../system/Widget/widgets/Profile/Profile.php:74 msgid "No profile yet ?" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:89 +#: ../system/Widget/widgets/Profile/Profile.php:75 #: ../system/Widget/widgets/Vcard/Vcard.php:62 msgid "Create my vCard" msgstr "" @@ -922,6 +926,9 @@ msgstr "" msgid "Loading the contact feed ..." msgstr "コンタクトのフィードをロードしています。" +#~ msgid "Validate" +#~ msgstr "確認する" + #~ msgid "MOVIM - Test Client" #~ msgstr "MOVIM - クライアントテスト" diff --git a/i18n/messages.pot b/i18n/messages.pot index 822a27426..e1817f251 100644 --- a/i18n/messages.pot +++ b/i18n/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-27 21:41+0200\n" +"POT-Creation-Date: 2012-07-18 21:48+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -59,12 +59,12 @@ msgstr "" #: ../install/index.php:169 #, php-format -msgid "Bosh connection failed with error `%s'" +msgid "Bosh connection failed with error '%s'" msgstr "" #: ../install/index.php:178 #, php-format -msgid "XMPP connection through Bosh failed with error `%s'" +msgid "XMPP connection through Bosh failed with error '%s'" msgstr "" #: ../install/index.php:224 ../install/index.php:228 ../install/index.php:232 @@ -79,7 +79,7 @@ msgstr "" #: ../install/index.php:283 #, php-format -msgid "Database connection failed with error `%s'" +msgid "Database connection failed with error '%s'" msgstr "" #: ../install/part1.php:29 @@ -177,7 +177,7 @@ msgstr "" #: ../system/Conf.php:38 #, php-format -msgid "Cannot load element value'%s'" +msgid "Cannot load element value '%s'" msgstr "" #: ../system/Conf.php:49 @@ -198,10 +198,6 @@ msgstr "" msgid "jid '%s' is incorrect" msgstr "" -#: ../system/Jabber.php:147 ../system/Widget/widgets/Login/Login.php:108 -msgid "Connecting..." -msgstr "" - #: ../system/Logger.php:27 #, php-format msgid "Cannot open log file '%s'" @@ -349,104 +345,124 @@ msgstr "" msgid "Civil Union" msgstr "" +#: ../system/Utils.php:219 ../system/Widget/widgets/Chat/Chat.php:40 +msgid "Online" +msgstr "" + +#: ../system/Utils.php:220 ../system/Widget/widgets/Chat/Chat.php:41 +msgid "Away" +msgstr "" + +#: ../system/Utils.php:221 ../system/Widget/widgets/Chat/Chat.php:42 +msgid "Do Not Disturb" +msgstr "" + +#: ../system/Utils.php:222 ../system/Widget/widgets/Chat/Chat.php:43 +msgid "Extended Away" +msgstr "" + +#: ../system/Utils.php:223 +msgid "Logout" +msgstr "" + #: ../system/Controller/ControllerMain.php:40 #, php-format msgid "%s - Welcome to Movim" msgstr "" #: ../system/Controller/ControllerMain.php:41 -#: ../system/Controller/ControllerMain.php:75 -#: ../system/Controller/ControllerMain.php:99 -#: ../system/Controller/ControllerMain.php:119 -#: ../system/Controller/ControllerMain.php:151 -#: ../system/Controller/ControllerMain.php:167 -#: ../system/Controller/ControllerMain.php:186 -#: ../system/Controller/ControllerMain.php:215 +#: ../system/Controller/ControllerMain.php:71 +#: ../system/Controller/ControllerMain.php:94 +#: ../system/Controller/ControllerMain.php:114 +#: ../system/Controller/ControllerMain.php:146 +#: ../system/Controller/ControllerMain.php:162 +#: ../system/Controller/ControllerMain.php:181 +#: ../system/Controller/ControllerMain.php:210 msgid "Home" msgstr "" #: ../system/Controller/ControllerMain.php:42 -#: ../system/Controller/ControllerMain.php:78 -#: ../system/Controller/ControllerMain.php:100 -#: ../system/Controller/ControllerMain.php:120 -#: ../system/Controller/ControllerMain.php:216 +#: ../system/Controller/ControllerMain.php:73 +#: ../system/Controller/ControllerMain.php:95 +#: ../system/Controller/ControllerMain.php:115 +#: ../system/Controller/ControllerMain.php:211 #: ../system/Widget/widgets/ContactCard/ContactCard.php:175 msgid "Profile" msgstr "" #: ../system/Controller/ControllerMain.php:43 -#: ../system/Controller/ControllerMain.php:79 -#: ../system/Controller/ControllerMain.php:101 -#: ../system/Controller/ControllerMain.php:121 -#: ../system/Controller/ControllerMain.php:217 +#: ../system/Controller/ControllerMain.php:74 +#: ../system/Controller/ControllerMain.php:96 +#: ../system/Controller/ControllerMain.php:116 +#: ../system/Controller/ControllerMain.php:212 msgid "Configuration" msgstr "" #: ../system/Controller/ControllerMain.php:44 -#: ../system/Controller/ControllerMain.php:80 -#: ../system/Controller/ControllerMain.php:102 -#: ../system/Controller/ControllerMain.php:122 -#: ../system/Controller/ControllerMain.php:218 +#: ../system/Controller/ControllerMain.php:75 +#: ../system/Controller/ControllerMain.php:97 +#: ../system/Controller/ControllerMain.php:117 +#: ../system/Controller/ControllerMain.php:213 msgid "Help" msgstr "" -#: ../system/Controller/ControllerMain.php:98 +#: ../system/Controller/ControllerMain.php:93 #, php-format msgid "%s - Configuration" msgstr "" -#: ../system/Controller/ControllerMain.php:118 +#: ../system/Controller/ControllerMain.php:113 #, php-format msgid "%s - Profile" msgstr "" -#: ../system/Controller/ControllerMain.php:150 +#: ../system/Controller/ControllerMain.php:145 #, php-format msgid "%s - Account Creation" msgstr "" -#: ../system/Controller/ControllerMain.php:152 -#: ../system/Controller/ControllerMain.php:168 +#: ../system/Controller/ControllerMain.php:147 +#: ../system/Controller/ControllerMain.php:163 msgid "Account Creation" msgstr "" -#: ../system/Controller/ControllerMain.php:166 +#: ../system/Controller/ControllerMain.php:161 #, php-format msgid "%s - Add An Account" msgstr "" -#: ../system/Controller/ControllerMain.php:184 +#: ../system/Controller/ControllerMain.php:179 #, php-format msgid "%s - Login to Movim" msgstr "" -#: ../system/Controller/ControllerMain.php:205 +#: ../system/Controller/ControllerMain.php:200 #, php-format msgid "%s - Help Page" msgstr "" #: ../system/Widget/widgets/Account/Account.php:170 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:100 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:101 msgid "Some data are missing !" msgstr "" #: ../system/Widget/widgets/Account/Account.php:176 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:106 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:107 msgid "Wrong ID" msgstr "" #: ../system/Widget/widgets/Account/Account.php:182 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:112 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:113 msgid "You entered different passwords" msgstr "" #: ../system/Widget/widgets/Account/Account.php:188 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:118 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:119 msgid "Invalid name" msgstr "" #: ../system/Widget/widgets/Account/Account.php:194 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:124 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:125 msgid "Username already taken" msgstr "" @@ -478,7 +494,7 @@ msgid "Only alphanumerics elements are authorized" msgstr "" #: ../system/Widget/widgets/Account/Account.php:236 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:150 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:151 #: ../system/Widget/widgets/Login/Login.php:103 msgid "My address" msgstr "" @@ -500,7 +516,7 @@ msgid "Example :" msgstr "" #: ../system/Widget/widgets/Account/Account.php:249 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:159 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:160 #: ../system/Widget/widgets/Login/Login.php:105 msgid "Password" msgstr "" @@ -510,7 +526,7 @@ msgid "Same here !" msgstr "" #: ../system/Widget/widgets/Account/Account.php:261 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:169 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:170 msgid "Retype" msgstr "" @@ -519,38 +535,18 @@ msgid "Pseudo" msgstr "" #: ../system/Widget/widgets/Account/Account.php:280 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:177 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:178 msgid "Create" msgstr "" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:130 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:131 msgid "XMPP Domain error, your account is not a correct Jabber ID" msgstr "" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:143 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:144 msgid "Add your login informations" msgstr "" -#: ../system/Widget/widgets/Chat/Chat.php:40 -#: ../system/Widget/widgets/Logout/Logout.php:82 -msgid "Online" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:41 -#: ../system/Widget/widgets/Logout/Logout.php:83 -msgid "Away" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:42 -#: ../system/Widget/widgets/Logout/Logout.php:84 -msgid "Do Not Disturb" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:43 -#: ../system/Widget/widgets/Logout/Logout.php:85 -msgid "Extended Away" -msgstr "" - #: ../system/Widget/widgets/Chat/Chat.php:44 msgid "Offline" msgstr "" @@ -564,8 +560,8 @@ msgid "Language" msgstr "" #: ../system/Widget/widgets/Config/Config.php:59 -#: ../system/Widget/widgets/Feed/Feed.php:144 -#: ../system/Widget/widgets/Feed/Feed.php:155 +#: ../system/Widget/widgets/Feed/Feed.php:138 +#: ../system/Widget/widgets/Feed/Feed.php:142 #: ../system/Widget/widgets/Vcard/Vcard.php:179 msgid "Submit" msgstr "" @@ -576,23 +572,27 @@ msgid "Reset" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:61 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:164 msgid "Remove this contact" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:75 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:192 msgid "No" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:178 msgid "Yes" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:100 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:145 msgid "Chat" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:110 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:63 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:71 #: ../system/Widget/widgets/Vcard/Vcard.php:75 msgid "General Informations" msgstr "" @@ -637,27 +637,28 @@ msgid "Avatar" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:129 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:96 #: ../system/Widget/widgets/Vcard/Vcard.php:160 msgid "About Me" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:138 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:111 msgid "Bot" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:139 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:89 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:112 msgid "Desktop" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:140 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:90 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:113 msgid "Phone" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:149 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:106 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:129 msgid "Client Informations" msgstr "" @@ -669,6 +670,14 @@ msgstr "" msgid "Client Type" msgstr "" +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:132 +msgid "Actions" +msgstr "" + +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:202 +msgid "Invite this user" +msgstr "" + #: ../system/Widget/widgets/Feed/Feed.php:43 msgid "Loading your feed ..." msgstr "" @@ -692,23 +701,16 @@ msgid "" "feeds" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:134 -#: ../system/Widget/widgets/Feed/Feed.php:137 -#: ../system/Widget/widgets/Feed/Feed.php:148 -#: ../system/Widget/widgets/Feed/Feed.php:151 -msgid "What's new ?" -msgstr "" - -#: ../system/Widget/widgets/Feed/Feed.php:166 +#: ../system/Widget/widgets/Feed/Feed.php:154 msgid "All" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:167 +#: ../system/Widget/widgets/Feed/Feed.php:155 msgid "My Posts" msgstr "" #: ../system/Widget/widgets/Help/Help.php:32 -msgid "What is Movim ?" +msgid "What is Movim?" msgstr "" #: ../system/Widget/widgets/Help/Help.php:34 @@ -814,20 +816,24 @@ msgid "Account successfully created" msgstr "" #: ../system/Widget/widgets/Login/Login.php:83 -msgid "Movim fail to authenticate. You entered wrong data" +msgid "Movim failed to authenticate. You entered wrong data" msgstr "" #: ../system/Widget/widgets/Login/Login.php:91 msgid "Your web browser is too old to use with Movim." msgstr "" +#: ../system/Widget/widgets/Login/Login.php:108 +msgid "Connecting..." +msgstr "" + #: ../system/Widget/widgets/Login/Login.php:110 msgid "Come in!" msgstr "" #: ../system/Widget/widgets/Login/Login.php:117 #, php-format -msgid "This server host %s accounts" +msgid "This server hosts %s accounts" msgstr "" #: ../system/Widget/widgets/Login/Login.php:122 @@ -838,10 +844,6 @@ msgstr "" msgid "Debug console" msgstr "" -#: ../system/Widget/widgets/Logout/Logout.php:86 -msgid "Logout" -msgstr "" - #: ../system/Widget/widgets/Notifs/Notifs.php:44 msgid "wants to talk with you" msgstr "" @@ -851,36 +853,36 @@ msgid "Accept" msgstr "" #: ../system/Widget/widgets/Notifs/Notifs.php:62 -#: ../system/Widget/widgets/Notifs/Notifs.php:156 -msgid "Validate" +#: ../system/Widget/widgets/Notifs/Notifs.php:125 +msgid "Add" msgstr "" #: ../system/Widget/widgets/Notifs/Notifs.php:68 msgid "Decline" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:120 +#: ../system/Widget/widgets/Notifs/Notifs.php:119 #, php-format msgid "Contacts (%s)" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:126 -msgid "Add" +#: ../system/Widget/widgets/Notifs/Notifs.php:146 +msgid "Alias" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:147 -msgid "Alias" +#: ../system/Widget/widgets/Notifs/Notifs.php:155 +msgid "Send request" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:163 +#: ../system/Widget/widgets/Notifs/Notifs.php:162 msgid "Cancel" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:88 +#: ../system/Widget/widgets/Profile/Profile.php:74 msgid "No profile yet ?" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:89 +#: ../system/Widget/widgets/Profile/Profile.php:75 #: ../system/Widget/widgets/Vcard/Vcard.php:62 msgid "Create my vCard" msgstr "" diff --git a/i18n/nl.po b/i18n/nl.po index d7d86d280..1e7c38e4f 100644 --- a/i18n/nl.po +++ b/i18n/nl.po @@ -5,10 +5,11 @@ msgid "" msgstr "" "Project-Id-Version: Movim\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-27 21:41+0200\n" +"POT-Creation-Date: 2012-07-18 21:48+0200\n" "PO-Revision-Date: 2011-10-13 19:51+0000\n" "Last-Translator: edhelas \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -57,12 +58,12 @@ msgstr "" #: ../install/index.php:169 #, php-format -msgid "Bosh connection failed with error `%s'" +msgid "Bosh connection failed with error '%s'" msgstr "" #: ../install/index.php:178 #, php-format -msgid "XMPP connection through Bosh failed with error `%s'" +msgid "XMPP connection through Bosh failed with error '%s'" msgstr "" #: ../install/index.php:224 ../install/index.php:228 ../install/index.php:232 @@ -77,7 +78,7 @@ msgstr "" #: ../install/index.php:283 #, php-format -msgid "Database connection failed with error `%s'" +msgid "Database connection failed with error '%s'" msgstr "" #: ../install/part1.php:29 @@ -85,8 +86,7 @@ msgid "Thank you for downloading Movim!" msgstr "" #: ../install/part1.php:30 -msgid "" -"Before you enjoy your social network, a few adjustements are required." +msgid "Before you enjoy your social network, a few adjustements are required." msgstr "" #: ../install/part1.php:31 @@ -177,9 +177,9 @@ msgid "Please remove the %s folder in order to complete the installation" msgstr "" #: ../system/Conf.php:38 -#, php-format -msgid "Cannot load element value'%s'" -msgstr "" +#, fuzzy, php-format +msgid "Cannot load element value '%s'" +msgstr "Kan bestand %s niet laden" #: ../system/Conf.php:49 #, php-format @@ -199,10 +199,6 @@ msgstr "JID was niet gegeven" msgid "jid '%s' is incorrect" msgstr "jid '%s' is niet correct" -#: ../system/Jabber.php:147 ../system/Widget/widgets/Login/Login.php:108 -msgid "Connecting..." -msgstr "" - #: ../system/Logger.php:27 #, php-format msgid "Cannot open log file '%s'" @@ -350,104 +346,124 @@ msgstr "" msgid "Civil Union" msgstr "" +#: ../system/Utils.php:219 ../system/Widget/widgets/Chat/Chat.php:40 +msgid "Online" +msgstr "" + +#: ../system/Utils.php:220 ../system/Widget/widgets/Chat/Chat.php:41 +msgid "Away" +msgstr "Weg" + +#: ../system/Utils.php:221 ../system/Widget/widgets/Chat/Chat.php:42 +msgid "Do Not Disturb" +msgstr "" + +#: ../system/Utils.php:222 ../system/Widget/widgets/Chat/Chat.php:43 +msgid "Extended Away" +msgstr "" + +#: ../system/Utils.php:223 +msgid "Logout" +msgstr "Logout" + #: ../system/Controller/ControllerMain.php:40 #, php-format msgid "%s - Welcome to Movim" msgstr "%s - Welkom bij Movim" #: ../system/Controller/ControllerMain.php:41 -#: ../system/Controller/ControllerMain.php:75 -#: ../system/Controller/ControllerMain.php:99 -#: ../system/Controller/ControllerMain.php:119 -#: ../system/Controller/ControllerMain.php:151 -#: ../system/Controller/ControllerMain.php:167 -#: ../system/Controller/ControllerMain.php:186 -#: ../system/Controller/ControllerMain.php:215 +#: ../system/Controller/ControllerMain.php:71 +#: ../system/Controller/ControllerMain.php:94 +#: ../system/Controller/ControllerMain.php:114 +#: ../system/Controller/ControllerMain.php:146 +#: ../system/Controller/ControllerMain.php:162 +#: ../system/Controller/ControllerMain.php:181 +#: ../system/Controller/ControllerMain.php:210 msgid "Home" msgstr "Home" #: ../system/Controller/ControllerMain.php:42 -#: ../system/Controller/ControllerMain.php:78 -#: ../system/Controller/ControllerMain.php:100 -#: ../system/Controller/ControllerMain.php:120 -#: ../system/Controller/ControllerMain.php:216 +#: ../system/Controller/ControllerMain.php:73 +#: ../system/Controller/ControllerMain.php:95 +#: ../system/Controller/ControllerMain.php:115 +#: ../system/Controller/ControllerMain.php:211 #: ../system/Widget/widgets/ContactCard/ContactCard.php:175 msgid "Profile" msgstr "Profiel" #: ../system/Controller/ControllerMain.php:43 -#: ../system/Controller/ControllerMain.php:79 -#: ../system/Controller/ControllerMain.php:101 -#: ../system/Controller/ControllerMain.php:121 -#: ../system/Controller/ControllerMain.php:217 +#: ../system/Controller/ControllerMain.php:74 +#: ../system/Controller/ControllerMain.php:96 +#: ../system/Controller/ControllerMain.php:116 +#: ../system/Controller/ControllerMain.php:212 msgid "Configuration" msgstr "Configuratie" #: ../system/Controller/ControllerMain.php:44 -#: ../system/Controller/ControllerMain.php:80 -#: ../system/Controller/ControllerMain.php:102 -#: ../system/Controller/ControllerMain.php:122 -#: ../system/Controller/ControllerMain.php:218 +#: ../system/Controller/ControllerMain.php:75 +#: ../system/Controller/ControllerMain.php:97 +#: ../system/Controller/ControllerMain.php:117 +#: ../system/Controller/ControllerMain.php:213 msgid "Help" msgstr "" -#: ../system/Controller/ControllerMain.php:98 +#: ../system/Controller/ControllerMain.php:93 #, php-format msgid "%s - Configuration" msgstr "" -#: ../system/Controller/ControllerMain.php:118 +#: ../system/Controller/ControllerMain.php:113 #, php-format msgid "%s - Profile" msgstr "" -#: ../system/Controller/ControllerMain.php:150 +#: ../system/Controller/ControllerMain.php:145 #, php-format msgid "%s - Account Creation" msgstr "%s - account aanmaken" -#: ../system/Controller/ControllerMain.php:152 -#: ../system/Controller/ControllerMain.php:168 +#: ../system/Controller/ControllerMain.php:147 +#: ../system/Controller/ControllerMain.php:163 msgid "Account Creation" msgstr "Account aanmaken" -#: ../system/Controller/ControllerMain.php:166 +#: ../system/Controller/ControllerMain.php:161 #, php-format msgid "%s - Add An Account" msgstr "" -#: ../system/Controller/ControllerMain.php:184 +#: ../system/Controller/ControllerMain.php:179 #, php-format msgid "%s - Login to Movim" msgstr "%s - Inlogging bij Movim" -#: ../system/Controller/ControllerMain.php:205 +#: ../system/Controller/ControllerMain.php:200 #, php-format msgid "%s - Help Page" msgstr "" #: ../system/Widget/widgets/Account/Account.php:170 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:100 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:101 msgid "Some data are missing !" msgstr "" #: ../system/Widget/widgets/Account/Account.php:176 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:106 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:107 msgid "Wrong ID" msgstr "" #: ../system/Widget/widgets/Account/Account.php:182 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:112 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:113 msgid "You entered different passwords" msgstr "" #: ../system/Widget/widgets/Account/Account.php:188 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:118 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:119 msgid "Invalid name" msgstr "" #: ../system/Widget/widgets/Account/Account.php:194 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:124 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:125 msgid "Username already taken" msgstr "" @@ -479,7 +495,7 @@ msgid "Only alphanumerics elements are authorized" msgstr "" #: ../system/Widget/widgets/Account/Account.php:236 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:150 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:151 #: ../system/Widget/widgets/Login/Login.php:103 msgid "My address" msgstr "Mijn adres" @@ -501,7 +517,7 @@ msgid "Example :" msgstr "" #: ../system/Widget/widgets/Account/Account.php:249 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:159 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:160 #: ../system/Widget/widgets/Login/Login.php:105 msgid "Password" msgstr "Wachtwoord" @@ -511,7 +527,7 @@ msgid "Same here !" msgstr "" #: ../system/Widget/widgets/Account/Account.php:261 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:169 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:170 msgid "Retype" msgstr "" @@ -520,38 +536,18 @@ msgid "Pseudo" msgstr "" #: ../system/Widget/widgets/Account/Account.php:280 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:177 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:178 msgid "Create" msgstr "" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:130 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:131 msgid "XMPP Domain error, your account is not a correct Jabber ID" msgstr "" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:143 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:144 msgid "Add your login informations" msgstr "" -#: ../system/Widget/widgets/Chat/Chat.php:40 -#: ../system/Widget/widgets/Logout/Logout.php:82 -msgid "Online" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:41 -#: ../system/Widget/widgets/Logout/Logout.php:83 -msgid "Away" -msgstr "Weg" - -#: ../system/Widget/widgets/Chat/Chat.php:42 -#: ../system/Widget/widgets/Logout/Logout.php:84 -msgid "Do Not Disturb" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:43 -#: ../system/Widget/widgets/Logout/Logout.php:85 -msgid "Extended Away" -msgstr "" - #: ../system/Widget/widgets/Chat/Chat.php:44 msgid "Offline" msgstr "" @@ -565,8 +561,8 @@ msgid "Language" msgstr "Taal" #: ../system/Widget/widgets/Config/Config.php:59 -#: ../system/Widget/widgets/Feed/Feed.php:144 -#: ../system/Widget/widgets/Feed/Feed.php:155 +#: ../system/Widget/widgets/Feed/Feed.php:138 +#: ../system/Widget/widgets/Feed/Feed.php:142 #: ../system/Widget/widgets/Vcard/Vcard.php:179 msgid "Submit" msgstr "Zenden" @@ -577,23 +573,27 @@ msgid "Reset" msgstr "Reset" #: ../system/Widget/widgets/ContactCard/ContactCard.php:61 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:164 msgid "Remove this contact" msgstr "Verwijder dit contact" #: ../system/Widget/widgets/ContactCard/ContactCard.php:75 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:192 msgid "No" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:178 msgid "Yes" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:100 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:145 msgid "Chat" msgstr "Chat" #: ../system/Widget/widgets/ContactCard/ContactCard.php:110 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:63 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:71 #: ../system/Widget/widgets/Vcard/Vcard.php:75 msgid "General Informations" msgstr "Algemene informatie" @@ -638,27 +638,28 @@ msgid "Avatar" msgstr "Avatar" #: ../system/Widget/widgets/ContactCard/ContactCard.php:129 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:96 #: ../system/Widget/widgets/Vcard/Vcard.php:160 msgid "About Me" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:138 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:111 msgid "Bot" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:139 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:89 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:112 msgid "Desktop" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:140 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:90 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:113 msgid "Phone" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:149 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:106 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:129 msgid "Client Informations" msgstr "" @@ -670,6 +671,14 @@ msgstr "" msgid "Client Type" msgstr "" +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:132 +msgid "Actions" +msgstr "" + +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:202 +msgid "Invite this user" +msgstr "" + #: ../system/Widget/widgets/Feed/Feed.php:43 msgid "Loading your feed ..." msgstr "" @@ -693,23 +702,16 @@ msgid "" "feeds" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:134 -#: ../system/Widget/widgets/Feed/Feed.php:137 -#: ../system/Widget/widgets/Feed/Feed.php:148 -#: ../system/Widget/widgets/Feed/Feed.php:151 -msgid "What's new ?" -msgstr "" - -#: ../system/Widget/widgets/Feed/Feed.php:166 +#: ../system/Widget/widgets/Feed/Feed.php:154 msgid "All" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:167 +#: ../system/Widget/widgets/Feed/Feed.php:155 msgid "My Posts" msgstr "" #: ../system/Widget/widgets/Help/Help.php:32 -msgid "What is Movim ?" +msgid "What is Movim?" msgstr "" #: ../system/Widget/widgets/Help/Help.php:34 @@ -815,20 +817,24 @@ msgid "Account successfully created" msgstr "" #: ../system/Widget/widgets/Login/Login.php:83 -msgid "Movim fail to authenticate. You entered wrong data" +msgid "Movim failed to authenticate. You entered wrong data" msgstr "" #: ../system/Widget/widgets/Login/Login.php:91 msgid "Your web browser is too old to use with Movim." msgstr "" +#: ../system/Widget/widgets/Login/Login.php:108 +msgid "Connecting..." +msgstr "" + #: ../system/Widget/widgets/Login/Login.php:110 msgid "Come in!" msgstr "Kom in!" #: ../system/Widget/widgets/Login/Login.php:117 #, php-format -msgid "This server host %s accounts" +msgid "This server hosts %s accounts" msgstr "" #: ../system/Widget/widgets/Login/Login.php:122 @@ -839,10 +845,6 @@ msgstr "" msgid "Debug console" msgstr "Debug console" -#: ../system/Widget/widgets/Logout/Logout.php:86 -msgid "Logout" -msgstr "Logout" - #: ../system/Widget/widgets/Notifs/Notifs.php:44 msgid "wants to talk with you" msgstr "wil met u praten" @@ -852,36 +854,36 @@ msgid "Accept" msgstr "Accepteer" #: ../system/Widget/widgets/Notifs/Notifs.php:62 -#: ../system/Widget/widgets/Notifs/Notifs.php:156 -msgid "Validate" -msgstr "Valideren" +#: ../system/Widget/widgets/Notifs/Notifs.php:125 +msgid "Add" +msgstr "" #: ../system/Widget/widgets/Notifs/Notifs.php:68 msgid "Decline" msgstr "Weigeren" -#: ../system/Widget/widgets/Notifs/Notifs.php:120 +#: ../system/Widget/widgets/Notifs/Notifs.php:119 #, php-format msgid "Contacts (%s)" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:126 -msgid "Add" -msgstr "" - -#: ../system/Widget/widgets/Notifs/Notifs.php:147 +#: ../system/Widget/widgets/Notifs/Notifs.php:146 msgid "Alias" msgstr "Alias" -#: ../system/Widget/widgets/Notifs/Notifs.php:163 +#: ../system/Widget/widgets/Notifs/Notifs.php:155 +msgid "Send request" +msgstr "" + +#: ../system/Widget/widgets/Notifs/Notifs.php:162 msgid "Cancel" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:88 +#: ../system/Widget/widgets/Profile/Profile.php:74 msgid "No profile yet ?" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:89 +#: ../system/Widget/widgets/Profile/Profile.php:75 #: ../system/Widget/widgets/Vcard/Vcard.php:62 msgid "Create my vCard" msgstr "" @@ -924,6 +926,9 @@ msgstr "" msgid "Loading the contact feed ..." msgstr "Laad de gebruiker feed" +#~ msgid "Validate" +#~ msgstr "Valideren" + #~ msgid "MOVIM - Test Client" #~ msgstr "MOVIM - Test klant" diff --git a/i18n/no.po b/i18n/no.po index de70813a3..fedc7777d 100644 --- a/i18n/no.po +++ b/i18n/no.po @@ -5,10 +5,11 @@ msgid "" msgstr "" "Project-Id-Version: Movim\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-27 21:41+0200\n" +"POT-Creation-Date: 2012-07-18 21:48+0200\n" "PO-Revision-Date: 2011-10-26 21:34+0000\n" "Last-Translator: edhelas \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -57,12 +58,12 @@ msgstr "" #: ../install/index.php:169 #, php-format -msgid "Bosh connection failed with error `%s'" +msgid "Bosh connection failed with error '%s'" msgstr "" #: ../install/index.php:178 #, php-format -msgid "XMPP connection through Bosh failed with error `%s'" +msgid "XMPP connection through Bosh failed with error '%s'" msgstr "" #: ../install/index.php:224 ../install/index.php:228 ../install/index.php:232 @@ -77,7 +78,7 @@ msgstr "" #: ../install/index.php:283 #, php-format -msgid "Database connection failed with error `%s'" +msgid "Database connection failed with error '%s'" msgstr "" #: ../install/part1.php:29 @@ -85,8 +86,7 @@ msgid "Thank you for downloading Movim!" msgstr "" #: ../install/part1.php:30 -msgid "" -"Before you enjoy your social network, a few adjustements are required." +msgid "Before you enjoy your social network, a few adjustements are required." msgstr "" #: ../install/part1.php:31 @@ -176,7 +176,7 @@ msgstr "" #: ../system/Conf.php:38 #, php-format -msgid "Cannot load element value'%s'" +msgid "Cannot load element value '%s'" msgstr "" #: ../system/Conf.php:49 @@ -197,10 +197,6 @@ msgstr "" msgid "jid '%s' is incorrect" msgstr "" -#: ../system/Jabber.php:147 ../system/Widget/widgets/Login/Login.php:108 -msgid "Connecting..." -msgstr "" - #: ../system/Logger.php:27 #, php-format msgid "Cannot open log file '%s'" @@ -348,104 +344,124 @@ msgstr "" msgid "Civil Union" msgstr "" +#: ../system/Utils.php:219 ../system/Widget/widgets/Chat/Chat.php:40 +msgid "Online" +msgstr "" + +#: ../system/Utils.php:220 ../system/Widget/widgets/Chat/Chat.php:41 +msgid "Away" +msgstr "Borte" + +#: ../system/Utils.php:221 ../system/Widget/widgets/Chat/Chat.php:42 +msgid "Do Not Disturb" +msgstr "" + +#: ../system/Utils.php:222 ../system/Widget/widgets/Chat/Chat.php:43 +msgid "Extended Away" +msgstr "" + +#: ../system/Utils.php:223 +msgid "Logout" +msgstr "" + #: ../system/Controller/ControllerMain.php:40 #, php-format msgid "%s - Welcome to Movim" msgstr "%s - Velkommen til Movim" #: ../system/Controller/ControllerMain.php:41 -#: ../system/Controller/ControllerMain.php:75 -#: ../system/Controller/ControllerMain.php:99 -#: ../system/Controller/ControllerMain.php:119 -#: ../system/Controller/ControllerMain.php:151 -#: ../system/Controller/ControllerMain.php:167 -#: ../system/Controller/ControllerMain.php:186 -#: ../system/Controller/ControllerMain.php:215 +#: ../system/Controller/ControllerMain.php:71 +#: ../system/Controller/ControllerMain.php:94 +#: ../system/Controller/ControllerMain.php:114 +#: ../system/Controller/ControllerMain.php:146 +#: ../system/Controller/ControllerMain.php:162 +#: ../system/Controller/ControllerMain.php:181 +#: ../system/Controller/ControllerMain.php:210 msgid "Home" msgstr "Hjem" #: ../system/Controller/ControllerMain.php:42 -#: ../system/Controller/ControllerMain.php:78 -#: ../system/Controller/ControllerMain.php:100 -#: ../system/Controller/ControllerMain.php:120 -#: ../system/Controller/ControllerMain.php:216 +#: ../system/Controller/ControllerMain.php:73 +#: ../system/Controller/ControllerMain.php:95 +#: ../system/Controller/ControllerMain.php:115 +#: ../system/Controller/ControllerMain.php:211 #: ../system/Widget/widgets/ContactCard/ContactCard.php:175 msgid "Profile" msgstr "Profil" #: ../system/Controller/ControllerMain.php:43 -#: ../system/Controller/ControllerMain.php:79 -#: ../system/Controller/ControllerMain.php:101 -#: ../system/Controller/ControllerMain.php:121 -#: ../system/Controller/ControllerMain.php:217 +#: ../system/Controller/ControllerMain.php:74 +#: ../system/Controller/ControllerMain.php:96 +#: ../system/Controller/ControllerMain.php:116 +#: ../system/Controller/ControllerMain.php:212 msgid "Configuration" msgstr "" #: ../system/Controller/ControllerMain.php:44 -#: ../system/Controller/ControllerMain.php:80 -#: ../system/Controller/ControllerMain.php:102 -#: ../system/Controller/ControllerMain.php:122 -#: ../system/Controller/ControllerMain.php:218 +#: ../system/Controller/ControllerMain.php:75 +#: ../system/Controller/ControllerMain.php:97 +#: ../system/Controller/ControllerMain.php:117 +#: ../system/Controller/ControllerMain.php:213 msgid "Help" msgstr "" -#: ../system/Controller/ControllerMain.php:98 +#: ../system/Controller/ControllerMain.php:93 #, php-format msgid "%s - Configuration" msgstr "" -#: ../system/Controller/ControllerMain.php:118 +#: ../system/Controller/ControllerMain.php:113 #, php-format msgid "%s - Profile" msgstr "" -#: ../system/Controller/ControllerMain.php:150 +#: ../system/Controller/ControllerMain.php:145 #, php-format msgid "%s - Account Creation" msgstr "" -#: ../system/Controller/ControllerMain.php:152 -#: ../system/Controller/ControllerMain.php:168 +#: ../system/Controller/ControllerMain.php:147 +#: ../system/Controller/ControllerMain.php:163 msgid "Account Creation" msgstr "" -#: ../system/Controller/ControllerMain.php:166 +#: ../system/Controller/ControllerMain.php:161 #, php-format msgid "%s - Add An Account" msgstr "" -#: ../system/Controller/ControllerMain.php:184 +#: ../system/Controller/ControllerMain.php:179 #, php-format msgid "%s - Login to Movim" msgstr "%s - Logg in på Movim" -#: ../system/Controller/ControllerMain.php:205 +#: ../system/Controller/ControllerMain.php:200 #, php-format msgid "%s - Help Page" msgstr "" #: ../system/Widget/widgets/Account/Account.php:170 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:100 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:101 msgid "Some data are missing !" msgstr "" #: ../system/Widget/widgets/Account/Account.php:176 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:106 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:107 msgid "Wrong ID" msgstr "" #: ../system/Widget/widgets/Account/Account.php:182 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:112 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:113 msgid "You entered different passwords" msgstr "" #: ../system/Widget/widgets/Account/Account.php:188 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:118 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:119 msgid "Invalid name" msgstr "" #: ../system/Widget/widgets/Account/Account.php:194 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:124 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:125 msgid "Username already taken" msgstr "" @@ -477,7 +493,7 @@ msgid "Only alphanumerics elements are authorized" msgstr "" #: ../system/Widget/widgets/Account/Account.php:236 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:150 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:151 #: ../system/Widget/widgets/Login/Login.php:103 msgid "My address" msgstr "Min adresse" @@ -499,7 +515,7 @@ msgid "Example :" msgstr "" #: ../system/Widget/widgets/Account/Account.php:249 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:159 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:160 #: ../system/Widget/widgets/Login/Login.php:105 msgid "Password" msgstr "Passord" @@ -509,7 +525,7 @@ msgid "Same here !" msgstr "" #: ../system/Widget/widgets/Account/Account.php:261 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:169 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:170 msgid "Retype" msgstr "" @@ -518,38 +534,18 @@ msgid "Pseudo" msgstr "" #: ../system/Widget/widgets/Account/Account.php:280 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:177 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:178 msgid "Create" msgstr "" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:130 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:131 msgid "XMPP Domain error, your account is not a correct Jabber ID" msgstr "" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:143 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:144 msgid "Add your login informations" msgstr "" -#: ../system/Widget/widgets/Chat/Chat.php:40 -#: ../system/Widget/widgets/Logout/Logout.php:82 -msgid "Online" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:41 -#: ../system/Widget/widgets/Logout/Logout.php:83 -msgid "Away" -msgstr "Borte" - -#: ../system/Widget/widgets/Chat/Chat.php:42 -#: ../system/Widget/widgets/Logout/Logout.php:84 -msgid "Do Not Disturb" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:43 -#: ../system/Widget/widgets/Logout/Logout.php:85 -msgid "Extended Away" -msgstr "" - #: ../system/Widget/widgets/Chat/Chat.php:44 msgid "Offline" msgstr "" @@ -563,8 +559,8 @@ msgid "Language" msgstr "Språk" #: ../system/Widget/widgets/Config/Config.php:59 -#: ../system/Widget/widgets/Feed/Feed.php:144 -#: ../system/Widget/widgets/Feed/Feed.php:155 +#: ../system/Widget/widgets/Feed/Feed.php:138 +#: ../system/Widget/widgets/Feed/Feed.php:142 #: ../system/Widget/widgets/Vcard/Vcard.php:179 msgid "Submit" msgstr "" @@ -575,23 +571,27 @@ msgid "Reset" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:61 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:164 msgid "Remove this contact" msgstr "Fjern denne kontakten" #: ../system/Widget/widgets/ContactCard/ContactCard.php:75 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:192 msgid "No" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:178 msgid "Yes" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:100 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:145 msgid "Chat" msgstr "Chat" #: ../system/Widget/widgets/ContactCard/ContactCard.php:110 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:63 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:71 #: ../system/Widget/widgets/Vcard/Vcard.php:75 msgid "General Informations" msgstr "Generell informasjon" @@ -636,27 +636,28 @@ msgid "Avatar" msgstr "Avatar" #: ../system/Widget/widgets/ContactCard/ContactCard.php:129 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:96 #: ../system/Widget/widgets/Vcard/Vcard.php:160 msgid "About Me" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:138 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:111 msgid "Bot" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:139 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:89 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:112 msgid "Desktop" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:140 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:90 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:113 msgid "Phone" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:149 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:106 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:129 msgid "Client Informations" msgstr "" @@ -668,6 +669,14 @@ msgstr "" msgid "Client Type" msgstr "" +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:132 +msgid "Actions" +msgstr "" + +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:202 +msgid "Invite this user" +msgstr "" + #: ../system/Widget/widgets/Feed/Feed.php:43 msgid "Loading your feed ..." msgstr "" @@ -691,23 +700,16 @@ msgid "" "feeds" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:134 -#: ../system/Widget/widgets/Feed/Feed.php:137 -#: ../system/Widget/widgets/Feed/Feed.php:148 -#: ../system/Widget/widgets/Feed/Feed.php:151 -msgid "What's new ?" -msgstr "" - -#: ../system/Widget/widgets/Feed/Feed.php:166 +#: ../system/Widget/widgets/Feed/Feed.php:154 msgid "All" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:167 +#: ../system/Widget/widgets/Feed/Feed.php:155 msgid "My Posts" msgstr "" #: ../system/Widget/widgets/Help/Help.php:32 -msgid "What is Movim ?" +msgid "What is Movim?" msgstr "" #: ../system/Widget/widgets/Help/Help.php:34 @@ -813,20 +815,24 @@ msgid "Account successfully created" msgstr "" #: ../system/Widget/widgets/Login/Login.php:83 -msgid "Movim fail to authenticate. You entered wrong data" +msgid "Movim failed to authenticate. You entered wrong data" msgstr "" #: ../system/Widget/widgets/Login/Login.php:91 msgid "Your web browser is too old to use with Movim." msgstr "" +#: ../system/Widget/widgets/Login/Login.php:108 +msgid "Connecting..." +msgstr "" + #: ../system/Widget/widgets/Login/Login.php:110 msgid "Come in!" msgstr "" #: ../system/Widget/widgets/Login/Login.php:117 #, php-format -msgid "This server host %s accounts" +msgid "This server hosts %s accounts" msgstr "" #: ../system/Widget/widgets/Login/Login.php:122 @@ -837,10 +843,6 @@ msgstr "" msgid "Debug console" msgstr "" -#: ../system/Widget/widgets/Logout/Logout.php:86 -msgid "Logout" -msgstr "" - #: ../system/Widget/widgets/Notifs/Notifs.php:44 msgid "wants to talk with you" msgstr "vil snakke med deg" @@ -850,36 +852,36 @@ msgid "Accept" msgstr "Godta" #: ../system/Widget/widgets/Notifs/Notifs.php:62 -#: ../system/Widget/widgets/Notifs/Notifs.php:156 -msgid "Validate" +#: ../system/Widget/widgets/Notifs/Notifs.php:125 +msgid "Add" msgstr "" #: ../system/Widget/widgets/Notifs/Notifs.php:68 msgid "Decline" msgstr "Avslå" -#: ../system/Widget/widgets/Notifs/Notifs.php:120 +#: ../system/Widget/widgets/Notifs/Notifs.php:119 #, php-format msgid "Contacts (%s)" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:126 -msgid "Add" +#: ../system/Widget/widgets/Notifs/Notifs.php:146 +msgid "Alias" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:147 -msgid "Alias" +#: ../system/Widget/widgets/Notifs/Notifs.php:155 +msgid "Send request" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:163 +#: ../system/Widget/widgets/Notifs/Notifs.php:162 msgid "Cancel" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:88 +#: ../system/Widget/widgets/Profile/Profile.php:74 msgid "No profile yet ?" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:89 +#: ../system/Widget/widgets/Profile/Profile.php:75 #: ../system/Widget/widgets/Vcard/Vcard.php:62 msgid "Create my vCard" msgstr "" diff --git a/i18n/oc.po b/i18n/oc.po index ea3e8cf40..4d48d336a 100644 --- a/i18n/oc.po +++ b/i18n/oc.po @@ -5,10 +5,11 @@ msgid "" msgstr "" "Project-Id-Version: Movim\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-27 21:41+0200\n" +"POT-Creation-Date: 2012-07-18 21:48+0200\n" "PO-Revision-Date: 2012-04-15 08:35+0000\n" "Last-Translator: Cédric VALMARY (Tot en òc) \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -17,8 +18,7 @@ msgstr "" #: ../install/index.php:85 msgid "PHP version mismatch. Movim requires PHP 5.3 minimum." -msgstr "" -"Avètz pas la bona version de PHP. Movim a mestièr al mens de PHP 5.3." +msgstr "Avètz pas la bona version de PHP. Movim a mestièr al mens de PHP 5.3." #: ../install/index.php:85 msgid "Actual version : " @@ -61,12 +61,12 @@ msgstr "o" #: ../install/index.php:169 #, php-format -msgid "Bosh connection failed with error `%s'" +msgid "Bosh connection failed with error '%s'" msgstr "" #: ../install/index.php:178 #, php-format -msgid "XMPP connection through Bosh failed with error `%s'" +msgid "XMPP connection through Bosh failed with error '%s'" msgstr "" #: ../install/index.php:224 ../install/index.php:228 ../install/index.php:232 @@ -81,7 +81,7 @@ msgstr "La creacion del fichièr de configuracion '%s' es impossibla." #: ../install/index.php:283 #, php-format -msgid "Database connection failed with error `%s'" +msgid "Database connection failed with error '%s'" msgstr "" #: ../install/part1.php:29 @@ -89,8 +89,7 @@ msgid "Thank you for downloading Movim!" msgstr "" #: ../install/part1.php:30 -msgid "" -"Before you enjoy your social network, a few adjustements are required." +msgid "Before you enjoy your social network, a few adjustements are required." msgstr "" #: ../install/part1.php:31 @@ -181,8 +180,8 @@ msgid "Please remove the %s folder in order to complete the installation" msgstr "Si vos plai, suprimètz lo dorsièr %s per acabar l'installacion" #: ../system/Conf.php:38 -#, php-format -msgid "Cannot load element value'%s'" +#, fuzzy, php-format +msgid "Cannot load element value '%s'" msgstr "L'element de valor '%s' pòt pas èsser cargat" #: ../system/Conf.php:49 @@ -203,10 +202,6 @@ msgstr "JID indisponible." msgid "jid '%s' is incorrect" msgstr "Lo jid '%s' es incorrècte" -#: ../system/Jabber.php:147 ../system/Widget/widgets/Login/Login.php:108 -msgid "Connecting..." -msgstr "Connexion en cors..." - #: ../system/Logger.php:27 #, php-format msgid "Cannot open log file '%s'" @@ -354,104 +349,124 @@ msgstr "" msgid "Civil Union" msgstr "" +#: ../system/Utils.php:219 ../system/Widget/widgets/Chat/Chat.php:40 +msgid "Online" +msgstr "En linha" + +#: ../system/Utils.php:220 ../system/Widget/widgets/Chat/Chat.php:41 +msgid "Away" +msgstr "Absent(a)" + +#: ../system/Utils.php:221 ../system/Widget/widgets/Chat/Chat.php:42 +msgid "Do Not Disturb" +msgstr "De derengar pas" + +#: ../system/Utils.php:222 ../system/Widget/widgets/Chat/Chat.php:43 +msgid "Extended Away" +msgstr "Abséncia longa" + +#: ../system/Utils.php:223 +msgid "Logout" +msgstr "Acabar la sesilha" + #: ../system/Controller/ControllerMain.php:40 #, php-format msgid "%s - Welcome to Movim" msgstr "%s - Benvengut a MOVIM" #: ../system/Controller/ControllerMain.php:41 -#: ../system/Controller/ControllerMain.php:75 -#: ../system/Controller/ControllerMain.php:99 -#: ../system/Controller/ControllerMain.php:119 -#: ../system/Controller/ControllerMain.php:151 -#: ../system/Controller/ControllerMain.php:167 -#: ../system/Controller/ControllerMain.php:186 -#: ../system/Controller/ControllerMain.php:215 +#: ../system/Controller/ControllerMain.php:71 +#: ../system/Controller/ControllerMain.php:94 +#: ../system/Controller/ControllerMain.php:114 +#: ../system/Controller/ControllerMain.php:146 +#: ../system/Controller/ControllerMain.php:162 +#: ../system/Controller/ControllerMain.php:181 +#: ../system/Controller/ControllerMain.php:210 msgid "Home" msgstr "Acuèlh" #: ../system/Controller/ControllerMain.php:42 -#: ../system/Controller/ControllerMain.php:78 -#: ../system/Controller/ControllerMain.php:100 -#: ../system/Controller/ControllerMain.php:120 -#: ../system/Controller/ControllerMain.php:216 +#: ../system/Controller/ControllerMain.php:73 +#: ../system/Controller/ControllerMain.php:95 +#: ../system/Controller/ControllerMain.php:115 +#: ../system/Controller/ControllerMain.php:211 #: ../system/Widget/widgets/ContactCard/ContactCard.php:175 msgid "Profile" msgstr "Perfil" #: ../system/Controller/ControllerMain.php:43 -#: ../system/Controller/ControllerMain.php:79 -#: ../system/Controller/ControllerMain.php:101 -#: ../system/Controller/ControllerMain.php:121 -#: ../system/Controller/ControllerMain.php:217 +#: ../system/Controller/ControllerMain.php:74 +#: ../system/Controller/ControllerMain.php:96 +#: ../system/Controller/ControllerMain.php:116 +#: ../system/Controller/ControllerMain.php:212 msgid "Configuration" msgstr "Configuracion" #: ../system/Controller/ControllerMain.php:44 -#: ../system/Controller/ControllerMain.php:80 -#: ../system/Controller/ControllerMain.php:102 -#: ../system/Controller/ControllerMain.php:122 -#: ../system/Controller/ControllerMain.php:218 +#: ../system/Controller/ControllerMain.php:75 +#: ../system/Controller/ControllerMain.php:97 +#: ../system/Controller/ControllerMain.php:117 +#: ../system/Controller/ControllerMain.php:213 msgid "Help" msgstr "" -#: ../system/Controller/ControllerMain.php:98 +#: ../system/Controller/ControllerMain.php:93 #, php-format msgid "%s - Configuration" msgstr "%s - Configuracion" -#: ../system/Controller/ControllerMain.php:118 +#: ../system/Controller/ControllerMain.php:113 #, php-format msgid "%s - Profile" msgstr "%s - Perfil" -#: ../system/Controller/ControllerMain.php:150 +#: ../system/Controller/ControllerMain.php:145 #, php-format msgid "%s - Account Creation" msgstr "%s - Creacion de compte" -#: ../system/Controller/ControllerMain.php:152 -#: ../system/Controller/ControllerMain.php:168 +#: ../system/Controller/ControllerMain.php:147 +#: ../system/Controller/ControllerMain.php:163 msgid "Account Creation" msgstr "Creacion de compte" -#: ../system/Controller/ControllerMain.php:166 +#: ../system/Controller/ControllerMain.php:161 #, php-format msgid "%s - Add An Account" msgstr "" -#: ../system/Controller/ControllerMain.php:184 +#: ../system/Controller/ControllerMain.php:179 #, php-format msgid "%s - Login to Movim" msgstr "%s - Dobrir una sesilha MOVIM" -#: ../system/Controller/ControllerMain.php:205 +#: ../system/Controller/ControllerMain.php:200 #, php-format msgid "%s - Help Page" msgstr "" #: ../system/Widget/widgets/Account/Account.php:170 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:100 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:101 msgid "Some data are missing !" msgstr "Manca d'informacions !" #: ../system/Widget/widgets/Account/Account.php:176 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:106 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:107 msgid "Wrong ID" msgstr "Merrit identifiant" #: ../system/Widget/widgets/Account/Account.php:182 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:112 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:113 msgid "You entered different passwords" msgstr "Avètz picat de senhals diferents" #: ../system/Widget/widgets/Account/Account.php:188 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:118 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:119 msgid "Invalid name" msgstr "Aqueste nom es pas valid" #: ../system/Widget/widgets/Account/Account.php:194 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:124 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:125 msgid "Username already taken" msgstr "Nom d'utilizaire ja existent" @@ -483,7 +498,7 @@ msgid "Only alphanumerics elements are authorized" msgstr "Sols los caractèrs alfanumerics son autorizats." #: ../system/Widget/widgets/Account/Account.php:236 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:150 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:151 #: ../system/Widget/widgets/Login/Login.php:103 msgid "My address" msgstr "Mon adreça" @@ -507,7 +522,7 @@ msgid "Example :" msgstr "Exemple :" #: ../system/Widget/widgets/Account/Account.php:249 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:159 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:160 #: ../system/Widget/widgets/Login/Login.php:105 msgid "Password" msgstr "Senhal" @@ -517,7 +532,7 @@ msgid "Same here !" msgstr "Parier aicí !" #: ../system/Widget/widgets/Account/Account.php:261 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:169 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:170 msgid "Retype" msgstr "Tornar picar" @@ -526,38 +541,18 @@ msgid "Pseudo" msgstr "Escais" #: ../system/Widget/widgets/Account/Account.php:280 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:177 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:178 msgid "Create" msgstr "Crear" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:130 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:131 msgid "XMPP Domain error, your account is not a correct Jabber ID" msgstr "" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:143 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:144 msgid "Add your login informations" msgstr "" -#: ../system/Widget/widgets/Chat/Chat.php:40 -#: ../system/Widget/widgets/Logout/Logout.php:82 -msgid "Online" -msgstr "En linha" - -#: ../system/Widget/widgets/Chat/Chat.php:41 -#: ../system/Widget/widgets/Logout/Logout.php:83 -msgid "Away" -msgstr "Absent(a)" - -#: ../system/Widget/widgets/Chat/Chat.php:42 -#: ../system/Widget/widgets/Logout/Logout.php:84 -msgid "Do Not Disturb" -msgstr "De derengar pas" - -#: ../system/Widget/widgets/Chat/Chat.php:43 -#: ../system/Widget/widgets/Logout/Logout.php:85 -msgid "Extended Away" -msgstr "Abséncia longa" - #: ../system/Widget/widgets/Chat/Chat.php:44 msgid "Offline" msgstr "Fòra linha" @@ -571,8 +566,8 @@ msgid "Language" msgstr "Lenga" #: ../system/Widget/widgets/Config/Config.php:59 -#: ../system/Widget/widgets/Feed/Feed.php:144 -#: ../system/Widget/widgets/Feed/Feed.php:155 +#: ../system/Widget/widgets/Feed/Feed.php:138 +#: ../system/Widget/widgets/Feed/Feed.php:142 #: ../system/Widget/widgets/Vcard/Vcard.php:179 msgid "Submit" msgstr "Sometre" @@ -583,23 +578,27 @@ msgid "Reset" msgstr "Reïnicializar" #: ../system/Widget/widgets/ContactCard/ContactCard.php:61 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:164 msgid "Remove this contact" msgstr "Suprimir aqueste contacte" #: ../system/Widget/widgets/ContactCard/ContactCard.php:75 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:192 msgid "No" msgstr "Non" #: ../system/Widget/widgets/ContactCard/ContactCard.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:178 msgid "Yes" msgstr "Òc" #: ../system/Widget/widgets/ContactCard/ContactCard.php:100 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:145 msgid "Chat" msgstr "Messatjariá instantanèa (chat)" #: ../system/Widget/widgets/ContactCard/ContactCard.php:110 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:63 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:71 #: ../system/Widget/widgets/Vcard/Vcard.php:75 msgid "General Informations" msgstr "Informacions Generalas" @@ -644,27 +643,28 @@ msgid "Avatar" msgstr "Avatar" #: ../system/Widget/widgets/ContactCard/ContactCard.php:129 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:96 #: ../system/Widget/widgets/Vcard/Vcard.php:160 msgid "About Me" msgstr "A prepaus de ieu" #: ../system/Widget/widgets/ContactCard/ContactCard.php:138 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:111 msgid "Bot" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:139 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:89 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:112 msgid "Desktop" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:140 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:90 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:113 msgid "Phone" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:149 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:106 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:129 msgid "Client Informations" msgstr "" @@ -676,6 +676,14 @@ msgstr "" msgid "Client Type" msgstr "" +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:132 +msgid "Actions" +msgstr "" + +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:202 +msgid "Invite this user" +msgstr "" + #: ../system/Widget/widgets/Feed/Feed.php:43 msgid "Loading your feed ..." msgstr "Cargament de vòstre flux ..." @@ -699,23 +707,16 @@ msgid "" "feeds" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:134 -#: ../system/Widget/widgets/Feed/Feed.php:137 -#: ../system/Widget/widgets/Feed/Feed.php:148 -#: ../system/Widget/widgets/Feed/Feed.php:151 -msgid "What's new ?" -msgstr "Qué de nòu ?" - -#: ../system/Widget/widgets/Feed/Feed.php:166 +#: ../system/Widget/widgets/Feed/Feed.php:154 msgid "All" msgstr "Tot" -#: ../system/Widget/widgets/Feed/Feed.php:167 +#: ../system/Widget/widgets/Feed/Feed.php:155 msgid "My Posts" msgstr "Mos posts" #: ../system/Widget/widgets/Help/Help.php:32 -msgid "What is Movim ?" +msgid "What is Movim?" msgstr "" #: ../system/Widget/widgets/Help/Help.php:34 @@ -821,20 +822,24 @@ msgid "Account successfully created" msgstr "Compte creat amb succès" #: ../system/Widget/widgets/Login/Login.php:83 -msgid "Movim fail to authenticate. You entered wrong data" +msgid "Movim failed to authenticate. You entered wrong data" msgstr "" #: ../system/Widget/widgets/Login/Login.php:91 msgid "Your web browser is too old to use with Movim." msgstr "Vòstre navigador es tròp vielh per utilizar Movim" +#: ../system/Widget/widgets/Login/Login.php:108 +msgid "Connecting..." +msgstr "Connexion en cors..." + #: ../system/Widget/widgets/Login/Login.php:110 msgid "Come in!" msgstr "Dintratz !" #: ../system/Widget/widgets/Login/Login.php:117 -#, php-format -msgid "This server host %s accounts" +#, fuzzy, php-format +msgid "This server hosts %s accounts" msgstr "Aqueste servidor albèrga %s comptes" #: ../system/Widget/widgets/Login/Login.php:122 @@ -845,10 +850,6 @@ msgstr "" msgid "Debug console" msgstr "Consòla de desbugatge" -#: ../system/Widget/widgets/Logout/Logout.php:86 -msgid "Logout" -msgstr "Acabar la sesilha" - #: ../system/Widget/widgets/Notifs/Notifs.php:44 msgid "wants to talk with you" msgstr "vòl charrar amb vos" @@ -858,36 +859,36 @@ msgid "Accept" msgstr "Acceptar" #: ../system/Widget/widgets/Notifs/Notifs.php:62 -#: ../system/Widget/widgets/Notifs/Notifs.php:156 -msgid "Validate" -msgstr "Validar" +#: ../system/Widget/widgets/Notifs/Notifs.php:125 +msgid "Add" +msgstr "" #: ../system/Widget/widgets/Notifs/Notifs.php:68 msgid "Decline" msgstr "Refusar" -#: ../system/Widget/widgets/Notifs/Notifs.php:120 +#: ../system/Widget/widgets/Notifs/Notifs.php:119 #, php-format msgid "Contacts (%s)" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:126 -msgid "Add" -msgstr "" - -#: ../system/Widget/widgets/Notifs/Notifs.php:147 +#: ../system/Widget/widgets/Notifs/Notifs.php:146 msgid "Alias" msgstr "Aliàs" -#: ../system/Widget/widgets/Notifs/Notifs.php:163 +#: ../system/Widget/widgets/Notifs/Notifs.php:155 +msgid "Send request" +msgstr "" + +#: ../system/Widget/widgets/Notifs/Notifs.php:162 msgid "Cancel" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:88 +#: ../system/Widget/widgets/Profile/Profile.php:74 msgid "No profile yet ?" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:89 +#: ../system/Widget/widgets/Profile/Profile.php:75 #: ../system/Widget/widgets/Vcard/Vcard.php:62 msgid "Create my vCard" msgstr "Crear ma vCard" @@ -930,6 +931,12 @@ msgstr "Seguir" msgid "Loading the contact feed ..." msgstr "Cargament del flux ..." +#~ msgid "What's new ?" +#~ msgstr "Qué de nòu ?" + +#~ msgid "Validate" +#~ msgstr "Validar" + #~ msgid "Add a contact" #~ msgstr "Apondre un contacte" diff --git a/i18n/pt.po b/i18n/pt.po index 1b1cb7a4d..92d55ae3a 100644 --- a/i18n/pt.po +++ b/i18n/pt.po @@ -5,10 +5,11 @@ msgid "" msgstr "" "Project-Id-Version: Movim\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-27 21:41+0200\n" +"POT-Creation-Date: 2012-07-18 21:48+0200\n" "PO-Revision-Date: 2011-10-26 21:35+0000\n" "Last-Translator: edhelas \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -57,12 +58,12 @@ msgstr "" #: ../install/index.php:169 #, php-format -msgid "Bosh connection failed with error `%s'" +msgid "Bosh connection failed with error '%s'" msgstr "" #: ../install/index.php:178 #, php-format -msgid "XMPP connection through Bosh failed with error `%s'" +msgid "XMPP connection through Bosh failed with error '%s'" msgstr "" #: ../install/index.php:224 ../install/index.php:228 ../install/index.php:232 @@ -77,7 +78,7 @@ msgstr "Não foi possível criar o arquivo de configuração '%s'." #: ../install/index.php:283 #, php-format -msgid "Database connection failed with error `%s'" +msgid "Database connection failed with error '%s'" msgstr "" #: ../install/part1.php:29 @@ -85,8 +86,7 @@ msgid "Thank you for downloading Movim!" msgstr "" #: ../install/part1.php:30 -msgid "" -"Before you enjoy your social network, a few adjustements are required." +msgid "Before you enjoy your social network, a few adjustements are required." msgstr "" #: ../install/part1.php:31 @@ -177,8 +177,8 @@ msgid "Please remove the %s folder in order to complete the installation" msgstr "" #: ../system/Conf.php:38 -#, php-format -msgid "Cannot load element value'%s'" +#, fuzzy, php-format +msgid "Cannot load element value '%s'" msgstr "Não foi possível carregar o valor'%s' do elemento" #: ../system/Conf.php:49 @@ -199,10 +199,6 @@ msgstr "JID não disponível." msgid "jid '%s' is incorrect" msgstr "O jid '%s' está incorreto" -#: ../system/Jabber.php:147 ../system/Widget/widgets/Login/Login.php:108 -msgid "Connecting..." -msgstr "" - #: ../system/Logger.php:27 #, php-format msgid "Cannot open log file '%s'" @@ -350,104 +346,124 @@ msgstr "" msgid "Civil Union" msgstr "" +#: ../system/Utils.php:219 ../system/Widget/widgets/Chat/Chat.php:40 +msgid "Online" +msgstr "" + +#: ../system/Utils.php:220 ../system/Widget/widgets/Chat/Chat.php:41 +msgid "Away" +msgstr "Ausente" + +#: ../system/Utils.php:221 ../system/Widget/widgets/Chat/Chat.php:42 +msgid "Do Not Disturb" +msgstr "" + +#: ../system/Utils.php:222 ../system/Widget/widgets/Chat/Chat.php:43 +msgid "Extended Away" +msgstr "" + +#: ../system/Utils.php:223 +msgid "Logout" +msgstr "Sair" + #: ../system/Controller/ControllerMain.php:40 #, php-format msgid "%s - Welcome to Movim" msgstr "%s - Bem vindo ao Movim" #: ../system/Controller/ControllerMain.php:41 -#: ../system/Controller/ControllerMain.php:75 -#: ../system/Controller/ControllerMain.php:99 -#: ../system/Controller/ControllerMain.php:119 -#: ../system/Controller/ControllerMain.php:151 -#: ../system/Controller/ControllerMain.php:167 -#: ../system/Controller/ControllerMain.php:186 -#: ../system/Controller/ControllerMain.php:215 +#: ../system/Controller/ControllerMain.php:71 +#: ../system/Controller/ControllerMain.php:94 +#: ../system/Controller/ControllerMain.php:114 +#: ../system/Controller/ControllerMain.php:146 +#: ../system/Controller/ControllerMain.php:162 +#: ../system/Controller/ControllerMain.php:181 +#: ../system/Controller/ControllerMain.php:210 msgid "Home" msgstr "Início" #: ../system/Controller/ControllerMain.php:42 -#: ../system/Controller/ControllerMain.php:78 -#: ../system/Controller/ControllerMain.php:100 -#: ../system/Controller/ControllerMain.php:120 -#: ../system/Controller/ControllerMain.php:216 +#: ../system/Controller/ControllerMain.php:73 +#: ../system/Controller/ControllerMain.php:95 +#: ../system/Controller/ControllerMain.php:115 +#: ../system/Controller/ControllerMain.php:211 #: ../system/Widget/widgets/ContactCard/ContactCard.php:175 msgid "Profile" msgstr "Perfil" #: ../system/Controller/ControllerMain.php:43 -#: ../system/Controller/ControllerMain.php:79 -#: ../system/Controller/ControllerMain.php:101 -#: ../system/Controller/ControllerMain.php:121 -#: ../system/Controller/ControllerMain.php:217 +#: ../system/Controller/ControllerMain.php:74 +#: ../system/Controller/ControllerMain.php:96 +#: ../system/Controller/ControllerMain.php:116 +#: ../system/Controller/ControllerMain.php:212 msgid "Configuration" msgstr "Configuraçāo" #: ../system/Controller/ControllerMain.php:44 -#: ../system/Controller/ControllerMain.php:80 -#: ../system/Controller/ControllerMain.php:102 -#: ../system/Controller/ControllerMain.php:122 -#: ../system/Controller/ControllerMain.php:218 +#: ../system/Controller/ControllerMain.php:75 +#: ../system/Controller/ControllerMain.php:97 +#: ../system/Controller/ControllerMain.php:117 +#: ../system/Controller/ControllerMain.php:213 msgid "Help" msgstr "" -#: ../system/Controller/ControllerMain.php:98 +#: ../system/Controller/ControllerMain.php:93 #, php-format msgid "%s - Configuration" msgstr "%s - Configuraçāo" -#: ../system/Controller/ControllerMain.php:118 +#: ../system/Controller/ControllerMain.php:113 #, php-format msgid "%s - Profile" msgstr "" -#: ../system/Controller/ControllerMain.php:150 +#: ../system/Controller/ControllerMain.php:145 #, php-format msgid "%s - Account Creation" msgstr "%s - Criação da conta" -#: ../system/Controller/ControllerMain.php:152 -#: ../system/Controller/ControllerMain.php:168 +#: ../system/Controller/ControllerMain.php:147 +#: ../system/Controller/ControllerMain.php:163 msgid "Account Creation" msgstr "Criar uma Conta" -#: ../system/Controller/ControllerMain.php:166 +#: ../system/Controller/ControllerMain.php:161 #, php-format msgid "%s - Add An Account" msgstr "" -#: ../system/Controller/ControllerMain.php:184 +#: ../system/Controller/ControllerMain.php:179 #, php-format msgid "%s - Login to Movim" msgstr "%s - Entrar no Movim" -#: ../system/Controller/ControllerMain.php:205 +#: ../system/Controller/ControllerMain.php:200 #, php-format msgid "%s - Help Page" msgstr "" #: ../system/Widget/widgets/Account/Account.php:170 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:100 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:101 msgid "Some data are missing !" msgstr "" #: ../system/Widget/widgets/Account/Account.php:176 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:106 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:107 msgid "Wrong ID" msgstr "" #: ../system/Widget/widgets/Account/Account.php:182 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:112 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:113 msgid "You entered different passwords" msgstr "" #: ../system/Widget/widgets/Account/Account.php:188 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:118 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:119 msgid "Invalid name" msgstr "" #: ../system/Widget/widgets/Account/Account.php:194 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:124 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:125 msgid "Username already taken" msgstr "" @@ -479,7 +495,7 @@ msgid "Only alphanumerics elements are authorized" msgstr "" #: ../system/Widget/widgets/Account/Account.php:236 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:150 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:151 #: ../system/Widget/widgets/Login/Login.php:103 msgid "My address" msgstr "Meu endereço" @@ -501,7 +517,7 @@ msgid "Example :" msgstr "" #: ../system/Widget/widgets/Account/Account.php:249 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:159 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:160 #: ../system/Widget/widgets/Login/Login.php:105 msgid "Password" msgstr "Senha" @@ -511,7 +527,7 @@ msgid "Same here !" msgstr "" #: ../system/Widget/widgets/Account/Account.php:261 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:169 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:170 msgid "Retype" msgstr "" @@ -520,38 +536,18 @@ msgid "Pseudo" msgstr "" #: ../system/Widget/widgets/Account/Account.php:280 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:177 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:178 msgid "Create" msgstr "" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:130 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:131 msgid "XMPP Domain error, your account is not a correct Jabber ID" msgstr "" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:143 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:144 msgid "Add your login informations" msgstr "" -#: ../system/Widget/widgets/Chat/Chat.php:40 -#: ../system/Widget/widgets/Logout/Logout.php:82 -msgid "Online" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:41 -#: ../system/Widget/widgets/Logout/Logout.php:83 -msgid "Away" -msgstr "Ausente" - -#: ../system/Widget/widgets/Chat/Chat.php:42 -#: ../system/Widget/widgets/Logout/Logout.php:84 -msgid "Do Not Disturb" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:43 -#: ../system/Widget/widgets/Logout/Logout.php:85 -msgid "Extended Away" -msgstr "" - #: ../system/Widget/widgets/Chat/Chat.php:44 msgid "Offline" msgstr "" @@ -565,8 +561,8 @@ msgid "Language" msgstr "Idioma" #: ../system/Widget/widgets/Config/Config.php:59 -#: ../system/Widget/widgets/Feed/Feed.php:144 -#: ../system/Widget/widgets/Feed/Feed.php:155 +#: ../system/Widget/widgets/Feed/Feed.php:138 +#: ../system/Widget/widgets/Feed/Feed.php:142 #: ../system/Widget/widgets/Vcard/Vcard.php:179 msgid "Submit" msgstr "Enviar" @@ -577,23 +573,27 @@ msgid "Reset" msgstr "Limpar" #: ../system/Widget/widgets/ContactCard/ContactCard.php:61 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:164 msgid "Remove this contact" msgstr "Remover este contato" #: ../system/Widget/widgets/ContactCard/ContactCard.php:75 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:192 msgid "No" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:178 msgid "Yes" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:100 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:145 msgid "Chat" msgstr "Chat" #: ../system/Widget/widgets/ContactCard/ContactCard.php:110 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:63 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:71 #: ../system/Widget/widgets/Vcard/Vcard.php:75 msgid "General Informations" msgstr "Informações gerais" @@ -638,27 +638,28 @@ msgid "Avatar" msgstr "Avatar" #: ../system/Widget/widgets/ContactCard/ContactCard.php:129 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:96 #: ../system/Widget/widgets/Vcard/Vcard.php:160 msgid "About Me" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:138 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:111 msgid "Bot" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:139 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:89 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:112 msgid "Desktop" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:140 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:90 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:113 msgid "Phone" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:149 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:106 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:129 msgid "Client Informations" msgstr "" @@ -670,6 +671,14 @@ msgstr "" msgid "Client Type" msgstr "" +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:132 +msgid "Actions" +msgstr "" + +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:202 +msgid "Invite this user" +msgstr "" + #: ../system/Widget/widgets/Feed/Feed.php:43 msgid "Loading your feed ..." msgstr "" @@ -693,23 +702,16 @@ msgid "" "feeds" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:134 -#: ../system/Widget/widgets/Feed/Feed.php:137 -#: ../system/Widget/widgets/Feed/Feed.php:148 -#: ../system/Widget/widgets/Feed/Feed.php:151 -msgid "What's new ?" -msgstr "" - -#: ../system/Widget/widgets/Feed/Feed.php:166 +#: ../system/Widget/widgets/Feed/Feed.php:154 msgid "All" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:167 +#: ../system/Widget/widgets/Feed/Feed.php:155 msgid "My Posts" msgstr "" #: ../system/Widget/widgets/Help/Help.php:32 -msgid "What is Movim ?" +msgid "What is Movim?" msgstr "" #: ../system/Widget/widgets/Help/Help.php:34 @@ -815,20 +817,24 @@ msgid "Account successfully created" msgstr "" #: ../system/Widget/widgets/Login/Login.php:83 -msgid "Movim fail to authenticate. You entered wrong data" +msgid "Movim failed to authenticate. You entered wrong data" msgstr "" #: ../system/Widget/widgets/Login/Login.php:91 msgid "Your web browser is too old to use with Movim." msgstr "" +#: ../system/Widget/widgets/Login/Login.php:108 +msgid "Connecting..." +msgstr "" + #: ../system/Widget/widgets/Login/Login.php:110 msgid "Come in!" msgstr "Faça Parte!" #: ../system/Widget/widgets/Login/Login.php:117 #, php-format -msgid "This server host %s accounts" +msgid "This server hosts %s accounts" msgstr "" #: ../system/Widget/widgets/Login/Login.php:122 @@ -839,10 +845,6 @@ msgstr "" msgid "Debug console" msgstr "Console de debug" -#: ../system/Widget/widgets/Logout/Logout.php:86 -msgid "Logout" -msgstr "Sair" - #: ../system/Widget/widgets/Notifs/Notifs.php:44 msgid "wants to talk with you" msgstr "Quero falar com você" @@ -852,36 +854,36 @@ msgid "Accept" msgstr "Aceitar" #: ../system/Widget/widgets/Notifs/Notifs.php:62 -#: ../system/Widget/widgets/Notifs/Notifs.php:156 -msgid "Validate" -msgstr "Validar" +#: ../system/Widget/widgets/Notifs/Notifs.php:125 +msgid "Add" +msgstr "" #: ../system/Widget/widgets/Notifs/Notifs.php:68 msgid "Decline" msgstr "Declinar" -#: ../system/Widget/widgets/Notifs/Notifs.php:120 +#: ../system/Widget/widgets/Notifs/Notifs.php:119 #, php-format msgid "Contacts (%s)" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:126 -msgid "Add" -msgstr "" - -#: ../system/Widget/widgets/Notifs/Notifs.php:147 +#: ../system/Widget/widgets/Notifs/Notifs.php:146 msgid "Alias" msgstr "Alias" -#: ../system/Widget/widgets/Notifs/Notifs.php:163 +#: ../system/Widget/widgets/Notifs/Notifs.php:155 +msgid "Send request" +msgstr "" + +#: ../system/Widget/widgets/Notifs/Notifs.php:162 msgid "Cancel" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:88 +#: ../system/Widget/widgets/Profile/Profile.php:74 msgid "No profile yet ?" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:89 +#: ../system/Widget/widgets/Profile/Profile.php:75 #: ../system/Widget/widgets/Vcard/Vcard.php:62 msgid "Create my vCard" msgstr "" @@ -924,6 +926,9 @@ msgstr "" msgid "Loading the contact feed ..." msgstr "Carregando retorno do contacto" +#~ msgid "Validate" +#~ msgstr "Validar" + #~ msgid "MOVIM - Test Client" #~ msgstr "MOVIM - Cliente de Teste" diff --git a/i18n/ro.po b/i18n/ro.po index 49e3a852c..59272c19d 100644 --- a/i18n/ro.po +++ b/i18n/ro.po @@ -5,10 +5,11 @@ msgid "" msgstr "" "Project-Id-Version: Movim\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-27 21:41+0200\n" +"POT-Creation-Date: 2012-07-18 21:48+0200\n" "PO-Revision-Date: 2011-10-26 21:35+0000\n" "Last-Translator: edhelas \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -57,12 +58,12 @@ msgstr "" #: ../install/index.php:169 #, php-format -msgid "Bosh connection failed with error `%s'" +msgid "Bosh connection failed with error '%s'" msgstr "" #: ../install/index.php:178 #, php-format -msgid "XMPP connection through Bosh failed with error `%s'" +msgid "XMPP connection through Bosh failed with error '%s'" msgstr "" #: ../install/index.php:224 ../install/index.php:228 ../install/index.php:232 @@ -77,7 +78,7 @@ msgstr "Fisierul de configuratie '%s' nu poate fi creat" #: ../install/index.php:283 #, php-format -msgid "Database connection failed with error `%s'" +msgid "Database connection failed with error '%s'" msgstr "" #: ../install/part1.php:29 @@ -85,8 +86,7 @@ msgid "Thank you for downloading Movim!" msgstr "" #: ../install/part1.php:30 -msgid "" -"Before you enjoy your social network, a few adjustements are required." +msgid "Before you enjoy your social network, a few adjustements are required." msgstr "" #: ../install/part1.php:31 @@ -177,9 +177,9 @@ msgid "Please remove the %s folder in order to complete the installation" msgstr "" #: ../system/Conf.php:38 -#, php-format -msgid "Cannot load element value'%s'" -msgstr "" +#, fuzzy, php-format +msgid "Cannot load element value '%s'" +msgstr "Fisierul '%s' nu poate fi incarcat." #: ../system/Conf.php:49 #, php-format @@ -199,10 +199,6 @@ msgstr "" msgid "jid '%s' is incorrect" msgstr "" -#: ../system/Jabber.php:147 ../system/Widget/widgets/Login/Login.php:108 -msgid "Connecting..." -msgstr "" - #: ../system/Logger.php:27 #, php-format msgid "Cannot open log file '%s'" @@ -350,104 +346,124 @@ msgstr "" msgid "Civil Union" msgstr "" +#: ../system/Utils.php:219 ../system/Widget/widgets/Chat/Chat.php:40 +msgid "Online" +msgstr "" + +#: ../system/Utils.php:220 ../system/Widget/widgets/Chat/Chat.php:41 +msgid "Away" +msgstr "Plecat" + +#: ../system/Utils.php:221 ../system/Widget/widgets/Chat/Chat.php:42 +msgid "Do Not Disturb" +msgstr "" + +#: ../system/Utils.php:222 ../system/Widget/widgets/Chat/Chat.php:43 +msgid "Extended Away" +msgstr "" + +#: ../system/Utils.php:223 +msgid "Logout" +msgstr "Delogare" + #: ../system/Controller/ControllerMain.php:40 #, php-format msgid "%s - Welcome to Movim" msgstr "%s - Bine ati venit pe MOVIM" #: ../system/Controller/ControllerMain.php:41 -#: ../system/Controller/ControllerMain.php:75 -#: ../system/Controller/ControllerMain.php:99 -#: ../system/Controller/ControllerMain.php:119 -#: ../system/Controller/ControllerMain.php:151 -#: ../system/Controller/ControllerMain.php:167 -#: ../system/Controller/ControllerMain.php:186 -#: ../system/Controller/ControllerMain.php:215 +#: ../system/Controller/ControllerMain.php:71 +#: ../system/Controller/ControllerMain.php:94 +#: ../system/Controller/ControllerMain.php:114 +#: ../system/Controller/ControllerMain.php:146 +#: ../system/Controller/ControllerMain.php:162 +#: ../system/Controller/ControllerMain.php:181 +#: ../system/Controller/ControllerMain.php:210 msgid "Home" msgstr "Pagina Principala" #: ../system/Controller/ControllerMain.php:42 -#: ../system/Controller/ControllerMain.php:78 -#: ../system/Controller/ControllerMain.php:100 -#: ../system/Controller/ControllerMain.php:120 -#: ../system/Controller/ControllerMain.php:216 +#: ../system/Controller/ControllerMain.php:73 +#: ../system/Controller/ControllerMain.php:95 +#: ../system/Controller/ControllerMain.php:115 +#: ../system/Controller/ControllerMain.php:211 #: ../system/Widget/widgets/ContactCard/ContactCard.php:175 msgid "Profile" msgstr "Profil" #: ../system/Controller/ControllerMain.php:43 -#: ../system/Controller/ControllerMain.php:79 -#: ../system/Controller/ControllerMain.php:101 -#: ../system/Controller/ControllerMain.php:121 -#: ../system/Controller/ControllerMain.php:217 +#: ../system/Controller/ControllerMain.php:74 +#: ../system/Controller/ControllerMain.php:96 +#: ../system/Controller/ControllerMain.php:116 +#: ../system/Controller/ControllerMain.php:212 msgid "Configuration" msgstr "Configurare" #: ../system/Controller/ControllerMain.php:44 -#: ../system/Controller/ControllerMain.php:80 -#: ../system/Controller/ControllerMain.php:102 -#: ../system/Controller/ControllerMain.php:122 -#: ../system/Controller/ControllerMain.php:218 +#: ../system/Controller/ControllerMain.php:75 +#: ../system/Controller/ControllerMain.php:97 +#: ../system/Controller/ControllerMain.php:117 +#: ../system/Controller/ControllerMain.php:213 msgid "Help" msgstr "" -#: ../system/Controller/ControllerMain.php:98 +#: ../system/Controller/ControllerMain.php:93 #, php-format msgid "%s - Configuration" msgstr "%s - Configurare" -#: ../system/Controller/ControllerMain.php:118 +#: ../system/Controller/ControllerMain.php:113 #, php-format msgid "%s - Profile" msgstr "" -#: ../system/Controller/ControllerMain.php:150 +#: ../system/Controller/ControllerMain.php:145 #, php-format msgid "%s - Account Creation" msgstr "%s - Cont nou" -#: ../system/Controller/ControllerMain.php:152 -#: ../system/Controller/ControllerMain.php:168 +#: ../system/Controller/ControllerMain.php:147 +#: ../system/Controller/ControllerMain.php:163 msgid "Account Creation" msgstr "Cont nou" -#: ../system/Controller/ControllerMain.php:166 +#: ../system/Controller/ControllerMain.php:161 #, php-format msgid "%s - Add An Account" msgstr "" -#: ../system/Controller/ControllerMain.php:184 +#: ../system/Controller/ControllerMain.php:179 #, php-format msgid "%s - Login to Movim" msgstr "%s - Conectare pe Movim" -#: ../system/Controller/ControllerMain.php:205 +#: ../system/Controller/ControllerMain.php:200 #, php-format msgid "%s - Help Page" msgstr "" #: ../system/Widget/widgets/Account/Account.php:170 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:100 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:101 msgid "Some data are missing !" msgstr "" #: ../system/Widget/widgets/Account/Account.php:176 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:106 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:107 msgid "Wrong ID" msgstr "" #: ../system/Widget/widgets/Account/Account.php:182 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:112 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:113 msgid "You entered different passwords" msgstr "" #: ../system/Widget/widgets/Account/Account.php:188 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:118 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:119 msgid "Invalid name" msgstr "" #: ../system/Widget/widgets/Account/Account.php:194 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:124 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:125 msgid "Username already taken" msgstr "" @@ -479,7 +495,7 @@ msgid "Only alphanumerics elements are authorized" msgstr "" #: ../system/Widget/widgets/Account/Account.php:236 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:150 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:151 #: ../system/Widget/widgets/Login/Login.php:103 msgid "My address" msgstr "Adresa mea" @@ -501,7 +517,7 @@ msgid "Example :" msgstr "" #: ../system/Widget/widgets/Account/Account.php:249 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:159 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:160 #: ../system/Widget/widgets/Login/Login.php:105 msgid "Password" msgstr "Parola" @@ -511,7 +527,7 @@ msgid "Same here !" msgstr "" #: ../system/Widget/widgets/Account/Account.php:261 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:169 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:170 msgid "Retype" msgstr "" @@ -520,38 +536,18 @@ msgid "Pseudo" msgstr "" #: ../system/Widget/widgets/Account/Account.php:280 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:177 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:178 msgid "Create" msgstr "" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:130 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:131 msgid "XMPP Domain error, your account is not a correct Jabber ID" msgstr "" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:143 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:144 msgid "Add your login informations" msgstr "" -#: ../system/Widget/widgets/Chat/Chat.php:40 -#: ../system/Widget/widgets/Logout/Logout.php:82 -msgid "Online" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:41 -#: ../system/Widget/widgets/Logout/Logout.php:83 -msgid "Away" -msgstr "Plecat" - -#: ../system/Widget/widgets/Chat/Chat.php:42 -#: ../system/Widget/widgets/Logout/Logout.php:84 -msgid "Do Not Disturb" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:43 -#: ../system/Widget/widgets/Logout/Logout.php:85 -msgid "Extended Away" -msgstr "" - #: ../system/Widget/widgets/Chat/Chat.php:44 msgid "Offline" msgstr "" @@ -565,8 +561,8 @@ msgid "Language" msgstr "Limba" #: ../system/Widget/widgets/Config/Config.php:59 -#: ../system/Widget/widgets/Feed/Feed.php:144 -#: ../system/Widget/widgets/Feed/Feed.php:155 +#: ../system/Widget/widgets/Feed/Feed.php:138 +#: ../system/Widget/widgets/Feed/Feed.php:142 #: ../system/Widget/widgets/Vcard/Vcard.php:179 msgid "Submit" msgstr "Inregistrare" @@ -577,23 +573,27 @@ msgid "Reset" msgstr "Reinitializeaza" #: ../system/Widget/widgets/ContactCard/ContactCard.php:61 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:164 msgid "Remove this contact" msgstr "Sterge acest contact" #: ../system/Widget/widgets/ContactCard/ContactCard.php:75 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:192 msgid "No" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:178 msgid "Yes" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:100 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:145 msgid "Chat" msgstr "Chat" #: ../system/Widget/widgets/ContactCard/ContactCard.php:110 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:63 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:71 #: ../system/Widget/widgets/Vcard/Vcard.php:75 msgid "General Informations" msgstr "Informatii generale" @@ -638,27 +638,28 @@ msgid "Avatar" msgstr "Avatar" #: ../system/Widget/widgets/ContactCard/ContactCard.php:129 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:96 #: ../system/Widget/widgets/Vcard/Vcard.php:160 msgid "About Me" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:138 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:111 msgid "Bot" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:139 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:89 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:112 msgid "Desktop" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:140 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:90 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:113 msgid "Phone" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:149 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:106 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:129 msgid "Client Informations" msgstr "" @@ -670,6 +671,14 @@ msgstr "" msgid "Client Type" msgstr "" +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:132 +msgid "Actions" +msgstr "" + +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:202 +msgid "Invite this user" +msgstr "" + #: ../system/Widget/widgets/Feed/Feed.php:43 msgid "Loading your feed ..." msgstr "" @@ -693,23 +702,16 @@ msgid "" "feeds" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:134 -#: ../system/Widget/widgets/Feed/Feed.php:137 -#: ../system/Widget/widgets/Feed/Feed.php:148 -#: ../system/Widget/widgets/Feed/Feed.php:151 -msgid "What's new ?" -msgstr "" - -#: ../system/Widget/widgets/Feed/Feed.php:166 +#: ../system/Widget/widgets/Feed/Feed.php:154 msgid "All" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:167 +#: ../system/Widget/widgets/Feed/Feed.php:155 msgid "My Posts" msgstr "" #: ../system/Widget/widgets/Help/Help.php:32 -msgid "What is Movim ?" +msgid "What is Movim?" msgstr "" #: ../system/Widget/widgets/Help/Help.php:34 @@ -815,20 +817,24 @@ msgid "Account successfully created" msgstr "" #: ../system/Widget/widgets/Login/Login.php:83 -msgid "Movim fail to authenticate. You entered wrong data" +msgid "Movim failed to authenticate. You entered wrong data" msgstr "" #: ../system/Widget/widgets/Login/Login.php:91 msgid "Your web browser is too old to use with Movim." msgstr "" +#: ../system/Widget/widgets/Login/Login.php:108 +msgid "Connecting..." +msgstr "" + #: ../system/Widget/widgets/Login/Login.php:110 msgid "Come in!" msgstr "Intrati!" #: ../system/Widget/widgets/Login/Login.php:117 #, php-format -msgid "This server host %s accounts" +msgid "This server hosts %s accounts" msgstr "" #: ../system/Widget/widgets/Login/Login.php:122 @@ -839,10 +845,6 @@ msgstr "" msgid "Debug console" msgstr "Consola de debug" -#: ../system/Widget/widgets/Logout/Logout.php:86 -msgid "Logout" -msgstr "Delogare" - #: ../system/Widget/widgets/Notifs/Notifs.php:44 msgid "wants to talk with you" msgstr "vrea sa vorbeasca cu tine" @@ -852,36 +854,36 @@ msgid "Accept" msgstr "Accepta" #: ../system/Widget/widgets/Notifs/Notifs.php:62 -#: ../system/Widget/widgets/Notifs/Notifs.php:156 -msgid "Validate" -msgstr "Valideaza" +#: ../system/Widget/widgets/Notifs/Notifs.php:125 +msgid "Add" +msgstr "" #: ../system/Widget/widgets/Notifs/Notifs.php:68 msgid "Decline" msgstr "Respinge" -#: ../system/Widget/widgets/Notifs/Notifs.php:120 +#: ../system/Widget/widgets/Notifs/Notifs.php:119 #, php-format msgid "Contacts (%s)" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:126 -msgid "Add" -msgstr "" - -#: ../system/Widget/widgets/Notifs/Notifs.php:147 +#: ../system/Widget/widgets/Notifs/Notifs.php:146 msgid "Alias" msgstr "Alias" -#: ../system/Widget/widgets/Notifs/Notifs.php:163 +#: ../system/Widget/widgets/Notifs/Notifs.php:155 +msgid "Send request" +msgstr "" + +#: ../system/Widget/widgets/Notifs/Notifs.php:162 msgid "Cancel" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:88 +#: ../system/Widget/widgets/Profile/Profile.php:74 msgid "No profile yet ?" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:89 +#: ../system/Widget/widgets/Profile/Profile.php:75 #: ../system/Widget/widgets/Vcard/Vcard.php:62 msgid "Create my vCard" msgstr "" @@ -924,6 +926,9 @@ msgstr "" msgid "Loading the contact feed ..." msgstr "" +#~ msgid "Validate" +#~ msgstr "Valideaza" + #~ msgid "MOVIM - Test Client" #~ msgstr "MOVIM - Test Client" diff --git a/i18n/ru.po b/i18n/ru.po index 66afb9659..562a03325 100644 --- a/i18n/ru.po +++ b/i18n/ru.po @@ -5,10 +5,11 @@ msgid "" msgstr "" "Project-Id-Version: Movim\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-27 21:41+0200\n" +"POT-Creation-Date: 2012-07-18 21:48+0200\n" "PO-Revision-Date: 2012-05-05 06:24+0000\n" "Last-Translator: Vyacheslav Sharmanov \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -59,12 +60,12 @@ msgstr "или" #: ../install/index.php:169 #, php-format -msgid "Bosh connection failed with error `%s'" +msgid "Bosh connection failed with error '%s'" msgstr "" #: ../install/index.php:178 #, php-format -msgid "XMPP connection through Bosh failed with error `%s'" +msgid "XMPP connection through Bosh failed with error '%s'" msgstr "" #: ../install/index.php:224 ../install/index.php:228 ../install/index.php:232 @@ -79,7 +80,7 @@ msgstr "Невозможно создать файл конфигурации '% #: ../install/index.php:283 #, php-format -msgid "Database connection failed with error `%s'" +msgid "Database connection failed with error '%s'" msgstr "" #: ../install/part1.php:29 @@ -87,8 +88,7 @@ msgid "Thank you for downloading Movim!" msgstr "" #: ../install/part1.php:30 -msgid "" -"Before you enjoy your social network, a few adjustements are required." +msgid "Before you enjoy your social network, a few adjustements are required." msgstr "" #: ../install/part1.php:31 @@ -179,8 +179,8 @@ msgid "Please remove the %s folder in order to complete the installation" msgstr "Пожалуйста, удалите папку %s для завершения установки" #: ../system/Conf.php:38 -#, php-format -msgid "Cannot load element value'%s'" +#, fuzzy, php-format +msgid "Cannot load element value '%s'" msgstr "Невозможно загрузить значение элемента '%s'" #: ../system/Conf.php:49 @@ -201,10 +201,6 @@ msgstr "" msgid "jid '%s' is incorrect" msgstr "" -#: ../system/Jabber.php:147 ../system/Widget/widgets/Login/Login.php:108 -msgid "Connecting..." -msgstr "Подключение…" - #: ../system/Logger.php:27 #, php-format msgid "Cannot open log file '%s'" @@ -352,104 +348,124 @@ msgstr "" msgid "Civil Union" msgstr "" +#: ../system/Utils.php:219 ../system/Widget/widgets/Chat/Chat.php:40 +msgid "Online" +msgstr "В сети" + +#: ../system/Utils.php:220 ../system/Widget/widgets/Chat/Chat.php:41 +msgid "Away" +msgstr "В отсутствии" + +#: ../system/Utils.php:221 ../system/Widget/widgets/Chat/Chat.php:42 +msgid "Do Not Disturb" +msgstr "Не беспокоить" + +#: ../system/Utils.php:222 ../system/Widget/widgets/Chat/Chat.php:43 +msgid "Extended Away" +msgstr "Давно нет на месте" + +#: ../system/Utils.php:223 +msgid "Logout" +msgstr "Выход" + #: ../system/Controller/ControllerMain.php:40 #, php-format msgid "%s - Welcome to Movim" msgstr "%s - Добро пожаловать в MOVIM" #: ../system/Controller/ControllerMain.php:41 -#: ../system/Controller/ControllerMain.php:75 -#: ../system/Controller/ControllerMain.php:99 -#: ../system/Controller/ControllerMain.php:119 -#: ../system/Controller/ControllerMain.php:151 -#: ../system/Controller/ControllerMain.php:167 -#: ../system/Controller/ControllerMain.php:186 -#: ../system/Controller/ControllerMain.php:215 +#: ../system/Controller/ControllerMain.php:71 +#: ../system/Controller/ControllerMain.php:94 +#: ../system/Controller/ControllerMain.php:114 +#: ../system/Controller/ControllerMain.php:146 +#: ../system/Controller/ControllerMain.php:162 +#: ../system/Controller/ControllerMain.php:181 +#: ../system/Controller/ControllerMain.php:210 msgid "Home" msgstr "Домой" #: ../system/Controller/ControllerMain.php:42 -#: ../system/Controller/ControllerMain.php:78 -#: ../system/Controller/ControllerMain.php:100 -#: ../system/Controller/ControllerMain.php:120 -#: ../system/Controller/ControllerMain.php:216 +#: ../system/Controller/ControllerMain.php:73 +#: ../system/Controller/ControllerMain.php:95 +#: ../system/Controller/ControllerMain.php:115 +#: ../system/Controller/ControllerMain.php:211 #: ../system/Widget/widgets/ContactCard/ContactCard.php:175 msgid "Profile" msgstr "Профиль" #: ../system/Controller/ControllerMain.php:43 -#: ../system/Controller/ControllerMain.php:79 -#: ../system/Controller/ControllerMain.php:101 -#: ../system/Controller/ControllerMain.php:121 -#: ../system/Controller/ControllerMain.php:217 +#: ../system/Controller/ControllerMain.php:74 +#: ../system/Controller/ControllerMain.php:96 +#: ../system/Controller/ControllerMain.php:116 +#: ../system/Controller/ControllerMain.php:212 msgid "Configuration" msgstr "Настройки" #: ../system/Controller/ControllerMain.php:44 -#: ../system/Controller/ControllerMain.php:80 -#: ../system/Controller/ControllerMain.php:102 -#: ../system/Controller/ControllerMain.php:122 -#: ../system/Controller/ControllerMain.php:218 +#: ../system/Controller/ControllerMain.php:75 +#: ../system/Controller/ControllerMain.php:97 +#: ../system/Controller/ControllerMain.php:117 +#: ../system/Controller/ControllerMain.php:213 msgid "Help" msgstr "" -#: ../system/Controller/ControllerMain.php:98 +#: ../system/Controller/ControllerMain.php:93 #, php-format msgid "%s - Configuration" msgstr "%s - настройки" -#: ../system/Controller/ControllerMain.php:118 +#: ../system/Controller/ControllerMain.php:113 #, php-format msgid "%s - Profile" msgstr "" -#: ../system/Controller/ControllerMain.php:150 +#: ../system/Controller/ControllerMain.php:145 #, php-format msgid "%s - Account Creation" msgstr "%s - создание учётной записи" -#: ../system/Controller/ControllerMain.php:152 -#: ../system/Controller/ControllerMain.php:168 +#: ../system/Controller/ControllerMain.php:147 +#: ../system/Controller/ControllerMain.php:163 msgid "Account Creation" msgstr "Создание учётной записи" -#: ../system/Controller/ControllerMain.php:166 +#: ../system/Controller/ControllerMain.php:161 #, php-format msgid "%s - Add An Account" msgstr "" -#: ../system/Controller/ControllerMain.php:184 +#: ../system/Controller/ControllerMain.php:179 #, php-format msgid "%s - Login to Movim" msgstr "%s - зайти в MOVIM" -#: ../system/Controller/ControllerMain.php:205 +#: ../system/Controller/ControllerMain.php:200 #, php-format msgid "%s - Help Page" msgstr "" #: ../system/Widget/widgets/Account/Account.php:170 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:100 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:101 msgid "Some data are missing !" msgstr "Некоторые данные утеряны !" #: ../system/Widget/widgets/Account/Account.php:176 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:106 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:107 msgid "Wrong ID" msgstr "Неверный ID" #: ../system/Widget/widgets/Account/Account.php:182 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:112 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:113 msgid "You entered different passwords" msgstr "Введены разные пароли" #: ../system/Widget/widgets/Account/Account.php:188 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:118 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:119 msgid "Invalid name" msgstr "Недопустимое имя" #: ../system/Widget/widgets/Account/Account.php:194 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:124 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:125 msgid "Username already taken" msgstr "Такое имя пользователя уже используется" @@ -481,7 +497,7 @@ msgid "Only alphanumerics elements are authorized" msgstr "" #: ../system/Widget/widgets/Account/Account.php:236 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:150 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:151 #: ../system/Widget/widgets/Login/Login.php:103 msgid "My address" msgstr "Мой адрес" @@ -503,7 +519,7 @@ msgid "Example :" msgstr "Пример:" #: ../system/Widget/widgets/Account/Account.php:249 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:159 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:160 #: ../system/Widget/widgets/Login/Login.php:105 msgid "Password" msgstr "Пароль" @@ -513,7 +529,7 @@ msgid "Same here !" msgstr "" #: ../system/Widget/widgets/Account/Account.php:261 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:169 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:170 msgid "Retype" msgstr "" @@ -522,38 +538,18 @@ msgid "Pseudo" msgstr "Псевдо" #: ../system/Widget/widgets/Account/Account.php:280 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:177 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:178 msgid "Create" msgstr "Создать" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:130 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:131 msgid "XMPP Domain error, your account is not a correct Jabber ID" msgstr "" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:143 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:144 msgid "Add your login informations" msgstr "" -#: ../system/Widget/widgets/Chat/Chat.php:40 -#: ../system/Widget/widgets/Logout/Logout.php:82 -msgid "Online" -msgstr "В сети" - -#: ../system/Widget/widgets/Chat/Chat.php:41 -#: ../system/Widget/widgets/Logout/Logout.php:83 -msgid "Away" -msgstr "В отсутствии" - -#: ../system/Widget/widgets/Chat/Chat.php:42 -#: ../system/Widget/widgets/Logout/Logout.php:84 -msgid "Do Not Disturb" -msgstr "Не беспокоить" - -#: ../system/Widget/widgets/Chat/Chat.php:43 -#: ../system/Widget/widgets/Logout/Logout.php:85 -msgid "Extended Away" -msgstr "Давно нет на месте" - #: ../system/Widget/widgets/Chat/Chat.php:44 msgid "Offline" msgstr "Не в сети" @@ -567,8 +563,8 @@ msgid "Language" msgstr "Язык" #: ../system/Widget/widgets/Config/Config.php:59 -#: ../system/Widget/widgets/Feed/Feed.php:144 -#: ../system/Widget/widgets/Feed/Feed.php:155 +#: ../system/Widget/widgets/Feed/Feed.php:138 +#: ../system/Widget/widgets/Feed/Feed.php:142 #: ../system/Widget/widgets/Vcard/Vcard.php:179 msgid "Submit" msgstr "Отправить" @@ -579,23 +575,27 @@ msgid "Reset" msgstr "Сброс" #: ../system/Widget/widgets/ContactCard/ContactCard.php:61 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:164 msgid "Remove this contact" msgstr "Удалить этот контакт" #: ../system/Widget/widgets/ContactCard/ContactCard.php:75 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:192 msgid "No" msgstr "Нет" #: ../system/Widget/widgets/ContactCard/ContactCard.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:178 msgid "Yes" msgstr "Да" #: ../system/Widget/widgets/ContactCard/ContactCard.php:100 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:145 msgid "Chat" msgstr "Чат" #: ../system/Widget/widgets/ContactCard/ContactCard.php:110 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:63 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:71 #: ../system/Widget/widgets/Vcard/Vcard.php:75 msgid "General Informations" msgstr "Общая информация" @@ -640,27 +640,28 @@ msgid "Avatar" msgstr "Аватар" #: ../system/Widget/widgets/ContactCard/ContactCard.php:129 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:96 #: ../system/Widget/widgets/Vcard/Vcard.php:160 msgid "About Me" msgstr "Обо мне" #: ../system/Widget/widgets/ContactCard/ContactCard.php:138 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:111 msgid "Bot" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:139 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:89 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:112 msgid "Desktop" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:140 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:90 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:113 msgid "Phone" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:149 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:106 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:129 msgid "Client Informations" msgstr "" @@ -672,6 +673,14 @@ msgstr "" msgid "Client Type" msgstr "" +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:132 +msgid "Actions" +msgstr "" + +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:202 +msgid "Invite this user" +msgstr "" + #: ../system/Widget/widgets/Feed/Feed.php:43 msgid "Loading your feed ..." msgstr "" @@ -695,23 +704,16 @@ msgid "" "feeds" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:134 -#: ../system/Widget/widgets/Feed/Feed.php:137 -#: ../system/Widget/widgets/Feed/Feed.php:148 -#: ../system/Widget/widgets/Feed/Feed.php:151 -msgid "What's new ?" -msgstr "" - -#: ../system/Widget/widgets/Feed/Feed.php:166 +#: ../system/Widget/widgets/Feed/Feed.php:154 msgid "All" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:167 +#: ../system/Widget/widgets/Feed/Feed.php:155 msgid "My Posts" msgstr "" #: ../system/Widget/widgets/Help/Help.php:32 -msgid "What is Movim ?" +msgid "What is Movim?" msgstr "" #: ../system/Widget/widgets/Help/Help.php:34 @@ -817,20 +819,24 @@ msgid "Account successfully created" msgstr "Учётная запись успешно создана" #: ../system/Widget/widgets/Login/Login.php:83 -msgid "Movim fail to authenticate. You entered wrong data" +msgid "Movim failed to authenticate. You entered wrong data" msgstr "" #: ../system/Widget/widgets/Login/Login.php:91 msgid "Your web browser is too old to use with Movim." msgstr "" +#: ../system/Widget/widgets/Login/Login.php:108 +msgid "Connecting..." +msgstr "Подключение…" + #: ../system/Widget/widgets/Login/Login.php:110 msgid "Come in!" msgstr "Войти!" #: ../system/Widget/widgets/Login/Login.php:117 #, php-format -msgid "This server host %s accounts" +msgid "This server hosts %s accounts" msgstr "" #: ../system/Widget/widgets/Login/Login.php:122 @@ -841,10 +847,6 @@ msgstr "" msgid "Debug console" msgstr "консоль" -#: ../system/Widget/widgets/Logout/Logout.php:86 -msgid "Logout" -msgstr "Выход" - #: ../system/Widget/widgets/Notifs/Notifs.php:44 msgid "wants to talk with you" msgstr "хочет пообщаться с вами" @@ -854,36 +856,36 @@ msgid "Accept" msgstr "" #: ../system/Widget/widgets/Notifs/Notifs.php:62 -#: ../system/Widget/widgets/Notifs/Notifs.php:156 -msgid "Validate" +#: ../system/Widget/widgets/Notifs/Notifs.php:125 +msgid "Add" msgstr "" #: ../system/Widget/widgets/Notifs/Notifs.php:68 msgid "Decline" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:120 +#: ../system/Widget/widgets/Notifs/Notifs.php:119 #, php-format msgid "Contacts (%s)" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:126 -msgid "Add" +#: ../system/Widget/widgets/Notifs/Notifs.php:146 +msgid "Alias" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:147 -msgid "Alias" +#: ../system/Widget/widgets/Notifs/Notifs.php:155 +msgid "Send request" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:163 +#: ../system/Widget/widgets/Notifs/Notifs.php:162 msgid "Cancel" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:88 +#: ../system/Widget/widgets/Profile/Profile.php:74 msgid "No profile yet ?" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:89 +#: ../system/Widget/widgets/Profile/Profile.php:75 #: ../system/Widget/widgets/Vcard/Vcard.php:62 msgid "Create my vCard" msgstr "" diff --git a/i18n/uk.po b/i18n/uk.po index 02c6297bb..45c1f3031 100644 --- a/i18n/uk.po +++ b/i18n/uk.po @@ -5,10 +5,11 @@ msgid "" msgstr "" "Project-Id-Version: Movim\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-27 21:41+0200\n" +"POT-Creation-Date: 2012-07-18 21:48+0200\n" "PO-Revision-Date: 2011-10-26 21:36+0000\n" "Last-Translator: edhelas \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -57,12 +58,12 @@ msgstr "" #: ../install/index.php:169 #, php-format -msgid "Bosh connection failed with error `%s'" +msgid "Bosh connection failed with error '%s'" msgstr "" #: ../install/index.php:178 #, php-format -msgid "XMPP connection through Bosh failed with error `%s'" +msgid "XMPP connection through Bosh failed with error '%s'" msgstr "" #: ../install/index.php:224 ../install/index.php:228 ../install/index.php:232 @@ -77,7 +78,7 @@ msgstr "" #: ../install/index.php:283 #, php-format -msgid "Database connection failed with error `%s'" +msgid "Database connection failed with error '%s'" msgstr "" #: ../install/part1.php:29 @@ -85,8 +86,7 @@ msgid "Thank you for downloading Movim!" msgstr "" #: ../install/part1.php:30 -msgid "" -"Before you enjoy your social network, a few adjustements are required." +msgid "Before you enjoy your social network, a few adjustements are required." msgstr "" #: ../install/part1.php:31 @@ -176,7 +176,7 @@ msgstr "" #: ../system/Conf.php:38 #, php-format -msgid "Cannot load element value'%s'" +msgid "Cannot load element value '%s'" msgstr "" #: ../system/Conf.php:49 @@ -197,10 +197,6 @@ msgstr "" msgid "jid '%s' is incorrect" msgstr "" -#: ../system/Jabber.php:147 ../system/Widget/widgets/Login/Login.php:108 -msgid "Connecting..." -msgstr "" - #: ../system/Logger.php:27 #, php-format msgid "Cannot open log file '%s'" @@ -348,104 +344,124 @@ msgstr "" msgid "Civil Union" msgstr "" +#: ../system/Utils.php:219 ../system/Widget/widgets/Chat/Chat.php:40 +msgid "Online" +msgstr "" + +#: ../system/Utils.php:220 ../system/Widget/widgets/Chat/Chat.php:41 +msgid "Away" +msgstr "" + +#: ../system/Utils.php:221 ../system/Widget/widgets/Chat/Chat.php:42 +msgid "Do Not Disturb" +msgstr "" + +#: ../system/Utils.php:222 ../system/Widget/widgets/Chat/Chat.php:43 +msgid "Extended Away" +msgstr "" + +#: ../system/Utils.php:223 +msgid "Logout" +msgstr "" + #: ../system/Controller/ControllerMain.php:40 #, php-format msgid "%s - Welcome to Movim" msgstr "" #: ../system/Controller/ControllerMain.php:41 -#: ../system/Controller/ControllerMain.php:75 -#: ../system/Controller/ControllerMain.php:99 -#: ../system/Controller/ControllerMain.php:119 -#: ../system/Controller/ControllerMain.php:151 -#: ../system/Controller/ControllerMain.php:167 -#: ../system/Controller/ControllerMain.php:186 -#: ../system/Controller/ControllerMain.php:215 +#: ../system/Controller/ControllerMain.php:71 +#: ../system/Controller/ControllerMain.php:94 +#: ../system/Controller/ControllerMain.php:114 +#: ../system/Controller/ControllerMain.php:146 +#: ../system/Controller/ControllerMain.php:162 +#: ../system/Controller/ControllerMain.php:181 +#: ../system/Controller/ControllerMain.php:210 msgid "Home" msgstr "" #: ../system/Controller/ControllerMain.php:42 -#: ../system/Controller/ControllerMain.php:78 -#: ../system/Controller/ControllerMain.php:100 -#: ../system/Controller/ControllerMain.php:120 -#: ../system/Controller/ControllerMain.php:216 +#: ../system/Controller/ControllerMain.php:73 +#: ../system/Controller/ControllerMain.php:95 +#: ../system/Controller/ControllerMain.php:115 +#: ../system/Controller/ControllerMain.php:211 #: ../system/Widget/widgets/ContactCard/ContactCard.php:175 msgid "Profile" msgstr "" #: ../system/Controller/ControllerMain.php:43 -#: ../system/Controller/ControllerMain.php:79 -#: ../system/Controller/ControllerMain.php:101 -#: ../system/Controller/ControllerMain.php:121 -#: ../system/Controller/ControllerMain.php:217 +#: ../system/Controller/ControllerMain.php:74 +#: ../system/Controller/ControllerMain.php:96 +#: ../system/Controller/ControllerMain.php:116 +#: ../system/Controller/ControllerMain.php:212 msgid "Configuration" msgstr "Конфігурація" #: ../system/Controller/ControllerMain.php:44 -#: ../system/Controller/ControllerMain.php:80 -#: ../system/Controller/ControllerMain.php:102 -#: ../system/Controller/ControllerMain.php:122 -#: ../system/Controller/ControllerMain.php:218 +#: ../system/Controller/ControllerMain.php:75 +#: ../system/Controller/ControllerMain.php:97 +#: ../system/Controller/ControllerMain.php:117 +#: ../system/Controller/ControllerMain.php:213 msgid "Help" msgstr "" -#: ../system/Controller/ControllerMain.php:98 +#: ../system/Controller/ControllerMain.php:93 #, php-format msgid "%s - Configuration" msgstr "%s - Конфігурація" -#: ../system/Controller/ControllerMain.php:118 +#: ../system/Controller/ControllerMain.php:113 #, php-format msgid "%s - Profile" msgstr "" -#: ../system/Controller/ControllerMain.php:150 +#: ../system/Controller/ControllerMain.php:145 #, php-format msgid "%s - Account Creation" msgstr "" -#: ../system/Controller/ControllerMain.php:152 -#: ../system/Controller/ControllerMain.php:168 +#: ../system/Controller/ControllerMain.php:147 +#: ../system/Controller/ControllerMain.php:163 msgid "Account Creation" msgstr "" -#: ../system/Controller/ControllerMain.php:166 +#: ../system/Controller/ControllerMain.php:161 #, php-format msgid "%s - Add An Account" msgstr "" -#: ../system/Controller/ControllerMain.php:184 +#: ../system/Controller/ControllerMain.php:179 #, php-format msgid "%s - Login to Movim" msgstr "" -#: ../system/Controller/ControllerMain.php:205 +#: ../system/Controller/ControllerMain.php:200 #, php-format msgid "%s - Help Page" msgstr "" #: ../system/Widget/widgets/Account/Account.php:170 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:100 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:101 msgid "Some data are missing !" msgstr "" #: ../system/Widget/widgets/Account/Account.php:176 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:106 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:107 msgid "Wrong ID" msgstr "" #: ../system/Widget/widgets/Account/Account.php:182 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:112 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:113 msgid "You entered different passwords" msgstr "" #: ../system/Widget/widgets/Account/Account.php:188 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:118 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:119 msgid "Invalid name" msgstr "" #: ../system/Widget/widgets/Account/Account.php:194 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:124 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:125 msgid "Username already taken" msgstr "" @@ -477,7 +493,7 @@ msgid "Only alphanumerics elements are authorized" msgstr "" #: ../system/Widget/widgets/Account/Account.php:236 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:150 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:151 #: ../system/Widget/widgets/Login/Login.php:103 msgid "My address" msgstr "" @@ -499,7 +515,7 @@ msgid "Example :" msgstr "" #: ../system/Widget/widgets/Account/Account.php:249 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:159 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:160 #: ../system/Widget/widgets/Login/Login.php:105 msgid "Password" msgstr "" @@ -509,7 +525,7 @@ msgid "Same here !" msgstr "" #: ../system/Widget/widgets/Account/Account.php:261 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:169 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:170 msgid "Retype" msgstr "" @@ -518,38 +534,18 @@ msgid "Pseudo" msgstr "" #: ../system/Widget/widgets/Account/Account.php:280 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:177 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:178 msgid "Create" msgstr "" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:130 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:131 msgid "XMPP Domain error, your account is not a correct Jabber ID" msgstr "" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:143 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:144 msgid "Add your login informations" msgstr "" -#: ../system/Widget/widgets/Chat/Chat.php:40 -#: ../system/Widget/widgets/Logout/Logout.php:82 -msgid "Online" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:41 -#: ../system/Widget/widgets/Logout/Logout.php:83 -msgid "Away" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:42 -#: ../system/Widget/widgets/Logout/Logout.php:84 -msgid "Do Not Disturb" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:43 -#: ../system/Widget/widgets/Logout/Logout.php:85 -msgid "Extended Away" -msgstr "" - #: ../system/Widget/widgets/Chat/Chat.php:44 msgid "Offline" msgstr "" @@ -563,8 +559,8 @@ msgid "Language" msgstr "" #: ../system/Widget/widgets/Config/Config.php:59 -#: ../system/Widget/widgets/Feed/Feed.php:144 -#: ../system/Widget/widgets/Feed/Feed.php:155 +#: ../system/Widget/widgets/Feed/Feed.php:138 +#: ../system/Widget/widgets/Feed/Feed.php:142 #: ../system/Widget/widgets/Vcard/Vcard.php:179 msgid "Submit" msgstr "" @@ -575,23 +571,27 @@ msgid "Reset" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:61 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:164 msgid "Remove this contact" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:75 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:192 msgid "No" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:178 msgid "Yes" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:100 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:145 msgid "Chat" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:110 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:63 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:71 #: ../system/Widget/widgets/Vcard/Vcard.php:75 msgid "General Informations" msgstr "" @@ -636,27 +636,28 @@ msgid "Avatar" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:129 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:96 #: ../system/Widget/widgets/Vcard/Vcard.php:160 msgid "About Me" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:138 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:111 msgid "Bot" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:139 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:89 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:112 msgid "Desktop" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:140 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:90 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:113 msgid "Phone" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:149 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:106 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:129 msgid "Client Informations" msgstr "" @@ -668,6 +669,14 @@ msgstr "" msgid "Client Type" msgstr "" +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:132 +msgid "Actions" +msgstr "" + +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:202 +msgid "Invite this user" +msgstr "" + #: ../system/Widget/widgets/Feed/Feed.php:43 msgid "Loading your feed ..." msgstr "" @@ -691,23 +700,16 @@ msgid "" "feeds" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:134 -#: ../system/Widget/widgets/Feed/Feed.php:137 -#: ../system/Widget/widgets/Feed/Feed.php:148 -#: ../system/Widget/widgets/Feed/Feed.php:151 -msgid "What's new ?" -msgstr "" - -#: ../system/Widget/widgets/Feed/Feed.php:166 +#: ../system/Widget/widgets/Feed/Feed.php:154 msgid "All" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:167 +#: ../system/Widget/widgets/Feed/Feed.php:155 msgid "My Posts" msgstr "" #: ../system/Widget/widgets/Help/Help.php:32 -msgid "What is Movim ?" +msgid "What is Movim?" msgstr "" #: ../system/Widget/widgets/Help/Help.php:34 @@ -813,20 +815,24 @@ msgid "Account successfully created" msgstr "" #: ../system/Widget/widgets/Login/Login.php:83 -msgid "Movim fail to authenticate. You entered wrong data" +msgid "Movim failed to authenticate. You entered wrong data" msgstr "" #: ../system/Widget/widgets/Login/Login.php:91 msgid "Your web browser is too old to use with Movim." msgstr "" +#: ../system/Widget/widgets/Login/Login.php:108 +msgid "Connecting..." +msgstr "" + #: ../system/Widget/widgets/Login/Login.php:110 msgid "Come in!" msgstr "" #: ../system/Widget/widgets/Login/Login.php:117 #, php-format -msgid "This server host %s accounts" +msgid "This server hosts %s accounts" msgstr "" #: ../system/Widget/widgets/Login/Login.php:122 @@ -837,10 +843,6 @@ msgstr "" msgid "Debug console" msgstr "" -#: ../system/Widget/widgets/Logout/Logout.php:86 -msgid "Logout" -msgstr "" - #: ../system/Widget/widgets/Notifs/Notifs.php:44 msgid "wants to talk with you" msgstr "" @@ -850,36 +852,36 @@ msgid "Accept" msgstr "" #: ../system/Widget/widgets/Notifs/Notifs.php:62 -#: ../system/Widget/widgets/Notifs/Notifs.php:156 -msgid "Validate" +#: ../system/Widget/widgets/Notifs/Notifs.php:125 +msgid "Add" msgstr "" #: ../system/Widget/widgets/Notifs/Notifs.php:68 msgid "Decline" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:120 +#: ../system/Widget/widgets/Notifs/Notifs.php:119 #, php-format msgid "Contacts (%s)" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:126 -msgid "Add" +#: ../system/Widget/widgets/Notifs/Notifs.php:146 +msgid "Alias" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:147 -msgid "Alias" +#: ../system/Widget/widgets/Notifs/Notifs.php:155 +msgid "Send request" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:163 +#: ../system/Widget/widgets/Notifs/Notifs.php:162 msgid "Cancel" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:88 +#: ../system/Widget/widgets/Profile/Profile.php:74 msgid "No profile yet ?" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:89 +#: ../system/Widget/widgets/Profile/Profile.php:75 #: ../system/Widget/widgets/Vcard/Vcard.php:62 msgid "Create my vCard" msgstr "" diff --git a/i18n/zh.po b/i18n/zh.po index 90823b0ef..f5c8c2caa 100644 --- a/i18n/zh.po +++ b/i18n/zh.po @@ -5,10 +5,11 @@ msgid "" msgstr "" "Project-Id-Version: Movim\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-27 21:41+0200\n" +"POT-Creation-Date: 2012-07-18 21:48+0200\n" "PO-Revision-Date: 2011-12-18 14:01+0000\n" "Last-Translator: edhelas \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -57,12 +58,12 @@ msgstr "" #: ../install/index.php:169 #, php-format -msgid "Bosh connection failed with error `%s'" +msgid "Bosh connection failed with error '%s'" msgstr "" #: ../install/index.php:178 #, php-format -msgid "XMPP connection through Bosh failed with error `%s'" +msgid "XMPP connection through Bosh failed with error '%s'" msgstr "" #: ../install/index.php:224 ../install/index.php:228 ../install/index.php:232 @@ -77,7 +78,7 @@ msgstr "不能建立配置文件 '%s'。" #: ../install/index.php:283 #, php-format -msgid "Database connection failed with error `%s'" +msgid "Database connection failed with error '%s'" msgstr "" #: ../install/part1.php:29 @@ -85,8 +86,7 @@ msgid "Thank you for downloading Movim!" msgstr "" #: ../install/part1.php:30 -msgid "" -"Before you enjoy your social network, a few adjustements are required." +msgid "Before you enjoy your social network, a few adjustements are required." msgstr "" #: ../install/part1.php:31 @@ -175,8 +175,8 @@ msgid "Please remove the %s folder in order to complete the installation" msgstr "" #: ../system/Conf.php:38 -#, php-format -msgid "Cannot load element value'%s'" +#, fuzzy, php-format +msgid "Cannot load element value '%s'" msgstr "不能装载数组元素值 '%s'" #: ../system/Conf.php:49 @@ -197,10 +197,6 @@ msgstr "还未提供JID。" msgid "jid '%s' is incorrect" msgstr "JID %s 是不正确" -#: ../system/Jabber.php:147 ../system/Widget/widgets/Login/Login.php:108 -msgid "Connecting..." -msgstr "" - #: ../system/Logger.php:27 #, php-format msgid "Cannot open log file '%s'" @@ -348,104 +344,124 @@ msgstr "" msgid "Civil Union" msgstr "" +#: ../system/Utils.php:219 ../system/Widget/widgets/Chat/Chat.php:40 +msgid "Online" +msgstr "" + +#: ../system/Utils.php:220 ../system/Widget/widgets/Chat/Chat.php:41 +msgid "Away" +msgstr "离开" + +#: ../system/Utils.php:221 ../system/Widget/widgets/Chat/Chat.php:42 +msgid "Do Not Disturb" +msgstr "" + +#: ../system/Utils.php:222 ../system/Widget/widgets/Chat/Chat.php:43 +msgid "Extended Away" +msgstr "" + +#: ../system/Utils.php:223 +msgid "Logout" +msgstr "注销" + #: ../system/Controller/ControllerMain.php:40 #, php-format msgid "%s - Welcome to Movim" msgstr "%s - 欢迎来到 MOVIM" #: ../system/Controller/ControllerMain.php:41 -#: ../system/Controller/ControllerMain.php:75 -#: ../system/Controller/ControllerMain.php:99 -#: ../system/Controller/ControllerMain.php:119 -#: ../system/Controller/ControllerMain.php:151 -#: ../system/Controller/ControllerMain.php:167 -#: ../system/Controller/ControllerMain.php:186 -#: ../system/Controller/ControllerMain.php:215 +#: ../system/Controller/ControllerMain.php:71 +#: ../system/Controller/ControllerMain.php:94 +#: ../system/Controller/ControllerMain.php:114 +#: ../system/Controller/ControllerMain.php:146 +#: ../system/Controller/ControllerMain.php:162 +#: ../system/Controller/ControllerMain.php:181 +#: ../system/Controller/ControllerMain.php:210 msgid "Home" msgstr "主页" #: ../system/Controller/ControllerMain.php:42 -#: ../system/Controller/ControllerMain.php:78 -#: ../system/Controller/ControllerMain.php:100 -#: ../system/Controller/ControllerMain.php:120 -#: ../system/Controller/ControllerMain.php:216 +#: ../system/Controller/ControllerMain.php:73 +#: ../system/Controller/ControllerMain.php:95 +#: ../system/Controller/ControllerMain.php:115 +#: ../system/Controller/ControllerMain.php:211 #: ../system/Widget/widgets/ContactCard/ContactCard.php:175 msgid "Profile" msgstr "" #: ../system/Controller/ControllerMain.php:43 -#: ../system/Controller/ControllerMain.php:79 -#: ../system/Controller/ControllerMain.php:101 -#: ../system/Controller/ControllerMain.php:121 -#: ../system/Controller/ControllerMain.php:217 +#: ../system/Controller/ControllerMain.php:74 +#: ../system/Controller/ControllerMain.php:96 +#: ../system/Controller/ControllerMain.php:116 +#: ../system/Controller/ControllerMain.php:212 msgid "Configuration" msgstr "配置" #: ../system/Controller/ControllerMain.php:44 -#: ../system/Controller/ControllerMain.php:80 -#: ../system/Controller/ControllerMain.php:102 -#: ../system/Controller/ControllerMain.php:122 -#: ../system/Controller/ControllerMain.php:218 +#: ../system/Controller/ControllerMain.php:75 +#: ../system/Controller/ControllerMain.php:97 +#: ../system/Controller/ControllerMain.php:117 +#: ../system/Controller/ControllerMain.php:213 msgid "Help" msgstr "" -#: ../system/Controller/ControllerMain.php:98 +#: ../system/Controller/ControllerMain.php:93 #, php-format msgid "%s - Configuration" msgstr "%s - 配置" -#: ../system/Controller/ControllerMain.php:118 +#: ../system/Controller/ControllerMain.php:113 #, php-format msgid "%s - Profile" msgstr "" -#: ../system/Controller/ControllerMain.php:150 +#: ../system/Controller/ControllerMain.php:145 #, php-format msgid "%s - Account Creation" msgstr "%s - 建立帐号" -#: ../system/Controller/ControllerMain.php:152 -#: ../system/Controller/ControllerMain.php:168 +#: ../system/Controller/ControllerMain.php:147 +#: ../system/Controller/ControllerMain.php:163 msgid "Account Creation" msgstr "建立帐号" -#: ../system/Controller/ControllerMain.php:166 +#: ../system/Controller/ControllerMain.php:161 #, php-format msgid "%s - Add An Account" msgstr "" -#: ../system/Controller/ControllerMain.php:184 +#: ../system/Controller/ControllerMain.php:179 #, php-format msgid "%s - Login to Movim" msgstr "%s - 登录 MOVIM" -#: ../system/Controller/ControllerMain.php:205 +#: ../system/Controller/ControllerMain.php:200 #, php-format msgid "%s - Help Page" msgstr "" #: ../system/Widget/widgets/Account/Account.php:170 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:100 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:101 msgid "Some data are missing !" msgstr "" #: ../system/Widget/widgets/Account/Account.php:176 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:106 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:107 msgid "Wrong ID" msgstr "" #: ../system/Widget/widgets/Account/Account.php:182 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:112 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:113 msgid "You entered different passwords" msgstr "" #: ../system/Widget/widgets/Account/Account.php:188 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:118 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:119 msgid "Invalid name" msgstr "" #: ../system/Widget/widgets/Account/Account.php:194 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:124 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:125 msgid "Username already taken" msgstr "" @@ -477,7 +493,7 @@ msgid "Only alphanumerics elements are authorized" msgstr "" #: ../system/Widget/widgets/Account/Account.php:236 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:150 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:151 #: ../system/Widget/widgets/Login/Login.php:103 msgid "My address" msgstr "我的识别符" @@ -499,7 +515,7 @@ msgid "Example :" msgstr "" #: ../system/Widget/widgets/Account/Account.php:249 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:159 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:160 #: ../system/Widget/widgets/Login/Login.php:105 msgid "Password" msgstr "密码" @@ -509,7 +525,7 @@ msgid "Same here !" msgstr "" #: ../system/Widget/widgets/Account/Account.php:261 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:169 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:170 msgid "Retype" msgstr "" @@ -518,38 +534,18 @@ msgid "Pseudo" msgstr "" #: ../system/Widget/widgets/Account/Account.php:280 -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:177 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:178 msgid "Create" msgstr "" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:130 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:131 msgid "XMPP Domain error, your account is not a correct Jabber ID" msgstr "" -#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:143 +#: ../system/Widget/widgets/AccountAdd/AccountAdd.php:144 msgid "Add your login informations" msgstr "" -#: ../system/Widget/widgets/Chat/Chat.php:40 -#: ../system/Widget/widgets/Logout/Logout.php:82 -msgid "Online" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:41 -#: ../system/Widget/widgets/Logout/Logout.php:83 -msgid "Away" -msgstr "离开" - -#: ../system/Widget/widgets/Chat/Chat.php:42 -#: ../system/Widget/widgets/Logout/Logout.php:84 -msgid "Do Not Disturb" -msgstr "" - -#: ../system/Widget/widgets/Chat/Chat.php:43 -#: ../system/Widget/widgets/Logout/Logout.php:85 -msgid "Extended Away" -msgstr "" - #: ../system/Widget/widgets/Chat/Chat.php:44 msgid "Offline" msgstr "" @@ -563,8 +559,8 @@ msgid "Language" msgstr "语言" #: ../system/Widget/widgets/Config/Config.php:59 -#: ../system/Widget/widgets/Feed/Feed.php:144 -#: ../system/Widget/widgets/Feed/Feed.php:155 +#: ../system/Widget/widgets/Feed/Feed.php:138 +#: ../system/Widget/widgets/Feed/Feed.php:142 #: ../system/Widget/widgets/Vcard/Vcard.php:179 msgid "Submit" msgstr "提交" @@ -575,23 +571,27 @@ msgid "Reset" msgstr "重置" #: ../system/Widget/widgets/ContactCard/ContactCard.php:61 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:164 msgid "Remove this contact" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:75 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:192 msgid "No" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:178 msgid "Yes" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:100 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:145 msgid "Chat" msgstr "聊天" #: ../system/Widget/widgets/ContactCard/ContactCard.php:110 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:63 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:71 #: ../system/Widget/widgets/Vcard/Vcard.php:75 msgid "General Informations" msgstr "" @@ -636,27 +636,28 @@ msgid "Avatar" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:129 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:96 #: ../system/Widget/widgets/Vcard/Vcard.php:160 msgid "About Me" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:138 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:88 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:111 msgid "Bot" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:139 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:89 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:112 msgid "Desktop" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:140 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:90 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:113 msgid "Phone" msgstr "" #: ../system/Widget/widgets/ContactCard/ContactCard.php:149 -#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:106 +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:129 msgid "Client Informations" msgstr "" @@ -668,6 +669,14 @@ msgstr "" msgid "Client Type" msgstr "" +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:132 +msgid "Actions" +msgstr "" + +#: ../system/Widget/widgets/ContactSummary/ContactSummary.php:202 +msgid "Invite this user" +msgstr "" + #: ../system/Widget/widgets/Feed/Feed.php:43 msgid "Loading your feed ..." msgstr "" @@ -691,23 +700,16 @@ msgid "" "feeds" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:134 -#: ../system/Widget/widgets/Feed/Feed.php:137 -#: ../system/Widget/widgets/Feed/Feed.php:148 -#: ../system/Widget/widgets/Feed/Feed.php:151 -msgid "What's new ?" -msgstr "" - -#: ../system/Widget/widgets/Feed/Feed.php:166 +#: ../system/Widget/widgets/Feed/Feed.php:154 msgid "All" msgstr "" -#: ../system/Widget/widgets/Feed/Feed.php:167 +#: ../system/Widget/widgets/Feed/Feed.php:155 msgid "My Posts" msgstr "" #: ../system/Widget/widgets/Help/Help.php:32 -msgid "What is Movim ?" +msgid "What is Movim?" msgstr "" #: ../system/Widget/widgets/Help/Help.php:34 @@ -813,20 +815,24 @@ msgid "Account successfully created" msgstr "" #: ../system/Widget/widgets/Login/Login.php:83 -msgid "Movim fail to authenticate. You entered wrong data" +msgid "Movim failed to authenticate. You entered wrong data" msgstr "" #: ../system/Widget/widgets/Login/Login.php:91 msgid "Your web browser is too old to use with Movim." msgstr "" +#: ../system/Widget/widgets/Login/Login.php:108 +msgid "Connecting..." +msgstr "" + #: ../system/Widget/widgets/Login/Login.php:110 msgid "Come in!" msgstr "登录" #: ../system/Widget/widgets/Login/Login.php:117 #, php-format -msgid "This server host %s accounts" +msgid "This server hosts %s accounts" msgstr "" #: ../system/Widget/widgets/Login/Login.php:122 @@ -837,10 +843,6 @@ msgstr "" msgid "Debug console" msgstr "检查更正主控台" -#: ../system/Widget/widgets/Logout/Logout.php:86 -msgid "Logout" -msgstr "注销" - #: ../system/Widget/widgets/Notifs/Notifs.php:44 msgid "wants to talk with you" msgstr "" @@ -850,36 +852,36 @@ msgid "Accept" msgstr "" #: ../system/Widget/widgets/Notifs/Notifs.php:62 -#: ../system/Widget/widgets/Notifs/Notifs.php:156 -msgid "Validate" +#: ../system/Widget/widgets/Notifs/Notifs.php:125 +msgid "Add" msgstr "" #: ../system/Widget/widgets/Notifs/Notifs.php:68 msgid "Decline" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:120 +#: ../system/Widget/widgets/Notifs/Notifs.php:119 #, php-format msgid "Contacts (%s)" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:126 -msgid "Add" +#: ../system/Widget/widgets/Notifs/Notifs.php:146 +msgid "Alias" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:147 -msgid "Alias" +#: ../system/Widget/widgets/Notifs/Notifs.php:155 +msgid "Send request" msgstr "" -#: ../system/Widget/widgets/Notifs/Notifs.php:163 +#: ../system/Widget/widgets/Notifs/Notifs.php:162 msgid "Cancel" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:88 +#: ../system/Widget/widgets/Profile/Profile.php:74 msgid "No profile yet ?" msgstr "" -#: ../system/Widget/widgets/Profile/Profile.php:89 +#: ../system/Widget/widgets/Profile/Profile.php:75 #: ../system/Widget/widgets/Vcard/Vcard.php:62 msgid "Create my vCard" msgstr "" diff --git a/install/index.php b/install/index.php index 397df66d1..fcdbb40a3 100644 --- a/install/index.php +++ b/install/index.php @@ -166,7 +166,7 @@ function test_bosh($boshhost, $port, $suffix, $host) $rs['header'] = curl_getinfo($ch); if($rs['errno']) { - set_error('bosh', t("Bosh connection failed with error `%s'", $rs['errmsg'])); + set_error('bosh', t("Bosh connection failed with error '%s'", $rs['errmsg'])); return false; } @@ -175,7 +175,7 @@ function test_bosh($boshhost, $port, $suffix, $host) if(is_object($arr)) $att = $arr->attributes(); if($att['type'] == 'terminate') { - set_error('bosh', t("XMPP connection through Bosh failed with error `%s'", $att['condition'])); + set_error('bosh', t("XMPP connection through Bosh failed with error '%s'", $att['condition'])); } else if(isset($att['sid'])) { return true; @@ -280,7 +280,7 @@ if(isset($_POST['install'])) { try { include('../init.php'); } catch (Exception $e) { - set_error('bdd', t("Database connection failed with error `%s'", $e->getMessage())); + set_error('bdd', t("Database connection failed with error '%s'", $e->getMessage())); goto loadpage; } diff --git a/system/Conf.php b/system/Conf.php index 75eb49ffb..30c1113fd 100644 --- a/system/Conf.php +++ b/system/Conf.php @@ -35,7 +35,7 @@ class Conf $conf = self::getServerConf(); if(!isset($conf[$element])) { - throw new MovimException(t("Cannot load element value'%s'", $element)); + throw new MovimException(t("Cannot load element value '%s'", $element)); } else { return $conf[$element]; diff --git a/system/Widget/WidgetCommon.php b/system/Widget/WidgetCommon.php index 85a4ff981..b1d2367c2 100644 --- a/system/Widget/WidgetCommon.php +++ b/system/Widget/WidgetCommon.php @@ -82,7 +82,7 @@ class WidgetCommon extends WidgetBase { diff --git a/system/Widget/widgets/Help/Help.php b/system/Widget/widgets/Help/Help.php index 5e2dcea46..58178bac7 100644 --- a/system/Widget/widgets/Help/Help.php +++ b/system/Widget/widgets/Help/Help.php @@ -29,7 +29,7 @@ class Help extends WidgetBase ?>
-

+

', ''); ?>

diff --git a/system/Widget/widgets/Login/Login.php b/system/Widget/widgets/Login/Login.php index 20b88996b..6d5015e92 100644 --- a/system/Widget/widgets/Login/Login.php +++ b/system/Widget/widgets/Login/Login.php @@ -114,7 +114,7 @@ class Login extends WidgetBase { - diff --git a/system/Widget/widgets/Logout/Logout.php b/system/Widget/widgets/Logout/Logout.php index 83eb48659..1e1a6b779 100644 --- a/system/Widget/widgets/Logout/Logout.php +++ b/system/Widget/widgets/Logout/Logout.php @@ -91,7 +91,7 @@ class Logout extends WidgetBase '.$txt[2].' '.$txt[3].' '.$txt[4].' - '.$txt[5].' + '.$txt[5].'
';
- +