We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit a254947a authored by Evan Prodromou's avatar Evan Prodromou

Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

parents dd0a99f5 6815ddaf
...@@ -10,11 +10,11 @@ msgstr "" ...@@ -10,11 +10,11 @@ msgstr ""
"Project-Id-Version: StatusNet\n" "Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-01-18 23:16+0000\n" "POT-Creation-Date: 2010-01-18 23:16+0000\n"
"PO-Revision-Date: 2010-01-18 23:17:05+0000\n" "PO-Revision-Date: 2010-01-19 23:52:48+0000\n"
"Language-Team: Arabic\n" "Language-Team: Arabic\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Generator: MediaWiki 1.16alpha (r61218); Translate extension (2010-01-16)\n" "X-Generator: MediaWiki 1.16alpha (r61275); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ar\n" "X-Language-Code: ar\n"
"X-Message-Group: out-statusnet\n" "X-Message-Group: out-statusnet\n"
...@@ -2919,7 +2919,7 @@ msgstr "" ...@@ -2919,7 +2919,7 @@ msgstr ""
#: actions/repeat.php:57 #: actions/repeat.php:57
msgid "Only logged-in users can repeat notices." msgid "Only logged-in users can repeat notices."
msgstr "" msgstr "يستطيع المستخدمون الوالجون وحدهم تكرار الإشعارات."
#: actions/repeat.php:64 actions/repeat.php:71 #: actions/repeat.php:64 actions/repeat.php:71
msgid "No notice specified." msgid "No notice specified."
......
...@@ -10,11 +10,11 @@ msgstr "" ...@@ -10,11 +10,11 @@ msgstr ""
"Project-Id-Version: StatusNet\n" "Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-01-15 19:15+0000\n" "POT-Creation-Date: 2010-01-15 19:15+0000\n"
"PO-Revision-Date: 2010-01-16 17:51:30+0000\n" "PO-Revision-Date: 2010-01-19 23:52:52+0000\n"
"Language-Team: Egyptian Spoken Arabic\n" "Language-Team: Egyptian Spoken Arabic\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Generator: MediaWiki 1.16alpha (r61138); Translate extension (2010-01-04)\n" "X-Generator: MediaWiki 1.16alpha (r61275); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: arz\n" "X-Language-Code: arz\n"
"X-Message-Group: out-statusnet\n" "X-Message-Group: out-statusnet\n"
...@@ -4116,12 +4116,12 @@ msgstr "" ...@@ -4116,12 +4116,12 @@ msgstr ""
msgid "Problem saving notice." msgid "Problem saving notice."
msgstr "مشكله أثناء حفظ الإشعار." msgstr "مشكله أثناء حفظ الإشعار."
#: classes/Notice.php:1052 #: classes/Notice.php:1059
#, php-format #, php-format
msgid "DB error inserting reply: %s" msgid "DB error inserting reply: %s"
msgstr "" msgstr ""
#: classes/Notice.php:1423 #: classes/Notice.php:1441
#, php-format #, php-format
msgid "RT @%1$s %2$s" msgid "RT @%1$s %2$s"
msgstr "آر تى @%1$s %2$s" msgstr "آر تى @%1$s %2$s"
......
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-01-18 23:16+0000\n" "POT-Creation-Date: 2010-01-19 23:52+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
......
This diff is collapsed.
...@@ -176,15 +176,25 @@ margin-bottom:0; ...@@ -176,15 +176,25 @@ margin-bottom:0;
.profile { .profile {
padding-top:4px; padding-top:4px;
padding-bottom:4px; padding-bottom:4px;
min-height:65px;
} }
.notice div.entry-content { #content .notice .entry-title {
float:left;
width:100%;
margin-left:0;
}
#content .notice .author .photo {
position:static;
float:left;
}
#content .notice div.entry-content {
margin-left:0; margin-left:0;
width:75%; width:75%;
max-width:100%; max-width:100%;
min-width:0; min-width:0;
} }
.notice-options { .notice-options {
width:50px; width:43px;
margin-right:1%; margin-right:1%;
} }
...@@ -192,6 +202,13 @@ margin-right:1%; ...@@ -192,6 +202,13 @@ margin-right:1%;
width:16px; width:16px;
height:16px; height:16px;
} }
.notice-options form.processing {
background-image:none;
}
#wrap .notice-options form.processing input.submit {
background-position:0 47%;
}
.notice .notice-options a, .notice .notice-options a,
.notice .notice-options input { .notice .notice-options input {
box-shadow:none; box-shadow:none;
...@@ -202,16 +219,16 @@ box-shadow:none; ...@@ -202,16 +219,16 @@ box-shadow:none;
.notice .notice-options form { .notice .notice-options form {
margin:-4px 0 0 0; margin:-4px 0 0 0;
} }
.notice .notice-options .notice_repeat, .notice .notice-options .form_repeat,
.notice .notice-options .notice_delete { .notice .notice-options .notice_delete {
margin-top:18px; margin-top:11px;
} }
.notice .notice-options .notice_reply, .notice .notice-options .form_favor,
.notice .notice-options .notice_repeat { .notice .notice-options .form_disfavor,
margin-left:18px; .notice .notice-options .form_repeat {
margin-right:11px;
} }
.notice .notice-options .notice_delete { .notice .notice-options .notice_delete {
float:left; float:left;
} }
......
...@@ -1012,6 +1012,16 @@ float:left; ...@@ -1012,6 +1012,16 @@ float:left;
#shownotice .vcard .photo { #shownotice .vcard .photo {
margin-bottom:4px; margin-bottom:4px;
} }
#content .notice .author .photo {
position:absolute;
top:11px;
left:0;
float:none;
}
#content .notice .entry-title {
margin-left:59px;
}
.vcard .url { .vcard .url {
text-decoration:none; text-decoration:none;
} }
...@@ -1020,13 +1030,19 @@ text-decoration:underline; ...@@ -1020,13 +1030,19 @@ text-decoration:underline;
} }
.notice .entry-title { .notice .entry-title {
float:left;
width:100%;
overflow:hidden; overflow:hidden;
} }
.notice .entry-title.ov { .notice .entry-title.ov {
overflow:visible; overflow:visible;
} }
#showstream .notice .entry-title,
#showstream .notice div.entry-content {
margin-left:0;
}
#shownotice .notice .entry-title,
#shownotice .notice div.entry-content {
margin-left:110px;
}
#shownotice .notice .entry-title { #shownotice .notice .entry-title {
font-size:2.2em; font-size:2.2em;
} }
...@@ -1056,7 +1072,6 @@ max-width:70%; ...@@ -1056,7 +1072,6 @@ max-width:70%;
} }
#showstream .notice div.entry-content, #showstream .notice div.entry-content,
#shownotice .notice div.entry-content { #shownotice .notice div.entry-content {
margin-left:0;
max-width:79%; max-width:79%;
} }
...@@ -1120,6 +1135,7 @@ position:relative; ...@@ -1120,6 +1135,7 @@ position:relative;
font-size:0.95em; font-size:0.95em;
width:113px; width:113px;
float:right; float:right;
margin-top:3px;
margin-right:4px; margin-right:4px;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment