Index: trunk/phase3/maintenance/language/messages.inc |
— | — | @@ -1490,7 +1490,7 @@ |
1491 | 1491 | 'enotif_anon_editor', |
1492 | 1492 | 'enotif_body', |
1493 | 1493 | ), |
1494 | | - 'deleteprotectrev' => array( |
| 1494 | + 'delete' => array( |
1495 | 1495 | 'deletepage', |
1496 | 1496 | 'confirm', |
1497 | 1497 | 'excontent', |
— | — | @@ -1517,6 +1517,8 @@ |
1518 | 1518 | 'delete-edit-reasonlist', |
1519 | 1519 | 'delete-toobig', |
1520 | 1520 | 'delete-warning-toobig', |
| 1521 | + ), |
| 1522 | + 'rollback' => array( |
1521 | 1523 | 'rollback', |
1522 | 1524 | 'rollback_short', |
1523 | 1525 | 'rollbacklink', |
— | — | @@ -1527,6 +1529,8 @@ |
1528 | 1530 | 'revertpage', |
1529 | 1531 | 'rollback-success', |
1530 | 1532 | 'sessionfailure', |
| 1533 | + ), |
| 1534 | + 'protect' => array( |
1531 | 1535 | 'protectlogpage', |
1532 | 1536 | 'protectlogtext', |
1533 | 1537 | 'protectedarticle', |
— | — | @@ -2821,7 +2825,9 @@ |
2822 | 2826 | 'watchlist' => 'Watchlist', |
2823 | 2827 | 'watching' => 'Displayed when you click the "watch" button and it is in the process of watching', |
2824 | 2828 | 'enotif' => '', |
2825 | | - 'deleteprotectrev' => 'Delete/protect/revert', |
| 2829 | + 'delete' => 'Delete', |
| 2830 | + 'rollback' => 'Rollback', |
| 2831 | + 'protect' => 'Protect', |
2826 | 2832 | 'restrictions' => 'Restrictions (nouns)', |
2827 | 2833 | 'restriction-levels' => 'Restriction levels', |
2828 | 2834 | 'undelete' => 'Undelete', |
Index: trunk/phase3/languages/messages/MessagesHe.php |
— | — | @@ -1875,51 +1875,55 @@ |
1876 | 1876 | למשוב ולעזרה נוספת: |
1877 | 1877 | {{fullurl:Project:עזרה}}', |
1878 | 1878 | |
1879 | | -# Delete/protect/revert |
1880 | | -'deletepage' => 'מחיקה', |
1881 | | -'confirm' => 'אישור', |
1882 | | -'excontent' => 'תוכן היה: "$1"', |
1883 | | -'excontentauthor' => "תוכן היה: '$1' והתורם היחיד היה [[Special:Contributions/$2|$2]]", |
1884 | | -'exbeforeblank' => 'תוכן לפני שרוקן היה: "$1"', |
1885 | | -'exblank' => 'הדף היה ריק', |
1886 | | -'delete-confirm' => 'מחיקת $1', |
1887 | | -'delete-backlink' => '→ $1', |
1888 | | -'delete-legend' => 'מחיקה', |
1889 | | -'historywarning' => 'אזהרה – לדף שאתם עומדים למחוק יש היסטוריית שינויים:', |
1890 | | -'confirmdeletetext' => 'אתם עומדים למחוק דף או תמונה יחד עם כל ההיסטוריה שלהם. |
| 1879 | +# Delete |
| 1880 | +'deletepage' => 'מחיקה', |
| 1881 | +'confirm' => 'אישור', |
| 1882 | +'excontent' => 'תוכן היה: "$1"', |
| 1883 | +'excontentauthor' => "תוכן היה: '$1' והתורם היחיד היה [[Special:Contributions/$2|$2]]", |
| 1884 | +'exbeforeblank' => 'תוכן לפני שרוקן היה: "$1"', |
| 1885 | +'exblank' => 'הדף היה ריק', |
| 1886 | +'delete-confirm' => 'מחיקת $1', |
| 1887 | +'delete-backlink' => '→ $1', |
| 1888 | +'delete-legend' => 'מחיקה', |
| 1889 | +'historywarning' => 'אזהרה – לדף שאתם עומדים למחוק יש היסטוריית שינויים:', |
| 1890 | +'confirmdeletetext' => 'אתם עומדים למחוק דף או תמונה יחד עם כל ההיסטוריה שלהם. |
1891 | 1891 | |
1892 | 1892 | אנא אשרו שזה אכן מה שאתם מתכוונים לעשות, שאתם מבינים את התוצאות של מעשה כזה, ושהמעשה מבוצע בהתאם לנהלי האתר.', |
1893 | | -'actioncomplete' => 'הפעולה בוצעה', |
1894 | | -'deletedtext' => '<strong><nowiki>$1</nowiki></strong> נמחק. ראו $2 לרשימת המחיקות האחרונות.', |
1895 | | -'deletedarticle' => 'מחק את [[$1]]', |
1896 | | -'suppressedarticle' => 'הסתיר את [[$1]]', |
1897 | | -'dellogpage' => 'יומן מחיקות', |
1898 | | -'dellogpagetext' => 'להלן רשימה של המחיקות האחרונות שבוצעו.', |
1899 | | -'deletionlog' => 'יומן מחיקות', |
1900 | | -'reverted' => 'שוחזר לגרסה קודמת', |
1901 | | -'deletecomment' => 'סיבת המחיקה:', |
1902 | | -'deleteotherreason' => 'סיבה נוספת/אחרת:', |
1903 | | -'deletereasonotherlist' => 'סיבה אחרת', |
1904 | | -'deletereason-dropdown' => ' |
| 1893 | +'actioncomplete' => 'הפעולה בוצעה', |
| 1894 | +'deletedtext' => '<strong><nowiki>$1</nowiki></strong> נמחק. ראו $2 לרשימת המחיקות האחרונות.', |
| 1895 | +'deletedarticle' => 'מחק את [[$1]]', |
| 1896 | +'suppressedarticle' => 'הסתיר את [[$1]]', |
| 1897 | +'dellogpage' => 'יומן מחיקות', |
| 1898 | +'dellogpagetext' => 'להלן רשימה של המחיקות האחרונות שבוצעו.', |
| 1899 | +'deletionlog' => 'יומן מחיקות', |
| 1900 | +'reverted' => 'שוחזר לגרסה קודמת', |
| 1901 | +'deletecomment' => 'סיבת המחיקה:', |
| 1902 | +'deleteotherreason' => 'סיבה נוספת/אחרת:', |
| 1903 | +'deletereasonotherlist' => 'סיבה אחרת', |
| 1904 | +'deletereason-dropdown' => ' |
1905 | 1905 | * סיבות מחיקה נפוצות |
1906 | 1906 | ** לבקשת הכותב |
1907 | 1907 | ** הפרת זכויות יוצרים |
1908 | 1908 | ** השחתה', |
1909 | | -'delete-edit-reasonlist' => 'עריכת סיבות המחיקה', |
1910 | | -'delete-toobig' => 'דף זה כולל מעל {{PLURAL:$1|גרסה אחת|$1 גרסאות}} בהיסטוריית העריכות שלו. מחיקת דפים כאלה הוגבלה כדי למנוע פגיעה בביצועי האתר.', |
1911 | | -'delete-warning-toobig' => 'דף זה כולל מעל {{PLURAL:$1|גרסה אחת|$1 גרסאות}} בהיסטוריית העריכות שלו. מחיקה שלו עלולה להפריע לפעולות בבסיס הנתונים; אנא שיקלו שנית את המחיקה.', |
1912 | | -'rollback' => 'שחזור עריכות', |
1913 | | -'rollback_short' => 'שחזור', |
1914 | | -'rollbacklink' => 'שחזור', |
1915 | | -'rollbackfailed' => 'השחזור נכשל', |
1916 | | -'cantrollback' => 'לא ניתן לשחזר את העריכה – התורם האחרון הוא היחיד שכתב דף זה; עם זאת, ניתן למחוק את הדף.', |
1917 | | -'alreadyrolled' => 'לא ניתן לשחזר את עריכת הדף [[:$1]] על ידי [[User:$2|$2]] ([[User talk:$2|שיחה]] | [[Special:Contributions/$2|{{int:contribslink}}]]); מישהו אחר כבר ערך או שחזר דף זה. |
| 1909 | +'delete-edit-reasonlist' => 'עריכת סיבות המחיקה', |
| 1910 | +'delete-toobig' => 'דף זה כולל מעל {{PLURAL:$1|גרסה אחת|$1 גרסאות}} בהיסטוריית העריכות שלו. מחיקת דפים כאלה הוגבלה כדי למנוע פגיעה בביצועי האתר.', |
| 1911 | +'delete-warning-toobig' => 'דף זה כולל מעל {{PLURAL:$1|גרסה אחת|$1 גרסאות}} בהיסטוריית העריכות שלו. מחיקה שלו עלולה להפריע לפעולות בבסיס הנתונים; אנא שיקלו שנית את המחיקה.', |
1918 | 1912 | |
| 1913 | +# Rollback |
| 1914 | +'rollback' => 'שחזור עריכות', |
| 1915 | +'rollback_short' => 'שחזור', |
| 1916 | +'rollbacklink' => 'שחזור', |
| 1917 | +'rollbackfailed' => 'השחזור נכשל', |
| 1918 | +'cantrollback' => 'לא ניתן לשחזר את העריכה – התורם האחרון הוא היחיד שכתב דף זה; עם זאת, ניתן למחוק את הדף.', |
| 1919 | +'alreadyrolled' => 'לא ניתן לשחזר את עריכת הדף [[:$1]] על ידי [[User:$2|$2]] ([[User talk:$2|שיחה]] | [[Special:Contributions/$2|{{int:contribslink}}]]); מישהו אחר כבר ערך או שחזר דף זה. |
| 1920 | + |
1919 | 1921 | העריכה האחרונה הייתה של [[User:$3|$3]] ([[User talk:$3|שיחה]] | [[Special:Contributions/$3|{{int:contribslink}}]]).', |
1920 | | -'editcomment' => "תקציר העריכה היה: \"'''\$1'''\".", # only shown if there is an edit comment |
1921 | | -'revertpage' => 'שוחזר מעריכה של [[Special:Contributions/$2|$2]] ([[User talk:$2|שיחה]]) לעריכה האחרונה של [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from |
1922 | | -'rollback-success' => 'שוחזר מעריכה של $1 לעריכה האחרונה של $2', |
1923 | | -'sessionfailure' => 'נראה שיש בעיה בחיבורכם לאתר. פעולתכם בוטלה כאמצעי זהירות כנגד התחזות לתקשורת ממחשבכם. אנא חיזרו לדף הקודם ונסו שנית.', |
| 1922 | +'editcomment' => "תקציר העריכה היה: \"'''\$1'''\".", # only shown if there is an edit comment |
| 1923 | +'revertpage' => 'שוחזר מעריכה של [[Special:Contributions/$2|$2]] ([[User talk:$2|שיחה]]) לעריכה האחרונה של [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from |
| 1924 | +'rollback-success' => 'שוחזר מעריכה של $1 לעריכה האחרונה של $2', |
| 1925 | +'sessionfailure' => 'נראה שיש בעיה בחיבורכם לאתר. פעולתכם בוטלה כאמצעי זהירות כנגד התחזות לתקשורת ממחשבכם. אנא חיזרו לדף הקודם ונסו שנית.', |
| 1926 | + |
| 1927 | +# Protect |
1924 | 1928 | 'protectlogpage' => 'יומן הגנות', |
1925 | 1929 | 'protectlogtext' => 'להלן רשימה של הפעלות וביטולי הגנות על דפים. ראו גם את [[Special:ProtectedPages|רשימת הדפים המוגנים]] הנוכחית.', |
1926 | 1930 | 'protectedarticle' => 'הפעיל הגנה על [[$1]]', |
Index: trunk/phase3/languages/messages/MessagesEn.php |
— | — | @@ -2241,58 +2241,62 @@ |
2242 | 2242 | Feedback and further assistance: |
2243 | 2243 | {{fullurl:{{MediaWiki:Helppage}}}}', |
2244 | 2244 | |
2245 | | -# Delete/protect/revert |
2246 | | -'deletepage' => 'Delete page', |
2247 | | -'confirm' => 'Confirm', |
2248 | | -'excontent' => "content was: '$1'", |
2249 | | -'excontentauthor' => "content was: '$1' (and the only contributor was '[[Special:Contributions/$2|$2]]')", |
2250 | | -'exbeforeblank' => "content before blanking was: '$1'", |
2251 | | -'exblank' => 'page was empty', |
2252 | | -'delete-confirm' => 'Delete "$1"', |
2253 | | -'delete-backlink' => '← $1', # only translate this message to other languages if you have to change it |
2254 | | -'delete-legend' => 'Delete', |
2255 | | -'historywarning' => 'Warning: The page you are about to delete has a history:', |
2256 | | -'confirmdeletetext' => 'You are about to delete a page along with all of its history. |
| 2245 | +# Delete |
| 2246 | +'deletepage' => 'Delete page', |
| 2247 | +'confirm' => 'Confirm', |
| 2248 | +'excontent' => "content was: '$1'", |
| 2249 | +'excontentauthor' => "content was: '$1' (and the only contributor was '[[Special:Contributions/$2|$2]]')", |
| 2250 | +'exbeforeblank' => "content before blanking was: '$1'", |
| 2251 | +'exblank' => 'page was empty', |
| 2252 | +'delete-confirm' => 'Delete "$1"', |
| 2253 | +'delete-backlink' => '← $1', # only translate this message to other languages if you have to change it |
| 2254 | +'delete-legend' => 'Delete', |
| 2255 | +'historywarning' => 'Warning: The page you are about to delete has a history:', |
| 2256 | +'confirmdeletetext' => 'You are about to delete a page along with all of its history. |
2257 | 2257 | Please confirm that you intend to do this, that you understand the consequences, and that you are doing this in accordance with [[{{MediaWiki:Policy-url}}|the policy]].', |
2258 | | -'actioncomplete' => 'Action complete', |
2259 | | -'deletedtext' => '"<nowiki>$1</nowiki>" has been deleted. |
| 2258 | +'actioncomplete' => 'Action complete', |
| 2259 | +'deletedtext' => '"<nowiki>$1</nowiki>" has been deleted. |
2260 | 2260 | See $2 for a record of recent deletions.', |
2261 | | -'deletedarticle' => 'deleted "[[$1]]"', |
2262 | | -'suppressedarticle' => 'suppressed "[[$1]]"', |
2263 | | -'dellogpage' => 'Deletion log', |
2264 | | -'dellogpagetext' => 'Below is a list of the most recent deletions.', |
2265 | | -'deletionlog' => 'deletion log', |
2266 | | -'reverted' => 'Reverted to earlier revision', |
2267 | | -'deletecomment' => 'Reason for deletion:', |
2268 | | -'deleteotherreason' => 'Other/additional reason:', |
2269 | | -'deletereasonotherlist' => 'Other reason', |
2270 | | -'deletereason-dropdown' => '*Common delete reasons |
| 2261 | +'deletedarticle' => 'deleted "[[$1]]"', |
| 2262 | +'suppressedarticle' => 'suppressed "[[$1]]"', |
| 2263 | +'dellogpage' => 'Deletion log', |
| 2264 | +'dellogpagetext' => 'Below is a list of the most recent deletions.', |
| 2265 | +'deletionlog' => 'deletion log', |
| 2266 | +'reverted' => 'Reverted to earlier revision', |
| 2267 | +'deletecomment' => 'Reason for deletion:', |
| 2268 | +'deleteotherreason' => 'Other/additional reason:', |
| 2269 | +'deletereasonotherlist' => 'Other reason', |
| 2270 | +'deletereason-dropdown' => '*Common delete reasons |
2271 | 2271 | ** Author request |
2272 | 2272 | ** Copyright violation |
2273 | 2273 | ** Vandalism', |
2274 | | -'delete-edit-reasonlist' => 'Edit delete reasons', |
2275 | | -'delete-toobig' => 'This page has a large edit history, over $1 {{PLURAL:$1|revision|revisions}}. |
| 2274 | +'delete-edit-reasonlist' => 'Edit delete reasons', |
| 2275 | +'delete-toobig' => 'This page has a large edit history, over $1 {{PLURAL:$1|revision|revisions}}. |
2276 | 2276 | Deletion of such pages has been restricted to prevent accidental disruption of {{SITENAME}}.', |
2277 | | -'delete-warning-toobig' => 'This page has a large edit history, over $1 {{PLURAL:$1|revision|revisions}}. |
| 2277 | +'delete-warning-toobig' => 'This page has a large edit history, over $1 {{PLURAL:$1|revision|revisions}}. |
2278 | 2278 | Deleting it may disrupt database operations of {{SITENAME}}; |
2279 | 2279 | proceed with caution.', |
2280 | | -'rollback' => 'Roll back edits', |
2281 | | -'rollback_short' => 'Rollback', |
2282 | | -'rollbacklink' => 'rollback', |
2283 | | -'rollbackfailed' => 'Rollback failed', |
2284 | | -'cantrollback' => 'Cannot revert edit; |
| 2280 | + |
| 2281 | +# Rollback |
| 2282 | +'rollback' => 'Roll back edits', |
| 2283 | +'rollback_short' => 'Rollback', |
| 2284 | +'rollbacklink' => 'rollback', |
| 2285 | +'rollbackfailed' => 'Rollback failed', |
| 2286 | +'cantrollback' => 'Cannot revert edit; |
2285 | 2287 | last contributor is only author of this page.', |
2286 | | -'alreadyrolled' => 'Cannot rollback last edit of [[:$1]] by [[User:$2|$2]] ([[User talk:$2|Talk]] | [[Special:Contributions/$2|{{int:contribslink}}]]); |
| 2288 | +'alreadyrolled' => 'Cannot rollback last edit of [[:$1]] by [[User:$2|$2]] ([[User talk:$2|Talk]] | [[Special:Contributions/$2|{{int:contribslink}}]]); |
2287 | 2289 | someone else has edited or rolled back the page already. |
2288 | 2290 | |
2289 | 2291 | The last edit to the page was by [[User:$3|$3]] ([[User talk:$3|Talk]] | [[Special:Contributions/$3|{{int:contribslink}}]]).', |
2290 | | -'editcomment' => 'The edit comment was: "<i>$1</i>".', # only shown if there is an edit comment |
2291 | | -'revertpage' => 'Reverted edits by [[Special:Contributions/$2|$2]] ([[User talk:$2|Talk]]) to last version by [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from |
2292 | | -'rollback-success' => 'Reverted edits by $1; |
| 2292 | +'editcomment' => 'The edit comment was: "<i>$1</i>".', # only shown if there is an edit comment |
| 2293 | +'revertpage' => 'Reverted edits by [[Special:Contributions/$2|$2]] ([[User talk:$2|Talk]]) to last version by [[User:$1|$1]]', # Additional available: $3: revid of the revision reverted to, $4: timestamp of the revision reverted to, $5: revid of the revision reverted from, $6: timestamp of the revision reverted from |
| 2294 | +'rollback-success' => 'Reverted edits by $1; |
2293 | 2295 | changed back to last version by $2.', |
2294 | | -'sessionfailure' => 'There seems to be a problem with your login session; |
| 2296 | +'sessionfailure' => 'There seems to be a problem with your login session; |
2295 | 2297 | this action has been canceled as a precaution against session hijacking. |
2296 | 2298 | Please hit "back" and reload the page you came from, then try again.', |
| 2299 | + |
| 2300 | +# Protect |
2297 | 2301 | 'protectlogpage' => 'Protection log', |
2298 | 2302 | 'protectlogtext' => 'Below is a list of page locks and unlocks. |
2299 | 2303 | See the [[Special:ProtectedPages|protected pages list]] for the list of currently operational page protections.', |