[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [websites/wiki-kde-org/develop] extensions/UserMerge: update usermerge extension
From: Ingo Malchow <imalchow () kde ! org>
Date: 2013-08-07 8:56:06
Message-ID: E1V6zXK-0001C4-MM () scm ! kde ! org
[Download RAW message or body]
Git commit 405662a5088c3610eb9bc362ee1f032156b44cb7 by Ingo Malchow.
Committed on 07/08/2013 at 08:55.
Pushed by imalchow into branch 'develop'.
update usermerge extension
M +98 -33 extensions/UserMerge/UserMerge.alias.php
M +969 -401 extensions/UserMerge/UserMerge.i18n.php
M +32 -10 extensions/UserMerge/UserMerge.php
M +560 -131 extensions/UserMerge/UserMerge_body.php
M +0 -0 extensions/UserMerge/install.settings
http://commits.kde.org/websites/wiki-kde-org/405662a5088c3610eb9bc362ee1f032156b44cb7
diff --git a/extensions/UserMerge/UserMerge.alias.php \
b/extensions/UserMerge/UserMerge.alias.php old mode 100755
new mode 100644
index 8b83e92..2be3951
--- a/extensions/UserMerge/UserMerge.alias.php
+++ b/extensions/UserMerge/UserMerge.alias.php
@@ -23,32 +23,57 @@ $specialPageAliases['arz'] = array(
'UserMerge' => array( 'دمج_يوزر' ),
);
-/** Assamese (অসমীয়া) */
+/** Assamese (অসমীয়া) */
$specialPageAliases['as'] = array(
- 'UserMerge' => array( 'সদস্য চামিল কৰক' ),
+ 'UserMerge' => array( 'সদস্য_একত্ৰীকৰণ_কৰক' ),
);
-/** Breton (Brezhoneg) */
+/** Banjar (Bahasa Banjar) */
+$specialPageAliases['bjn'] = array(
+ 'UserMerge' => array( 'Panggabungan_pamakai' ),
+);
+
+/** Breton (brezhoneg) */
$specialPageAliases['br'] = array(
'UserMerge' => array( 'KendeuziñImplijer' ),
);
-/** Bosnian (Bosanski) */
+/** Bosnian (bosanski) */
$specialPageAliases['bs'] = array(
'UserMerge' => array( 'SpajanjeKorisnika' ),
);
+/** буряад (буряад) */
+$specialPageAliases['bxr'] = array(
+ 'UserMerge' => array( 'Хэрэглэгшые_нэгэдхэхэ' ),
+);
+
/** German (Deutsch) */
$specialPageAliases['de'] = array(
'UserMerge' => array( 'Benutzerkonten_vereinigen' ),
);
-/** Lower Sorbian (Dolnoserbski) */
+/** Zazaki (Zazaki) */
+$specialPageAliases['diq'] = array(
+ 'UserMerge' => array( 'KarberaPétewrke' ),
+);
+
+/** Lower Sorbian (dolnoserbski) */
$specialPageAliases['dsb'] = array(
'UserMerge' => array( 'Wužywarjow zjadnośiś' ),
);
-/** Spanish (Español) */
+/** Greek (Ελληνικά) */
+$specialPageAliases['el'] = array(
+ 'UserMerge' => array( 'ΣυγχώνευσηΧρήστη' ),
+);
+
+/** Esperanto (Esperanto) */
+$specialPageAliases['eo'] = array(
+ 'UserMerge' => array( 'Kunigi_uzanton' ),
+);
+
+/** Spanish (español) */
$specialPageAliases['es'] = array(
'UserMerge' => array( 'FusionarUsuario', 'Fusionar_usuario' ),
);
@@ -58,24 +83,24 @@ $specialPageAliases['fa'] = array(
'UserMerge' => array( 'ادغام_کاربر' ),
);
-/** Finnish (Suomi) */
+/** Finnish (suomi) */
$specialPageAliases['fi'] = array(
'UserMerge' => array( 'Tunnusten_yhdistäminen' ),
);
-/** French (Français) */
+/** French (français) */
$specialPageAliases['fr'] = array(
- 'UserMerge' => array( 'Fusionner les utilisateurs', 'FusionnerLesUtilisateurs', \
'Fusionner utilisateurs', 'FusionnerUtilisateurs', 'Fusionner utilisateur', \
'FusionnerUtilisateur' ), + 'UserMerge' => array( 'Fusionner_les_utilisateurs', \
'FusionnerLesUtilisateurs', 'Fusionner_utilisateurs', 'FusionnerUtilisateurs', \
'Fusionner_utilisateur', 'FusionnerUtilisateur' ), );
-/** Franco-Provençal (Arpetan) */
+/** Franco-Provençal (arpetan) */
$specialPageAliases['frp'] = array(
- 'UserMerge' => array( 'Fusionar los utilisators', 'FusionarLosUtilisators' ),
+ 'UserMerge' => array( 'Fusionar_los_usanciérs', 'FusionarLosUsanciérs' ),
);
/** Swiss German (Alemannisch) */
$specialPageAliases['gsw'] = array(
- 'UserMerge' => array( 'Benutzerchonte zämmefiere' ),
+ 'UserMerge' => array( 'Benutzer_zämmefiere' ),
);
/** Hebrew (עברית) */
@@ -83,17 +108,22 @@ $specialPageAliases['he'] = array(
'UserMerge' => array( 'מיזוג_משתמשים' ),
);
-/** Upper Sorbian (Hornjoserbsce) */
+/** Upper Sorbian (hornjoserbsce) */
$specialPageAliases['hsb'] = array(
'UserMerge' => array( 'Wužiwarjow zjednoćić' ),
);
-/** Hungarian (Magyar) */
+/** Haitian (Kreyòl ayisyen) */
+$specialPageAliases['ht'] = array(
+ 'UserMerge' => array( 'FizyonItilizatè' ),
+);
+
+/** Hungarian (magyar) */
$specialPageAliases['hu'] = array(
- 'UserMerge' => array( 'Felhasználók egyesítése' ),
+ 'UserMerge' => array( 'Felhasználók_egyesítése' ),
);
-/** Interlingua (Interlingua) */
+/** Interlingua (interlingua) */
$specialPageAliases['ia'] = array(
'UserMerge' => array( 'Fusionar_usatores' ),
);
@@ -103,7 +133,7 @@ $specialPageAliases['id'] = array(
'UserMerge' => array( 'Penggabungan_pengguna', 'PenggabunganPengguna' ),
);
-/** Italian (Italiano) */
+/** Italian (italiano) */
$specialPageAliases['it'] = array(
'UserMerge' => array( 'UnisciUtenze' ),
);
@@ -123,11 +153,21 @@ $specialPageAliases['ksh'] = array(
'UserMerge' => array( 'Metmaacher zosammelääje', 'Medmaacher zosammelääje' ),
);
+/** Cornish (kernowek) */
+$specialPageAliases['kw'] = array(
+ 'UserMerge' => array( 'KesunyaDevnydhyer' ),
+);
+
/** Luxembourgish (Lëtzebuergesch) */
$specialPageAliases['lb'] = array(
'UserMerge' => array( 'Benotzerkonten_zesummeleeën' ),
);
+/** Macedonian (македонски) */
+$specialPageAliases['mk'] = array(
+ 'UserMerge' => array( 'СпојКорисник' ),
+);
+
/** Malayalam (മലയാളം) */
$specialPageAliases['ml'] = array(
'UserMerge' => array( 'ഉപയോക്തൃലയനം' ),
@@ -138,7 +178,12 @@ $specialPageAliases['mr'] = array(
'UserMerge' => array( 'सदस्यविलीनीकरण' ),
);
-/** Nedersaksisch (Nedersaksisch) */
+/** Norwegian Bokmål (norsk bokmål) */
+$specialPageAliases['nb'] = array(
+ 'UserMerge' => array( 'Slå_sammen_brukere' ),
+);
+
+/** Low Saxon (Netherlands) (Nedersaksies) */
$specialPageAliases['nds-nl'] = array(
'UserMerge' => array( 'Gebrukers_samenvoegen' ),
);
@@ -148,27 +193,32 @@ $specialPageAliases['nl'] = array(
'UserMerge' => array( 'GebruikersSamenvoegen' ),
);
-/** Norwegian (bokmål) (Norsk (bokmål)) */
-$specialPageAliases['no'] = array(
- 'UserMerge' => array( 'Slå sammen brukere' ),
-);
-
-/** Occitan (Occitan) */
+/** Occitan (occitan) */
$specialPageAliases['oc'] = array(
'UserMerge' => array( 'Fusionar los utilizaires', 'FusionarLosUtilizaire', \
'Fusionar utilizaires', 'FusionarUtilizaires', 'Fusionar utilizaire', \
'FusionarUtilizaire' ), );
-/** Portuguese (Português) */
+/** Portuguese (português) */
$specialPageAliases['pt'] = array(
- 'UserMerge' => array( 'Fundir utilizadores' ),
+ 'UserMerge' => array( 'Fundir_utilizadores' ),
+);
+
+/** Brazilian Portuguese (português do Brasil) */
+$specialPageAliases['pt-br'] = array(
+ 'UserMerge' => array( 'Fundir_contas' ),
);
-/** Sanskrit (संस्कृत) */
+/** Sanskrit (संस्कृतम्) */
$specialPageAliases['sa'] = array(
'UserMerge' => array( 'सदस्यसंयोग' ),
);
-/** Slovak (Slovenčina) */
+/** Sicilian (sicilianu) */
+$specialPageAliases['scn'] = array(
+ 'UserMerge' => array( 'UnisciUtenze' ),
+);
+
+/** Slovak (slovenčina) */
$specialPageAliases['sk'] = array(
'UserMerge' => array( 'ZlúčeniePoužívateľov' ),
);
@@ -185,7 +235,7 @@ $specialPageAliases['th'] = array(
/** Tagalog (Tagalog) */
$specialPageAliases['tl'] = array(
- 'UserMerge' => array( 'Pagsasanib ng tagagamit' ),
+ 'UserMerge' => array( 'Pagsasanib_ng_tagagamit' ),
);
/** Turkish (Türkçe) */
@@ -193,12 +243,27 @@ $specialPageAliases['tr'] = array(
'UserMerge' => array( 'KullanıcıBirleştir' ),
);
+/** Ukrainian (українська) */
+$specialPageAliases['uk'] = array(
+ 'UserMerge' => array( 'Об\'єднання_користувачів' ),
+);
+
+/** Vietnamese (Tiếng Việt) */
+$specialPageAliases['vi'] = array(
+ 'UserMerge' => array( 'Hợp_nhất_người_dùng' ),
+);
+
/** Yiddish (ייִדיש) */
$specialPageAliases['yi'] = array(
'UserMerge' => array( 'צו ויפגיסן_בא יצער' ),
);
-/**
- * For backwards compatibility with MediaWiki 1.15 and earlier.
- */
-$aliases =& $specialPageAliases;
\ No newline at end of file
+/** Simplified Chinese (中文（简体）) */
+$specialPageAliases['zh-hans'] = array(
+ 'UserMerge' => array( '合并用户' ),
+);
+
+/** Traditional Chinese (中文（繁體）) */
+$specialPageAliases['zh-hant'] = array(
+ 'UserMerge' => array( '合併用戶' ),
+);
\ No newline at end of file
diff --git a/extensions/UserMerge/UserMerge.i18n.php \
b/extensions/UserMerge/UserMerge.i18n.php old mode 100755
new mode 100644
index 4b7b6c0..c77d341
--- a/extensions/UserMerge/UserMerge.i18n.php
+++ b/extensions/UserMerge/UserMerge.i18n.php
@@ -11,57 +11,104 @@ $messages = array();
$messages['en'] = array(
'usermerge' => 'Merge and delete users',
'usermerge-desc' => "[[Special:UserMerge|Merges references from one \
user to another user]] in the wiki database - will also delete old users following \
merge. Requires ''usermerge'' privileges",
- 'usermerge-badolduser' => 'Invalid old username',
- 'usermerge-badnewuser' => 'Invalid new username',
- 'usermerge-nonewuser' => 'Empty new username - assuming merge to "$1".<br />
+ 'usermerge-badolduser' => 'Invalid old username.',
+ 'usermerge-badnewuser' => 'Invalid new username.',
+ 'usermerge-nonewuser' => 'Empty new username. Assuming merge to \
"{{GENDER:$1|$1}}".<br /> Click "{{int:usermerge-submit}}" to accept.',
- 'usermerge-noolduser' => 'Empty old username',
+ 'usermerge-noolduser' => 'Empty old username.',
+ 'usermerge-same-old-and-new-user' => 'The old and new user names need to be \
distinct.', 'usermerge-fieldset' => 'Usernames to merge',
'usermerge-olduser' => 'Old user (merge from):',
'usermerge-newuser' => 'New user (merge to):',
'usermerge-deleteolduser' => 'Delete old user',
'usermerge-submit' => 'Merge user',
- 'usermerge-badtoken' => 'Invalid edit token',
+ 'usermerge-badtoken' => 'Invalid edit token.',
'usermerge-userdeleted' => '$1 ($2) has been deleted.',
'usermerge-userdeleted-log' => 'Deleted user: $2 ($3)',
'usermerge-updating' => 'Updating $1 table ($2 to $3)',
- 'usermerge-success' => 'Merge from $1 ($2) to $3 ($4) is complete.',
- 'usermerge-success-log' => 'User $2 ($3) merged to $4 ($5)',
+ 'usermerge-success' => 'Merge from $1 ($2) to {{GENDER:$3|$3}} ($4) is \
complete.', + 'usermerge-success-log' => 'User $2 ($3) merged to {{GENDER:$4|$4}} \
($5)', 'usermerge-logpage' => 'User merge log',
'usermerge-logpagetext' => 'This is a log of user merge actions.',
'usermerge-noselfdelete' => 'You cannot delete or merge from yourself!',
- 'usermerge-unmergable' => 'Unable to merge from user - ID or name has been defined \
as unmergable.',
- 'usermerge-protectedgroup' => 'Unable to merge from user - user is in a protected \
group.', + 'usermerge-unmergable' => 'Unable to merge from user: ID or name has been \
defined as unmergable.', + 'usermerge-protectedgroup' => 'Unable to merge from user: \
User is in a protected group.', 'right-usermerge' => 'Merge users',
+ 'action-usermerge' => 'merge users',
+ 'usermerge-editcount-merge-success' => 'Adding $1 {{PLURAL:$1|edit|edits}} of user \
$2 to $3 {{PLURAL:$3|edit|edits}} of user $4 ($5 {{PLURAL:$5|edit|edits}} after \
merging)', + 'usermerge-autopagedelete' => 'Automatically deleted when merging \
users', + 'usermerge-page-unmoved' => 'The page $1 could not be moved to $2.',
+ 'usermerge-page-moved' => 'The page $1 has been moved to $2.',
+ 'usermerge-move-log' => 'Automatically moved page while merging the user \
"[[User:$1|$1]]" to "[[User:$2|{{GENDER:$2|$2}}]]"', + 'usermerge-page-deleted' => \
'Deleted page $1', );
/** Message documentation (Message documentation)
* @author Fryed-peach
* @author Jon Harald Søby
* @author Meno25
+ * @author Nemo bis
* @author Purodha
+ * @author Shirayuki
* @author Siebrand
+ * @author Umherirrender
*/
$messages['qqq'] = array(
- 'usermerge-desc' => '{{desc}}',
- 'usermerge-badtoken' => '{{Identical|Invalid edit token}}',
- 'usermerge-userdeleted' => 'Parameters:
-* $1 is a user name (not linked)
-* $2 is a user ID',
+ 'usermerge' => '{{doc-special|UserMerge}}',
+ 'usermerge-desc' => '{{desc|name=User \
Merge|url=http://www.mediawiki.org/wiki/Extension:User_Merge_and_Delete}}', \
+ 'usermerge-nonewuser' => '{{doc-important|Do not translate \
<code><nowiki>{{int:usermerge-submit}}</nowiki></code>.}} +Used as error message. \
Parameters: +* $1 - username "Anonymous" (hard-coded)',
+ 'usermerge-submit' => '{{Identical|Merge user}}',
+ 'usermerge-badtoken' => 'Used as error message if the Edit Token is invalid.',
+ 'usermerge-userdeleted' => 'Status message. Parameters:
+* $1 is the name of a user that was deleted (not linked).
+* $2 is the ID of a user that was deleted.',
'usermerge-userdeleted-log' => 'Parameters:
* $2 is a user name (not linked) of the deleted user
* $3 is a user ID of the deleted user',
- 'usermerge-success' => 'Parameters:
+ 'usermerge-updating' => 'Status message. Parameters:
+* $1 is a database table name.
+* $2 is the ID of the old user.
+* $3 is the ID of the new user.',
+ 'usermerge-success' => 'Status message. Parameters:
* $1 is a user name (not linked) that is merged into another user
* $2 is a user ID of the source user
-* $3 is a user name (not linked) that the other user is merged into
+* $3 is a user name (not linked) that the other user is merged into; can be used for \
GENDER
* $4 is a user ID of the target user',
'usermerge-success-log' => 'Parameters:
* $2 is a user name (not linked) that is merged into another user
* $3 is a user ID of the source user
-* $4 is a user name (not linked) that the other user is merged into
+* $4 is a user name (not linked) that the other user is merged into; can be used for \
GENDER
* $5 is a user ID of the target user',
- 'right-usermerge' => '{{doc-right}}',
+ 'usermerge-logpage' => '{{doc-logpage}}',
+ 'right-usermerge' => '{{doc-right|usermerge}}
+{{Identical|Merge user}}',
+ 'action-usermerge' => '{{doc-action|usermerge}}
+{{Identical|Merge user}}',
+ 'usermerge-editcount-merge-success' => 'Message that indicates two users have been \
merged. Parameters: +* $1 is the number of edits of user with ID $2 before merging.
+* $2 is the user ID of the user that was merged into user with ID $4.
+* $3 is the number of edits of user with ID $3 before merging
+* $4 is the user ID of the user that the user with ID $2 was merged into.
+* $5 is the combined edit count of users with ID $2 and with ID $4',
+ 'usermerge-page-unmoved' => 'Used as failure message when moving a page. \
Parameters: +* $1 - old page title (with link)
+* $2 - new page title (with link)
+See also:
+* {{msg-mw|Usermerge-page-moved}}',
+ 'usermerge-page-moved' => 'Used as success message when moving a page. Parameters:
+* $1 - old page title (with link, without redirect)
+* $2 - new page title (with link)
+See also:
+* {{msg-mw|Usermerge-page-unmoved}}',
+ 'usermerge-move-log' => 'Parameters:
+* $1 - old username
+* $2 - new username',
+ 'usermerge-page-deleted' => 'This message indicates that the page $1 has been \
deleted successfully. +
+Parameters:
+* $1 - old page name (with link)',
);
/** Afrikaans (Afrikaans)
@@ -73,7 +120,7 @@ $messages['af'] = array(
'usermerge-badolduser' => 'Ongeldige ou gebruiker',
'usermerge-badnewuser' => 'Ongeldige nuwe gebruiker',
'usermerge-nonewuser' => 'Die nuwe gebruikersnaam is nie ingevoer nie - daar word \
aangeneem dat dit met $1 versmelt moet word.<br />
-Kliek "{{int:usermerge-submit}}" om die handeling uit te voer.',
+Kliek "{{int:usermerge-submit}}" om die handeling uit te voer.', # Fuzzy
'usermerge-noolduser' => 'Ou gebruikersnaam is leeg',
'usermerge-fieldset' => 'Gebruikers om saam te smelt',
'usermerge-olduser' => 'Ou gebruiker (versmelt van):',
@@ -84,8 +131,8 @@ Kliek "{{int:usermerge-submit}}" om die handeling uit te voer.',
'usermerge-userdeleted' => '$1 ($2) is verwyder.',
'usermerge-userdeleted-log' => 'Verwyderde gebruiker: $2 ($3)',
'usermerge-updating' => 'Tabel $1 aan die verander ($2 na $3)',
- 'usermerge-success' => 'Versmelting van $1 ($2) na $3 ($4) is voltooi.',
- 'usermerge-success-log' => 'Gebruiker $2 ($3) is versmelt na $4 ($5)',
+ 'usermerge-success' => 'Versmelting van $1 ($2) na $3 ($4) is voltooi.', # Fuzzy
+ 'usermerge-success-log' => 'Gebruiker $2 ($3) is versmelt na $4 ($5)', # Fuzzy
'usermerge-logpage' => 'Logboek van gebruikersversmeltings',
'usermerge-logpagetext' => "Die is 'n logboek van gebruikersversmeltings.",
'usermerge-noselfdelete' => 'U kan nie uself verwyder of versmelt nie!',
@@ -102,7 +149,7 @@ $messages['aln'] = array(
'usermerge-desc' => "[[Special:UserMerge|referencat bashkohet nga një user në \
një përdorues tjetër]] në bazën e të dhënave wiki - do të fshini gjithashtu \
përdoruesit e vjetër pas bashkohen. Kërkon''''usermerge privilegje", \
'usermerge-badolduser' => 'emrin e pavlefshme të vjetra', 'usermerge-badnewuser' => \
'emrin e pavlefshme të reja',
- 'usermerge-nonewuser' => 'Bosh emrin e re - duke supozuar të bashkohen për të "" \
$1 ". <br /> Kliko "{{int:usermerge-submit}}" për të pranuar.', \
+ 'usermerge-nonewuser' => 'Bosh emrin e re - duke supozuar të bashkohen për të "" \
$1 ". <br /> Kliko "{{int:usermerge-submit}}" për të pranuar.', # Fuzzy \
'usermerge-noolduser' => 'Bosh emrin e vjetër', 'usermerge-fieldset' => 'Emr të \
bashkojë', 'usermerge-olduser' => 'përdorues Vjetër (bashkojë nga):',
@@ -113,8 +160,8 @@ $messages['aln'] = array(
'usermerge-userdeleted' => '$1 ($2) është fshirë.',
'usermerge-userdeleted-log' => 'përdorues Deleted: $2 ($3)',
'usermerge-updating' => 'Tabela Përditësimi $1 ($2 në $3)',
- 'usermerge-success' => 'Merge nga $1 ($2) për $3 ($4), është i kompletuar.',
- 'usermerge-success-log' => 'User $2 ($3) bashkohen në $4 ($5)',
+ 'usermerge-success' => 'Merge nga $1 ($2) për $3 ($4), është i kompletuar.', # \
Fuzzy + 'usermerge-success-log' => 'User $2 ($3) bashkohen në $4 ($5)', # Fuzzy
'usermerge-logpage' => 'Përdoruesi bashkojë log',
'usermerge-logpagetext' => 'Ky është një regjistër i përdoruesit bashkojë \
veprimet.', 'usermerge-noselfdelete' => 'Ju nuk mund të fshini ose përpuqni nga \
vetë!', @@ -126,6 +173,7 @@ $messages['aln'] = array(
/** Arabic (العربية)
* @author Meno25
* @author OsamaK
+ * @author روخو
*/
$messages['ar'] = array(
'usermerge' => 'دمج وحذف المستخدمين',
@@ -133,7 +181,7 @@ $messages['ar'] = array(
'usermerge-badolduser' => 'اسم المستخدم القديم غير صحيح',
'usermerge-badnewuser' => 'اسم المستخدم الجديد غير صحيح',
'usermerge-nonewuser' => 'اسم مستخدم جديد فارغ - افتراض \
الدمج إلى "$1".<br />
-اضغط "{{int:usermerge-submit}}" للقبول.',
+اضغط "{{int:usermerge-submit}}" للقبول.', # Fuzzy
'usermerge-noolduser' => 'اسم المستخدم القديم فارغ',
'usermerge-fieldset' => 'أسماء المستخدمين للدمج',
'usermerge-olduser' => 'مستخدم قديم (دمج من):',
@@ -144,14 +192,15 @@ $messages['ar'] = array(
'usermerge-userdeleted' => '$1($2) تم حذفه.',
'usermerge-userdeleted-log' => 'حذف المستخدم: $2($3)',
'usermerge-updating' => 'تحديث $1 جدول ($2 إلى $3)',
- 'usermerge-success' => 'الدمج من $1($2) إلى $3($4) اكتمل.',
- 'usermerge-success-log' => 'المستخدم $2($3) تم دمجه مع $4($5)',
+ 'usermerge-success' => 'الدمج من $1($2) إلى $3($4) اكتمل.', # Fuzzy
+ 'usermerge-success-log' => 'المستخدم $2($3) تم دمجه مع $4($5)', # \
Fuzzy 'usermerge-logpage' => 'سجل دمج المستخدم',
'usermerge-logpagetext' => 'هذا سجل بأفعال دمج \
المستخدمين.', 'usermerge-noselfdelete' => 'لا يمكنك حذف أو \
دمج من نفسك!', 'usermerge-unmergable' => 'غير قادر على الدمج \
من مستخدم - الرقم أو الاسم تم تعريفه كغير قابل \
للدمج.', 'usermerge-protectedgroup' => 'غير قادر على الدمج من \
المستخدم - المستخدم في مجموعة محمية.', \
'right-usermerge' => 'دمج المستخدمين', + 'usermerge-page-deleted' => \
'صفحة محذوفة $1', );
/** Aramaic (ܐܪܡܝܐ)
@@ -174,7 +223,7 @@ $messages['arz'] = array(
'usermerge-badolduser' => 'اسم اليوزر القديم مش صحيح',
'usermerge-badnewuser' => 'اسم اليوزر الجديد مش صحيح',
'usermerge-nonewuser' => 'اسم يوزر جديد فارغ - افتراض \
الدمج إلى $1.<br />
-اضغط "{{int:usermerge-submit}}" للقبول.',
+اضغط "{{int:usermerge-submit}}" للقبول.', # Fuzzy
'usermerge-noolduser' => 'اسم اليوزر القديم فارغ',
'usermerge-fieldset' => 'أسماء اليوزرز للدمج',
'usermerge-olduser' => 'يوزر قديم (دمج من):',
@@ -185,8 +234,8 @@ $messages['arz'] = array(
'usermerge-userdeleted' => '$1($2) تم حذفه.',
'usermerge-userdeleted-log' => 'حذف اليوزر: $2($3)',
'usermerge-updating' => 'تحديث $1 جدول ($2 إلى $3)',
- 'usermerge-success' => 'الدمج من $1($2) إلى $3($4) اكتمل.',
- 'usermerge-success-log' => 'اليوزر $2($3) تم دمجه مع $4($5)',
+ 'usermerge-success' => 'الدمج من $1($2) إلى $3($4) اكتمل.', # Fuzzy
+ 'usermerge-success-log' => 'اليوزر $2($3) تم دمجه مع $4($5)', # Fuzzy
'usermerge-logpage' => 'سجل دمج اليوزر',
'usermerge-logpagetext' => 'ده سجل بأفعال دمج اليوزرز.',
'usermerge-noselfdelete' => 'لا يمكنك حذف أو دمج من نفسك!',
@@ -195,10 +244,49 @@ $messages['arz'] = array(
'right-usermerge' => 'دمج اليوزرز',
);
-/** Belarusian (Taraškievica orthography) (Беларуская \
(тарашкевіца)) +/** Asturian (asturianu)
+ * @author Xuacu
+ */
+$messages['ast'] = array(
+ 'usermerge' => 'Fusionar y desaniciar usuarios',
+ 'usermerge-desc' => "[[Special:UserMerge|Fusiona les referencies d'un usuariu \
n'otru usuariu]] na base de datos de la wiki (tamién desaniciará l'usuariu antiguu \
darréu de la fusión). Requier permisos d'''usermerge''", + 'usermerge-badolduser' \
=> "Nome d'usuariu antiguu inválidu.", + 'usermerge-badnewuser' => "Nome d'usuariu \
nuevu inválidu", + 'usermerge-nonewuser' => 'Nome d\'usuariu nuevu baleru. Asumese \
la fusión en "{{GENDER:$1|$1}}".<br /> +Calque "{{int:usermerge-submit}}" \
p\'aceutar.', + 'usermerge-noolduser' => "Nome d'usuariu antiguu baleru",
+ 'usermerge-fieldset' => "Nomes d'usuariu a fusionar",
+ 'usermerge-olduser' => 'Usuariu antiguu (fusionar dende):',
+ 'usermerge-newuser' => 'Usuariu nuevu (fusionar en):',
+ 'usermerge-deleteolduser' => "Desaniciar l'usuariu antiguu",
+ 'usermerge-submit' => 'Fusionar usuariu',
+ 'usermerge-badtoken' => "Pase d'edición inválidu",
+ 'usermerge-userdeleted' => "Desaniciáu l'usuariu $1 ($2).",
+ 'usermerge-userdeleted-log' => 'Usuariu desaniciáu: $2 ($3)',
+ 'usermerge-updating' => 'Actualizando la tabla $1 ($2 a $3)',
+ 'usermerge-success' => 'La fusión dende $1 ($2) a {{GENDER:$3|$3}} ($4) ta \
completa.', + 'usermerge-success-log' => 'Usuariu $2 ($3) fusionáu con \
{{GENDER:$4|$4}} ($5)', + 'usermerge-logpage' => "Rexistru de fusión d'usuarios",
+ 'usermerge-logpagetext' => "Esti ye un rexistru d'aiciones de fusión d'usuarios.",
+ 'usermerge-noselfdelete' => ' Nun pue desaniciase o fusionar dende sigo mesmu!',
+ 'usermerge-unmergable' => "Nun pue fusionar dende l'usuariu: La ID o'l nome \
definieronse como non fusionables.", + 'usermerge-protectedgroup' => "Nun pue \
fusionase dende l'usuariu: L'usuariu ta nun grupu protexíu.", + 'right-usermerge' => \
'Fusionar usuarios', + 'action-usermerge' => 'fusionar usuarios',
+ 'usermerge-editcount-merge-success' => 'Amestando $1 \
{{PLURAL:$1|edición|ediciones}} del usuariu $2 a $3 {{PLURAL:$3|edición|ediciones}} \
del usuariu $4 ($5 {{PLURAL:$5|edición|ediciones}} dempués de fusionar)', \
+ 'usermerge-autopagedelete' => 'Desaniciao automáticamente al fusionar usuarios', \
+ 'usermerge-page-unmoved' => 'La páxina $1 nun pudo treslladase a $2.', \
+ 'usermerge-page-moved' => 'La páxina $1 treslladóse a $2.', \
+ 'usermerge-move-log' => 'Treslladóse la páxina automáticamente al fusionar al \
usuariu "[[User:$1|$1]]" en "[[User:$2|{{GENDER:$2|$2}}]]"', \
+ 'usermerge-page-deleted' => 'Páxina "$1" desaniciada', +);
+
+/** Belarusian (Taraškievica orthography) (беларуская \
(тарашкевіца))
* @author EugeneZelenko
* @author Jim-by
* @author Red Winged Duck
+ * @author Renessaince
+ * @author Wizardist
*/
$messages['be-tarask'] = array(
'usermerge' => "Аб'яднаньне і выдаленьне рахункаў \
удзельнікаў", @@ -206,7 +294,7 @@ $messages['be-tarask'] = array(
'usermerge-badolduser' => 'Няслушнае старое імя \
ўдзельніка', 'usermerge-badnewuser' => 'Няслушнае новае \
імя ўдзельніка', 'usermerge-nonewuser' => "Пустое новае \
імя ўдзельніка — мяркуецца аб'яднаньне з $1 \
.<br />
-Націсьніце {{int:usermerge-submit}} каб пагадзіцца.",
+Націсьніце {{int:usermerge-submit}} каб пагадзіцца.", # \
Fuzzy 'usermerge-noolduser' => 'Пустое старое імя \
ўдзельніка', 'usermerge-fieldset' => "Імёны ўдзельнікаў \
для аб'яднаньня", 'usermerge-olduser' => "Стары ўдзельнік \
(аб'яднаць з):", @@ -217,17 +305,25 @@ $messages['be-tarask'] = array(
'usermerge-userdeleted' => '$1 ($2) быў выдалены.',
'usermerge-userdeleted-log' => 'Выдалены рахунак \
удзельніка: $2 ($3)', 'usermerge-updating' => 'Абнаўленьне \
табліцы $1 ($2 да $3)',
- 'usermerge-success' => "Аб'яднаньне $1 ($2) з $3 ($4) \
скончанае.",
- 'usermerge-success-log' => "Удзельнік $2 ($3) аб'яднаны з $4 \
($5)",
- 'usermerge-logpage' => "Журнал аб'яднаньня рахункаў \
удзельнікаў",
- 'usermerge-logpagetext' => "Гэта журнал аб'яднаньня \
рахункаў удзельнікаў.", + 'usermerge-success' => \
"Аб'яднаньне $1 ($2) з $3 ($4) скончанае.", # Fuzzy \
+ 'usermerge-success-log' => "Удзельнік $2 ($3) аб'яднаны з $4 \
($5)", # Fuzzy + 'usermerge-logpage' => 'Журнал аб'яднаньня \
рахункаў удзельнікаў', + 'usermerge-logpagetext' => 'Гэта \
журнал аб'яднаньня рахункаў удзельнікаў.', \
'usermerge-noselfdelete' => "Вы ня можаце выдаліць ці \
аб'яднаць уласны рахунак!", 'usermerge-unmergable' => \
"Немагчыма аб'яднаць рахунак удзельніка — \
ідэнтыфікатар ці імя былі пазначаны як \
неаб'яднальныя.", 'usermerge-protectedgroup' => "Немагчыма \
аб'яднаць рахунак удзельніка — удзельнік \
знаходзіцца ў абароненай групе.", 'right-usermerge' => \
"аб'яднаньне рахункаў удзельнікаў", + 'action-usermerge' \
=> 'аб'ядноўваць удзельнікаў', + 'usermerge-editcount' => \
'Дадаць лічыльнік рэдагаваньняў?', \
+ 'usermerge-editcount-success' => 'Даданьне лічыльніка \
рэдагаваньняў ($1 і $2)', + 'usermerge-autopagedelete' => \
'Аўтаматычна выдалены падчас аб'яднаньня \
рахункаў ўдзельнікаў', + 'usermerge-page-unmoved' => \
'Старонка $1 ня можа быць перанесеная ў $2.', \
+ 'usermerge-page-moved' => 'Старонка $1 перанесеная ў $2.', \
+ 'usermerge-move-log' => 'Аўтаматычна перанесеная \
старонка падчас аб'яднаньня рахунку \
ўдзельніка [[User:$1|$1]] з [[User:$2|$2]] ', # Fuzzy \
+ 'usermerge-page-deleted' => 'Выдаленая старонка $1', );
-/** Bulgarian (Български)
+/** Bulgarian (български)
* @author DCLXVI
*/
$messages['bg'] = array(
@@ -243,8 +339,8 @@ $messages['bg'] = array(
'usermerge-submit' => 'Сливане',
'usermerge-userdeleted' => '$1($2) беше изтрит.',
'usermerge-userdeleted-log' => 'Изтрит потребител: $2($3)',
- 'usermerge-success' => 'Сливането от $1 ($2) към $3 ($4) \
приключи.',
- 'usermerge-success-log' => 'Потребител $2 ($3) беше слят с $4 \
($5)', + 'usermerge-success' => 'Сливането от $1 ($2) към $3 ($4) \
приключи.', # Fuzzy + 'usermerge-success-log' => 'Потребител $2 \
($3) беше слят с $4 ($5)', # Fuzzy 'usermerge-logpage' => 'Дневник \
на потребителските сливания', 'usermerge-logpagetext' => \
'Тази страница съдържа дневник на \
потребителските сливания.', 'usermerge-noselfdelete' => 'Не \
е възможно да изтривате или сливате от себе \
си!', @@ -262,7 +358,7 @@ $messages['bn'] = array(
'usermerge-desc' => "উইকি ডাটাবেজে \
[[Special:UserMerge|একজন ব্যবহারকারী থেকে \
অপর ব্যবহারকারীর প্রতি \
নির্দেশনাগুলি একত্রিত করে]] - \
এছাড়া একত্রীকরণের পরে পুরনো \
ব্যবহারকারীদের মুছে দেবে। \
বিশেষ ''usermerge'' অধিকার আবশ্যক", \
'usermerge-badolduser' => 'অবৈধ পুরনো \
ব্যবহারকারী নাম', 'usermerge-badnewuser' => \
'অবৈধ নতুন ব্যবহারকারী \
নাম',
- 'usermerge-nonewuser' => 'খালি নতুন \
ব্যবহারকারী নাম - $1-এর সাথে \
একত্রীকরণ করা হচ্ছে ধরা হলে। <br \
/><u>ব্যবহারকারী একত্রিত করা হোক</u> \
ক্লিক করে সম্মতি দিন।', + 'usermerge-nonewuser' \
=> 'খালি নতুন ব্যবহারকারী নাম - $1-এর \
সাথে একত্রীকরণ করা হচ্ছে ধরা \
হলে। <br />"{{int:usermerge-submit}}" ক্লিক করে \
সম্মতি দিন।', # Fuzzy 'usermerge-noolduser' => 'খালি \
পুরনো ব্যবহারকারী নাম', 'usermerge-fieldset' \
=> 'একত্রিক করার জন্য \
ব্যবহারকারীনাম', 'usermerge-olduser' => 'পুরনো \
ব্যবহারকারী (যার থেকে \
একত্রীকরণ):', @@ -273,8 +369,8 @@ $messages['bn'] = array(
'usermerge-userdeleted' => '$1 ($2) মুছে ফেলা \
হয়েছে।', 'usermerge-userdeleted-log' => \
'ব্যবহারকারী মুছে ফেলে হয়েছে: $2 \
($3)', 'usermerge-updating' => '$1 টেবিল হালনাগাদ \
করা হচ্ছে ($2 থেকে $3-তে)',
- 'usermerge-success' => '$1 ($2) থেকে $3 ($4)-তে \
একত্রীকরণ সম্পন্ন \
হয়েছে।',
- 'usermerge-success-log' => 'ব্যবহারকারী $2 ($3)-কে $4 \
($5)-এর সাথে একত্রিত করা হয়েছে', \
+ 'usermerge-success' => '$1 ($2) থেকে $3 ($4)-তে \
একত্রীকরণ সম্পন্ন হয়েছে।', # Fuzzy \
+ 'usermerge-success-log' => 'ব্যবহারকারী $2 ($3)-কে $4 \
($5)-এর সাথে একত্রিত করা হয়েছে', # Fuzzy \
'usermerge-logpage' => 'ব্যবহারকারী একত্রীকরণ \
লগ', 'usermerge-logpagetext' => 'এটি ব্যবহারকারী \
একত্রীকরনের একটি লগ।', 'usermerge-noselfdelete' \
=> 'আপনি নিজের ব্যবহারকারী নাম \
মুছে ফেলতে বা এটি থেকে অন্য নামে \
একত্রিত করতে পারবেন না!', @@ -283,7 +379,8 @@ \
$messages['bn'] = array( 'right-usermerge' => 'ব্যবহারকারী \
একত্রিত করা হোক', );
-/** Breton (Brezhoneg)
+/** Breton (brezhoneg)
+ * @author Fohanno
* @author Fulup
*/
$messages['br'] = array(
@@ -292,7 +389,7 @@ $messages['br'] = array(
'usermerge-badolduser' => 'Anv implijer kozh direizh',
'usermerge-badnewuser' => 'Anv implijer nevez direizh',
'usermerge-nonewuser' => 'Anv implijer nevez goullo - soñjal a ra deomp e fell \
deoc\'h kendeuziñ davet "$1".<br />
-Klikañ war "{{int:usermerge-submit}}" evit asantiñ.',
+Klikañ war "{{int:usermerge-submit}}" evit asantiñ.', # Fuzzy
'usermerge-noolduser' => 'Anv implijer kozh goullo',
'usermerge-fieldset' => 'Anvioù implijer da gendeuziñ',
'usermerge-olduser' => 'Implijer kozh (kendeuziñ adal) :',
@@ -303,17 +400,19 @@ Klikañ war "{{int:usermerge-submit}}" evit asantiñ.',
'usermerge-userdeleted' => 'Diverket eo bet $1 ($2).',
'usermerge-userdeleted-log' => 'Implijer diverket : $2($3)',
'usermerge-updating' => "Oc'h hizivaat an daolenn $1 (eus $2 da $3)",
- 'usermerge-success' => 'Kendeuzadenn adal $1 ($2) davet $3 ($4) kaset da benn \
vat.',
- 'usermerge-success-log' => 'Implijer $2 ($3) kendeuzet davet $4 ($5)',
+ 'usermerge-success' => 'Kendeuzadenn adal $1 ($2) davet $3 ($4) kaset da benn \
vat.', # Fuzzy + 'usermerge-success-log' => 'Implijer $2 ($3) kendeuzet davet $4 \
($5)', # Fuzzy 'usermerge-logpage' => 'Marilh kendeuzadennoù an implijerien',
'usermerge-logpagetext' => 'Setu aze marilh kendeuzadennoù an implijerien.',
'usermerge-noselfdelete' => "N'hallit ket diverkañ pe kendeuziñ adal pe davedoc'h \
hoc'h-unan", 'usermerge-unmergable' => 'Dibosupl kendeuziñ adal un implijer - un \
niv. anaout pe un anv bet termenet evel digendeuzadus.', 'usermerge-protectedgroup' \
=> 'Dibosupl kendeuziñ an implijer - emañ-eñ en ur strollad gwarezet', \
'right-usermerge' => 'Kendeuziñ implijerien', + 'action-usermerge' => 'kendeuziñ \
implijerien', + 'usermerge-page-deleted' => 'Pajenn $1 diverket',
);
-/** Bosnian (Bosanski)
+/** Bosnian (bosanski)
* @author CERminator
*/
$messages['bs'] = array(
@@ -322,7 +421,7 @@ $messages['bs'] = array(
'usermerge-badolduser' => 'Nevaljano staro korisničko ime',
'usermerge-badnewuser' => 'Nevaljano novo korisničko ime',
'usermerge-nonewuser' => 'Prazno novo korisničko ime - pretpostavljam da se spaja \
na "$1".<br />
-Kliknite na "{{int:usermerge-submit}}" za prihvatanje.',
+Kliknite na "{{int:usermerge-submit}}" za prihvatanje.', # Fuzzy
'usermerge-noolduser' => 'Prazno staro korisničko ime',
'usermerge-fieldset' => 'Korisnička imena za spajanje',
'usermerge-olduser' => 'Stari korisnik (spajanje sa):',
@@ -333,8 +432,8 @@ Kliknite na "{{int:usermerge-submit}}" za prihvatanje.',
'usermerge-userdeleted' => '$1 ($2) je obrisan.',
'usermerge-userdeleted-log' => 'Obrisani korisnik: $2 ($3)',
'usermerge-updating' => 'Ažuriram $1 tabelu ($2 do $3)',
- 'usermerge-success' => 'Spajanje sa $1 ($2) na $3 ($4) je završeno.',
- 'usermerge-success-log' => 'Korisnik $2 ($3) spojen na $4 ($5)',
+ 'usermerge-success' => 'Spajanje sa $1 ($2) na $3 ($4) je završeno.', # Fuzzy
+ 'usermerge-success-log' => 'Korisnik $2 ($3) spojen na $4 ($5)', # Fuzzy
'usermerge-logpage' => 'Zapisnik spajanja korisnika',
'usermerge-logpagetext' => 'Ovo je zapisnik akcija spajanja korisnika.',
'usermerge-noselfdelete' => 'Ne možete obrisati ili spajati od samog sebe!',
@@ -343,7 +442,7 @@ Kliknite na "{{int:usermerge-submit}}" za prihvatanje.',
'right-usermerge' => 'Spajanje korisnika',
);
-/** Catalan (Catal )
+/** Catalan (catal )
* @author Paucabot
* @author SMP
* @author Solde
@@ -358,16 +457,26 @@ $messages['ca'] = array(
'usermerge-submit' => 'Combina els usuaris',
'usermerge-userdeleted-log' => 'Usuari eliminat: $2 ($3)',
'usermerge-logpage' => "Registre de fusions d'usuaris",
+ 'right-usermerge' => 'Fusionar usuaris',
+);
+
+/** Chechen (нохчийн)
+ * @author Умар
+ */
+$messages['ce'] = array(
+ 'usermerge-userdeleted' => '$1 ($2) дӀаяккхи.',
+ 'usermerge-page-moved' => 'АгӀона $1 цӀе хийцина оцу $2.',
+ 'usermerge-page-deleted' => 'ДӀаяккха агӀо $1',
);
-/** Sorani (کوردی)
+/** Sorani Kurdish (کوردی)
* @author Marmzok
*/
$messages['ckb'] = array(
'usermerge-deleteolduser' => 'سڕینەوەی بەکارهێنەری کۆن',
);
-/** Czech (Česky)
+/** Czech (česky)
* @author Matěj Grabovský
* @author Mormegil
*/
@@ -377,7 +486,7 @@ $messages['cs'] = array(
'usermerge-badolduser' => 'Původní uživatelské jméno je neplatné',
'usermerge-badnewuser' => 'Neplatné nové uživatelské jmnéo',
'usermerge-nonewuser' => 'Nové uživatelské jméno je prázdné – \
předpokládá se sloučení do „$1".<br />
-Potvrdit můžete kliknutím na „{{int:usermerge-submit}}".',
+Potvrdit můžete kliknutím na „{{int:usermerge-submit}}".', # Fuzzy
'usermerge-noolduser' => 'Původní uživatelské jméno je prázdné',
'usermerge-fieldset' => 'Slučovaná uživatelská jména',
'usermerge-olduser' => 'Původní uživatel (odkud se slučuje):',
@@ -388,8 +497,8 @@ Potvrdit můžete kliknutím na „{{int:usermerge-submit}}".',
'usermerge-userdeleted' => '$1 ($2) byl smazán.',
'usermerge-userdeleted-log' => 'Smazaný uživatel: $2 ($3)',
'usermerge-updating' => 'Aktualizuje se tabulka $1 ($2 na $3)',
- 'usermerge-success' => 'Sloučení z $1 ($2) do $3 ($4) je dokončeno.',
- 'usermerge-success-log' => 'Uživatel $2 ($3) byl sloučen do $4 ($5)',
+ 'usermerge-success' => 'Sloučení z $1 ($2) do $3 ($4) je dokončeno.', # Fuzzy
+ 'usermerge-success-log' => 'Uživatel $2 ($3) byl sloučen do $4 ($5)', # Fuzzy
'usermerge-logpage' => 'Kniha slučování uživatelů',
'usermerge-logpagetext' => 'Toto je záznam slučování uživatelů.',
'usermerge-noselfdelete' => 'Nemůžete smazat nebo sloučit svůj vlastní \
účet!', @@ -399,46 +508,55 @@ Potvrdit můžete kliknutím na \
„{{int:usermerge-submit}}".', );
/** German (Deutsch)
+ * @author Das Schäfchen
+ * @author Kghbln
* @author Lukas9950
+ * @author Metalhead64
* @author Raimond Spekking
* @author Umherirrender
*/
$messages['de'] = array(
'usermerge' => 'Benutzerkonten zusammenführen und löschen',
- 'usermerge-desc' => "[[Special:UserMerge|Führt Benutzerkonten in der \
Wiki-Datenbank zusammen]] - das alte Benutzerkonto wird nach der Zusammenführung \
gelöscht. Erfordert das ''usermerge''-Recht.", + 'usermerge-desc' => 'Ergänzt eine \
[[Special:UserMerge|Spezialseite]] zum Zusammenführen von Benutzerkonten und der \
anschließenden Löschung des alten Benutzerkontos in der Datenbank des Wikis', \
'usermerge-badolduser' => 'Ungültiger alter Benutzername', 'usermerge-badnewuser' \
=> 'Ungültiger neuer Benutzername',
- 'usermerge-nonewuser' => 'Leerer neuer Benutzername - es wird eine Zusammenführung \
mit „$1" vermutet.<br />
-Klicke auf „{{int:usermerge-submit}}" zum Ausführen.',
- 'usermerge-noolduser' => 'Leerer alter Benutzername',
+ 'usermerge-nonewuser' => 'Es wurde kein neuer Benutzername angegeben. Daher wird \
eine Zusammenführung mit „{{GENDER:$1|$1}}" angenommen.<br /> +Zum Ausführen auf \
„{{int:usermerge-submit}}" klicken.', + 'usermerge-noolduser' => 'Es wurde kein \
neuer Benutzername angegeben.', 'usermerge-fieldset' => 'Benutzernamen zum \
Zusammenführen', 'usermerge-olduser' => 'Alter Benutzername (zusammenführen \
von):', 'usermerge-newuser' => 'Neuer Benutzername (zusammenführen nach):',
'usermerge-deleteolduser' => 'Alten Benutzernamen löschen',
'usermerge-submit' => 'Benutzerkonten zusammenführen',
- 'usermerge-badtoken' => 'Ungültiges Bearbeiten-Token',
+ 'usermerge-badtoken' => 'Ungültiges Bearbeitungstoken',
'usermerge-userdeleted' => '„$1" ($2) wurde gelöscht.',
'usermerge-userdeleted-log' => 'hat „$2" ($3) gelöscht',
'usermerge-updating' => 'Aktualisiere Tabelle $1 ($2 nach $3) …',
- 'usermerge-success' => 'Die Zusammenführung von „$1" ($2) nach „$3" ($4) war \
erfolgreich.',
- 'usermerge-success-log' => 'hat „$2" ($3) mit „$4" ($5) zusammengeführt',
- 'usermerge-logpage' => 'Benutzerkonten-Zusammenführungs-Logbuch',
- 'usermerge-logpagetext' => 'Dies ist das Logbuch der \
Benutzerkonten-Zusammenführungen.',
- 'usermerge-noselfdelete' => 'Die Zusammenführung mit sich selber ist nicht \
möglich!',
- 'usermerge-unmergable' => 'Zusammenführung nicht möglich - ID oder Benutzername \
wurde als nicht zusammenführbar definiert.',
- 'usermerge-protectedgroup' => 'Die Zusammenführung ist nicht möglich - der \
Benutzer befindet sich in einer geschützen Gruppe.',
- 'right-usermerge' => 'Benutzerkonten vereinen',
-);
-
-/** German (formal address) (Deutsch (Sie-Form))
- * @author Imre
- */
-$messages['de-formal'] = array(
- 'usermerge-nonewuser' => 'Leerer neuer Benutzername - es wird eine Zusammenführung \
mit „$1" vermutet.<br />
-Klicken Sie auf „{{int:usermerge-submit}}" zum Ausführen.',
-);
-
-/** Lower Sorbian (Dolnoserbski)
+ 'usermerge-success' => 'Die Zusammenführung von „$1" ($2) nach \
„{{GENDER:$3|$3}}" ($4) war erfolgreich.', + 'usermerge-success-log' => 'hat „$2" \
($3) mit „{{GENDER:$4|$4}}" ($5) zusammengeführt', + 'usermerge-logpage' => \
'Benutzerkontenzusammenführungs-Logbuch', + 'usermerge-logpagetext' => 'Dies ist das \
Logbuch der Benutzerkontenzusammenführungen.', + 'usermerge-noselfdelete' => 'Die \
Zusammenführung mit sich selbst ist nicht möglich.', + 'usermerge-unmergable' => \
'Die Zusammenführung ist nicht möglich: Benutzerkennung oder Benutzername wurde als \
nicht zusammenführbar definiert.', + 'usermerge-protectedgroup' => 'Die \
Zusammenführung ist nicht möglich: Der Benutzer befindet sich in einer geschützten \
Gruppe.', + 'right-usermerge' => 'Benutzerkonten zusammenführen',
+ 'action-usermerge' => 'Benutzer zusammenzuführen',
+ 'usermerge-editcount-merge-success' => '{{PLURAL:$1|Eine Bearbeitung|$1 \
Bearbeitungen}} des Benutzers $2 zu {{PLURAL:$3|einer Bearbeitung|$3 Bearbeitungen}} \
des Benutzers $4 ({{PLURAL:$5|Eine Bearbeitung|$5 Bearbeitungen}} nach der \
Zusammenführung) wurden hinzugefügt', + 'usermerge-autopagedelete' => 'Automatisch \
während der Benutzerkontenzusammenführung gelöscht', + 'usermerge-page-unmoved' => \
'Die Seite „$1" konnte nicht nach „$2" verschoben werden.', \
+ 'usermerge-page-moved' => 'Die Seite „$1" wurde nach „$2" verschoben.', \
+ 'usermerge-move-log' => 'Seite während der Benutzerkontenzusammenführung von \
„[[User:$1|$1]]" nach „[[User:$2|{{GENDER:$2|$2}}]]" automatisch verschoben', \
+ 'usermerge-page-deleted' => 'Seite „$1" gelöscht', +);
+
+/** Zazaki (Zazaki)
+ * @author Erdemaslancan
+ */
+$messages['diq'] = array(
+ 'usermerge-updating' => "Tabloy $1'i oyo ($2 ra hetê $3 ya) neweyêno",
+);
+
+/** Lower Sorbian (dolnoserbski)
* @author Michawiki
*/
$messages['dsb'] = array(
@@ -446,7 +564,7 @@ $messages['dsb'] = array(
'usermerge-desc' => "[[Special:UserMerge|Zjadnośujo reference wót jadnogo \
wužywarja k drugemu wužywarjeju]] we wikijowej datowej bance - buźo teke wšych \
starych wužywarjow pó zjadnosénju lašowaś. Pomina se pšawa ''usermerge''", \
'usermerge-badolduser' => 'Njepłaśiwe stare wužywarske mě', \
'usermerge-badnewuser' => 'Njepłaśiwe nowe wužywarske mě',
- 'usermerge-nonewuser' => 'Prozne nowe wužywarske mě - góda se zjadnośenje k \
$1.<br /> + 'usermerge-nonewuser' => 'Prozne nowe wužywarske mě - góda se \
zjadnośenje k "{{GENDER:$1|$1}}".<br /> Klikni na "{{int:usermerge-submit}}", aby \
akceptěrował.', 'usermerge-noolduser' => 'Prozne stare wužywarske mě',
'usermerge-fieldset' => 'Wužywarskej mjeni, kótarejž maju se zjadnośiś',
@@ -458,26 +576,38 @@ Klikni na "{{int:usermerge-submit}}", aby akceptěrował.',
'usermerge-userdeleted' => '$1 ($2) jo se wulašował.',
'usermerge-userdeleted-log' => 'Wulašowany wužywaŕ: $2 ($3)',
'usermerge-updating' => 'Aktualizěrujo se tabela $1 ($2 do $3)',
- 'usermerge-success' => 'Zjadnosénje wot $1 ($2) do $3 ($4) jo skóńcone.',
- 'usermerge-success-log' => 'Wužywaŕ $2 ($3) jo se do $4 ($5) zjadnośił',
+ 'usermerge-success' => 'Zjadnosénje wot $1 ($2) z {{GENDER:$3|$3}} ($4) jo \
skóńcone.', + 'usermerge-success-log' => 'Wužywaŕ $2 ($3) jo se z \
{{GENDER:$4|$4}} ($5) zjadnośił', 'usermerge-logpage' => 'Protokol wužywarskich \
zjadnośenjow', 'usermerge-logpagetext' => 'To jo protokol akcijow wužywarskich \
zjadnośenjow.', 'usermerge-noselfdelete' => 'Njamóžoš se ze sobu zjadnośiś!',
'usermerge-unmergable' => 'Zjadnosénja wót wužywarja njemóžno - ID abo \
wužywarske mě jo se ako njezjadnośujobne definěrowane.', \
'usermerge-protectedgroup' => 'Zjadnośenje wót wužywarja njemóžno - wužywaŕ jo \
w šćitanej kupce.', 'right-usermerge' => 'Wužywarjow zjadnośiś',
+ 'action-usermerge' => 'wužywarjow zjadnośiś',
+ 'usermerge-editcount' => 'Licenje změnow pśidaś?',
+ 'usermerge-editcount-success' => 'Pśidawanje licenja změnow ($1 a $2)',
+ 'usermerge-autopagedelete' => 'Pśi zjadnośenju wužywarjow awtomatiski \
wulašowany', + 'usermerge-page-unmoved' => 'Bok $1 njejo se do $2 pśesunuś dał.',
+ 'usermerge-page-moved' => 'Bok $1 jo se do $2 pśesunuł.',
+ 'usermerge-move-log' => 'Bok za zjadnośenje wužywarja "[[User:$1|$1]]" z \
"[[User:$2|{{GENDER:$2|$2}}]]" awtomatiski pśesunjony', + 'usermerge-page-deleted' \
=> 'Bok $1 wulašowany', );
/** Greek (Ελληνικά)
* @author Consta
* @author Crazymadlover
* @author Omnipaedista
+ * @author Protnet
* @author ZaDiak
*/
$messages['el'] = array(
'usermerge' => 'Συγχώνευση και διαγραφή χρηστών',
+ 'usermerge-desc' => "[[Special: UserMerge|Συγχωνεύει αναφορές \
από ένα χρήστη σε έναν άλλο χρήστη]] στη βάση \
δεδομένων του wiki - θα διαγράψει επίσης τους \
παλιούς χρήστες μετά από τη συγχώνευση. \
Απαιτεί δικαιώματα '' usermerge''", # Fuzzy 'usermerge-badolduser' \
=> 'Μη έγκυρο παλιό όνομα χρήστη', 'usermerge-badnewuser' => \
'Μη έγκυρο νέο όνομα χρήστη', + 'usermerge-nonewuser' => 'Το \
νέο όνομα χρήστη είναι κενό - η συγχώνευση θα \
γίνει σε " $1 ".<br /> +Κάντε κλικ στο κουμπί \
"{{int:usermerge-submit}}" για αποδοχή.', # Fuzzy 'usermerge-noolduser' => \
'Άδειασμα παλαιού ονόματος χρήστη', \
'usermerge-fieldset' => 'Ονόματα χρηστών προς \
συγχώνευση', 'usermerge-olduser' => ' αλιός χρήστης \
(συγχώνευση από):', @@ -488,12 +618,21 @@ $messages['el'] = array(
'usermerge-userdeleted' => 'Ο $1 ($2) έχει διαγραφεί.',
'usermerge-userdeleted-log' => 'Διεγραμμένος χρήστης: $2 ($3)',
'usermerge-updating' => 'Ενημέρωση $1 πίνακα ($2 σε $3)',
- 'usermerge-success' => 'Η συγχώνευση από $1 ($2) σε $3 ($4) \
είναι πλήρης.',
- 'usermerge-success-log' => 'Ο χρήστης $2 ($3) συγχωνεύθηκε σε \
$4 ($5)', + 'usermerge-success' => 'Η συγχώνευση από $1 ($2) σε $3 \
($4) ολοκληρώθηκε.', # Fuzzy + 'usermerge-success-log' => 'Ο \
χρήστης $2 ($3) συγχωνεύθηκε σε $4 ($5)', # Fuzzy \
'usermerge-logpage' => 'Αρχείο καταγραφής συγχωνεύσεων \
χρηστών', 'usermerge-logpagetext' => 'Αυτό είναι ένα αρχείο \
καταγραφής συγχωνεύσεων.', 'usermerge-noselfdelete' => 'Δεν \
μπορείτε να διαγράψετε ή να συγχωνευτείτε από \
μόνος σας!', + 'usermerge-unmergable' => 'Δεν είναι δυνατή η \
συγχώνευση από χρήστη - το αναγνωριστικό \
χρήστη ή το όνομα έχει οριστεί ως μη \
συγχωνεύσιμο.', + 'usermerge-protectedgroup' => 'Δεν είναι \
δυνατή η συγχώνευση από χρήστη - ο χρήστης \
είναι μέλος μιας προστατευμένης ομάδας.', \
'right-usermerge' => 'Συγχώνευση χρηστών', + 'usermerge-editcount' \
=> ' ροσθήκη αρίθμησης επεξεργασίας;', \
+ 'usermerge-editcount-success' => 'Γίνεται προσθήκη \
αρίθμησης επεξεργασίας των ($1 και $2)', \
+ 'usermerge-autopagedelete' => 'Διαγράφεται αυτόματα κατά \
τη συγχώνευση χρηστών', + 'usermerge-page-unmoved' => 'Η \
σελίδα $1 δεν μπόρεσε να μετακινηθεί στο $2.', \
+ 'usermerge-page-moved' => 'Η σελίδα $1 έχει μετακινηθεί \
στο $2.', + 'usermerge-move-log' => 'Αυτόματα μετακινημένη \
σελίδα κατά τη συγχώνευση του χρήστη "[[User:$1|$1]]" \
σε "[[User:$2|$2]]"', # Fuzzy + 'usermerge-page-deleted' => \
'Διαγεγραμμένη σελίδα $1', );
/** Esperanto (Esperanto)
@@ -515,8 +654,8 @@ $messages['eo'] = array(
'usermerge-userdeleted' => '$1 ($2) estis forigita.',
'usermerge-userdeleted-log' => 'Forigis uzanton: $2 ($3)',
'usermerge-updating' => 'Ĝisdatigante tabelon $1 ($2 al $3)',
- 'usermerge-success' => 'Kunigado de $1 ($2) al $3 ($4) kompletiĝis.',
- 'usermerge-success-log' => 'Uzanto $2 ($3) kunigita al $4 ($5)',
+ 'usermerge-success' => 'Kunigado de $1 ($2) al $3 ($4) kompletiĝis.', # Fuzzy
+ 'usermerge-success-log' => 'Uzanto $2 ($3) kunigita al $4 ($5)', # Fuzzy
'usermerge-logpage' => 'Protokolo pri kunigado de uzantoj',
'usermerge-logpagetext' => 'Jen protokolo de kunigadoj de uzantoj',
'usermerge-noselfdelete' => 'Vi ne povas forigi aŭ kunigi de vi mem!',
@@ -524,49 +663,63 @@ $messages['eo'] = array(
'right-usermerge' => 'Kunfandi uzantojn',
);
-/** Spanish (Español)
+/** Spanish (español)
+ * @author Armando-Martin
* @author Crazymadlover
+ * @author Dferg
* @author Imre
+ * @author MarcoAurelio
* @author Sanbec
*/
$messages['es'] = array(
'usermerge' => 'Fusionar y borrar usuarios',
- 'usermerge-desc' => "[[Special:UserMerge|Fusiona referencias de un usuario a otro \
usuario]] en la base de datos wiki - borrará también usuarios antiguos en la \
siguiente fusión. requiere ''usermerge'' privilegios", + 'usermerge-desc' => \
"[[Special:UserMerge|Fusiona referencias de un usuario a otro usuario]] en la base de \
datos wiki - también borrará los usuarios antiguos como consecuencia de la fusión. \
Se requieren los permisos de ''usermerge''", 'usermerge-badolduser' => 'Nombre de \
usuario antiguo inválido', 'usermerge-badnewuser' => 'Nombre de usuario nuevo \
inválido',
- 'usermerge-nonewuser' => 'Vaciar nuevo nombre de usuario - asumiendo que fue \
fusionado a $1.<br />
-Haga Click en "{{int:usermerge-submit}}" para aceptar.',
- 'usermerge-noolduser' => 'Vaciar antiguo nombre de usuario',
+ 'usermerge-nonewuser' => 'Nuevo nombre de usuario vacío - asumiendo fusión en \
$1 .<br /> +Haga clic en {{int:usermerge-submit}} para aceptar.', # Fuzzy
+ 'usermerge-noolduser' => 'Nombre de usuario antiguo vacío',
'usermerge-fieldset' => 'Nombres de usuario a fusionar',
'usermerge-olduser' => 'Antiguo usuario (fusionar de):',
'usermerge-newuser' => 'Nuevo usuario (fusionar a):',
'usermerge-deleteolduser' => 'Borrar antiguo usuario',
'usermerge-submit' => 'Fusionar usuario',
'usermerge-badtoken' => 'Ficha de edición inválida',
- 'usermerge-userdeleted' => '$1 ($2) ha sido borrado.',
- 'usermerge-userdeleted-log' => 'Usuario borrado: $2 ($3)',
- 'usermerge-updating' => 'Actualizando $1 tabla ($2 to $3)',
- 'usermerge-success' => 'Fusión de $1 ($2) a $3 ($4) está completada.',
- 'usermerge-success-log' => 'Usuario $2 ($3) fusionado a $4 ($5)',
+ 'usermerge-userdeleted' => 'El usuario $1 ($2) ha sido borrado.',
+ 'usermerge-userdeleted-log' => 'borró la cuenta de usuario $2 ($3)',
+ 'usermerge-updating' => 'Actualizando tabla $1 ($2 to $3)',
+ 'usermerge-success' => 'La fusión de $1 ($2) a $3 ($4) ha sido completada.', # \
Fuzzy + 'usermerge-success-log' => 'fusionó al usuario $2 ($3) con el usuario \
$4 ($5)', # Fuzzy 'usermerge-logpage' => 'Registro de fusiones del usuario',
- 'usermerge-logpagetext' => 'Este es un registro de acciones de fusión de \
usuarios.',
- 'usermerge-noselfdelete' => 'Usted no puede borrarse o fusionarse a sí mismo!',
- 'usermerge-unmergable' => 'Incapaz de fusionar de usuario - ID o nombre ha sido \
definido como no fusionable.',
- 'usermerge-protectedgroup' => 'Incapaz de fusionar de usuario - Usuario está en un \
grupo protegido.', + 'usermerge-logpagetext' => 'Este es un registro de fusiones de \
cuentas de usuario.', + 'usermerge-noselfdelete' => ' No puede borrarse o fusionarse \
usted mismo!', + 'usermerge-unmergable' => 'Incapaz de fusionar desde el usuario - La \
identidad o el nombre ha sido definido como no fusionable.', \
+ 'usermerge-protectedgroup' => 'Imposible fusionar desde el usuario - el usuario \
está incluido en un grupo protegido.', 'right-usermerge' => 'Fusionar usuarios',
+ 'usermerge-editcount' => ' Agregar contador de ediciones?',
+ 'usermerge-editcount-success' => 'Agregando el contador de ediciones de ( $1 y \
$2 )', + 'usermerge-autopagedelete' => 'Eliminado automáticamente al fusionar \
usuarios', + 'usermerge-page-unmoved' => 'La página $1 no pudo ser trasladada a \
$2.', + 'usermerge-page-moved' => 'La página $1 ha sido trasladada a $2.',
+ 'usermerge-move-log' => 'Página trasladada automáticamente al fusionar al usuario \
"[[User:$1|$1]]" con el usuario "[[User:$2|$2]]"', # Fuzzy + 'usermerge-page-deleted' \
=> 'La página $1 fue eliminada', );
-/** Estonian (Eesti)
+/** Estonian (eesti)
* @author Pikne
*/
$messages['et'] = array(
+ 'usermerge-badolduser' => 'Vigane vana kasutajanimi',
+ 'usermerge-badnewuser' => 'Vigane uus kasutajanimi',
+ 'usermerge-userdeleted' => '$1 ($2) on kustutatud.',
'usermerge-logpage' => 'Kasutaja ühendamislogi',
'usermerge-logpagetext' => 'See on kasutajaühendamistoimingute logi.',
);
-/** Basque (Euskara)
+/** Basque (euskara)
* @author An13sa
* @author Theklan
+ * @author Xabier Armendaritz
*/
$messages['eu'] = array(
'usermerge-badolduser' => 'Baliogabeko lankide izen zaharra',
@@ -580,18 +733,20 @@ $messages['eu'] = array(
'usermerge-userdeleted' => '$1 ($2) ezabatua izan da.',
'usermerge-userdeleted-log' => 'Ezabatutako lankidea: $2 ($3)',
'usermerge-updating' => '$1 taula berritzen ($2(e)tik $3(e)ra)',
- 'usermerge-success' => '$1(e)tik ($2) $3(e)ra ($4) batzea burutu da.',
- 'usermerge-success-log' => '$2 ($3) lankidea $4 ($5) lankidera batu da',
+ 'usermerge-success' => '$1(e)tik ($2) $3(e)ra ($4) batzea burutu da.', # Fuzzy
+ 'usermerge-success-log' => '$2 ($3) lankidea $4 ($5) lankidera batu da', # Fuzzy
'usermerge-logpage' => 'Lankide batze loga',
'usermerge-logpagetext' => 'Log hau lankide batze ekintzena da.',
'usermerge-noselfdelete' => 'Ezin duzu zure burua ezabatu edo batu!',
'right-usermerge' => 'Lankideak bateratu',
+ 'usermerge-page-moved' => '$1 orria $2 izenera aldatu da.',
);
/** Persian (فارسی)
* @author BlueDevil
* @author Huji
* @author Meisam
+ * @author Mjbmr
* @author ZxxZxxZ
*/
$messages['fa'] = array(
@@ -599,21 +754,23 @@ $messages['fa'] = array(
'usermerge-badolduser' => 'نام کاربری قدیمی نامعتبر',
'usermerge-badnewuser' => 'نام کاربری جدید نامعتبر',
'usermerge-noolduser' => 'نام کاربری قدیمی خالی',
- 'usermerge-olduser' => 'کاربر قدیمی (ادغام از)',
+ 'usermerge-fieldset' => 'نامهای کاربری برای ادغام',
+ 'usermerge-olduser' => 'کاربر قدیمی (ادغام از)', # Fuzzy
'usermerge-newuser' => 'کاربر جدید (ادغام با):',
- 'usermerge-deleteolduser' => 'کاربر قدیمی حذف شود؟',
+ 'usermerge-deleteolduser' => 'کاربر قدیمی حذف شود؟', # Fuzzy
'usermerge-submit' => 'یکی کردن کاربر',
'usermerge-userdeleted' => '$1 ($2) پاک شد.',
'usermerge-logpage' => 'سیاههٔ ادغام کاربر',
'right-usermerge' => 'ادغام حسابهای کاربری',
);
-/** Finnish (Suomi)
+/** Finnish (suomi)
* @author Cimon Avaro
* @author Crt
* @author Nike
* @author Silvonen
* @author Str4nd
+ * @author VezonThunder
* @author Vililikku
*/
$messages['fi'] = array(
@@ -621,7 +778,7 @@ $messages['fi'] = array(
'usermerge-badolduser' => 'Vanha käyttäjätunnus ei kelpaa',
'usermerge-badnewuser' => 'Uusi käyttäjätunnus ei kelpaa',
'usermerge-nonewuser' => 'Uusi käyttäjätunnus -kenttä on tyhjä - oletetaan \
yhdistäminen tunnukseen "$1". <br />
-Napsauta "{{int:usermerge-submit}}" hyväksyäksesi.',
+Napsauta "{{int:usermerge-submit}}" hyväksyäksesi.', # Fuzzy
'usermerge-noolduser' => 'Vanha käyttäjätunnus ei voi olla tyhjä.',
'usermerge-fieldset' => 'Yhdistettävät käyttäjänimet',
'usermerge-olduser' => 'Vanha käyttäjä (mikä yhdistetään)',
@@ -632,22 +789,29 @@ Napsauta "{{int:usermerge-submit}}" hyväksyäksesi.',
'usermerge-userdeleted' => '$1 ($2) on poistettu.',
'usermerge-userdeleted-log' => 'Poistettiin käyttäjä: $2 ($3)',
'usermerge-updating' => 'Päivitetään taulukko $1 ($2 arvoon $3)',
- 'usermerge-success' => 'Yhdistäminen tunnuksesta $1 ($2) tunnukseen $3 ($4) on \
suoritettu.',
- 'usermerge-success-log' => 'Käyttäjä $2 ($3) yhdistettiin käyttäjään $4 \
($5)', + 'usermerge-success' => 'Yhdistäminen tunnuksesta $1 ($2) tunnukseen $3 ($4) \
on suoritettu.', # Fuzzy + 'usermerge-success-log' => 'Käyttäjä $2 ($3) \
yhdistettiin käyttäjään $4 ($5)', # Fuzzy 'usermerge-logpage' => 'Käyttäjien \
yhdistämisloki', 'usermerge-logpagetext' => 'Tämä on loki käyttäjätunnuksien \
yhdistämistoimista.', 'usermerge-noselfdelete' => 'Et voi poistaa tai yhdistää \
itseltäsi.', 'usermerge-protectedgroup' => 'Ei voi yhdistää käyttäjänimestä - \
käyttäjänimi kuuluu suojattuun ryhmään.', 'right-usermerge' => 'Yhdistää \
käyttäjiä', + 'usermerge-autopagedelete' => 'Poistettiin automaattisesti \
käyttäjien yhdistämisessä', + 'usermerge-page-unmoved' => 'Sivua $1 ei voitu \
siirtää nimelle $2.', + 'usermerge-page-moved' => 'Sivu $1 siirrettiin nimelle \
$2.', + 'usermerge-move-log' => 'Sivu siirretty automaattisesti yhdistettäessä \
käyttäjä "[[User:$1|$1]]" käyttäjään "[[User:$2|$2]]"', # Fuzzy \
+ 'usermerge-page-deleted' => 'Sivu $1 poistettiin', );
-/** French (Français)
+/** French (français)
* @author Crochet.david
+ * @author Gomoko
* @author Grondin
* @author Guillom
* @author IAlex
* @author McDutchie
* @author PieRRoMaN
+ * @author Seb35
* @author Sherbrooke
* @author Urhixidur
*/
@@ -656,8 +820,8 @@ $messages['fr'] = array(
'usermerge-desc' => "[[Special:UserMerge|Fusionne les références d'un utilisateur \
vers un autre]] dans la base de données wiki - supprimera aussi les anciens \
utilisateurs après la fusion. Nécessite le privilège ''usermerge''", \
'usermerge-badolduser' => 'Ancien nom d'utilisateur invalide', \
'usermerge-badnewuser' => 'Nouveau nom d'utilisateur invalide',
- 'usermerge-nonewuser' => 'Nouveau nom d'utilisateur vide. Nous faisons l'hypothèse \
que vous voulez fusionner dans $1 .<br />
-Cliquez sur {{int:usermerge-submit}} pour accepter.',
+ 'usermerge-nonewuser' => 'Nouveau nom d'utilisateur vide. Nous supposons que vous \
voulez fusionner dans "{{GENDER:$1|$1}}".<br /> +Cliquez sur \
"{{int:usermerge-submit}}" pour accepter.', 'usermerge-noolduser' => 'Ancien nom \
d'utilisateur vide', 'usermerge-fieldset' => 'Noms d'utilisateur fusionner',
'usermerge-olduser' => 'Ancien utilisateur (fusionner depuis) :',
@@ -668,41 +832,55 @@ Cliquez sur {{int:usermerge-submit}} pour accepter.',
'usermerge-userdeleted' => '$1 ($2) a été supprimé.',
'usermerge-userdeleted-log' => 'Contributeur supprimé : $2 ($3)',
'usermerge-updating' => 'Mise jour de la table $1 (de $2 $3)',
- 'usermerge-success' => 'La fusion de $1 ($2) $3 ($4) est terminée.',
- 'usermerge-success-log' => 'Utilisateur $2 ($3) fusionné avec $4 ($5)',
+ 'usermerge-success' => 'La fusion de $1 ($2) {{GENDER:$3|$3}} ($4) est \
terminée.', + 'usermerge-success-log' => 'Utilisateur $2 ($3) fusionné avec \
{{GENDER:$4|$4}} ($5)', 'usermerge-logpage' => 'Journal des fusions de comptes \
utilisateur', 'usermerge-logpagetext' => 'Voici un journal des actions de fusions \
d'utilisateurs.', 'usermerge-noselfdelete' => 'Vous ne pouvez pas vous supprimer ou \
vous fusionner vous-même !', 'usermerge-unmergable' => 'Impossible de fusionner \
l'utilisateur : le numéro ou le nom a été défini comme non fusionnable.', \
'usermerge-protectedgroup' => 'Impossible de fusionner l'utilisateur : l'utilisateur \
est dans un groupe protégé.', 'right-usermerge' => 'Fusionner des utilisateurs',
+ 'action-usermerge' => 'fusionner les utilisateurs',
+ 'usermerge-editcount-merge-success' => 'Ajout de $1 \
{{PLURAL:$1|modification|modifications}} de l'utilisateur $2 $3 \
{{PLURAL:$3|modification|modifications}} de l'utilisateur $4 ($5 \
{{PLURAL:$5|modification|modifications}} après fusion)', \
+ 'usermerge-autopagedelete' => 'Supprimé automatiquement lors de la fusion de \
utilisateurs', + 'usermerge-page-unmoved' => 'Cette page $1 ne peut pas être \
déplacée vers $2.', + 'usermerge-page-moved' => 'La page $1 a été déplacée vers \
$2.', + 'usermerge-move-log' => 'Page déplacée automatiquement lors de la fusion de \
l'utilisateur "[[User:$1|$1]]" en "[[User:$2|{{GENDER:$2|$2}}]]"', \
+ 'usermerge-page-deleted' => 'Page $1 effacée', );
-/** Franco-Provençal (Arpetan)
+/** Franco-Provençal (arpetan)
* @author ChrisPtDe
*/
$messages['frp'] = array(
- 'usermerge' => 'Fusionar et suprimar des utilisators',
- 'usermerge-badolduser' => 'Viely nom d'utilisator envalido',
- 'usermerge-badnewuser' => 'Novél nom d'utilisator envalido',
- 'usermerge-noolduser' => 'Viely nom d'utilisator vouedo',
- 'usermerge-fieldset' => 'Noms d'utilisator a fusionar',
- 'usermerge-olduser' => 'Viely utilisator (fusionar dês) :',
- 'usermerge-newuser' => 'Novél utilisator (fusionar avouéc) :',
- 'usermerge-deleteolduser' => 'Suprimar lo viely utilisator',
- 'usermerge-submit' => 'Fusionar l'utilisator',
+ 'usermerge' => 'Fusionar et suprimar des usanciérs',
+ 'usermerge-badolduser' => 'Viely nom d'usanciér envalido',
+ 'usermerge-badnewuser' => 'Novél nom d'usanciér envalido',
+ 'usermerge-noolduser' => 'Viely nom d'usanciér vouedo',
+ 'usermerge-fieldset' => 'Noms d'usanciér a fusionar',
+ 'usermerge-olduser' => 'Viely usanciér (fusionar dês) :',
+ 'usermerge-newuser' => 'Novél usanciér (fusionar avouéc) :',
+ 'usermerge-deleteolduser' => 'Suprimar lo viely usanciér',
+ 'usermerge-submit' => 'Fusionar l'usanciér',
'usermerge-badtoken' => 'Jeton de changement envalido',
'usermerge-userdeleted' => '$1 ($2) at étâ suprimâ.',
'usermerge-userdeleted-log' => 'Contributor suprimâ : $2 ($3)',
'usermerge-updating' => 'Misa a jorn de la trâbla $1 (de $2 a $3)',
- 'usermerge-success' => 'La fusion de $1 ($2) a $3 ($4) est chavonâ.',
- 'usermerge-success-log' => 'Utilisator $2 ($3) fusionâ avouéc $4 ($5)',
- 'usermerge-logpage' => 'Jornal de les fusions d'utilisators',
- 'usermerge-logpagetext' => 'O est un jornal de les accions de fusions \
d'utilisators.', + 'usermerge-success' => 'La fusion de $1 ($2) a $3 ($4) est \
chavonâ.', # Fuzzy + 'usermerge-success-log' => 'Usanciér $2 ($3) fusionâ avouéc \
$4 ($5)', # Fuzzy + 'usermerge-logpage' => 'Jornal de les fusions d'usanciérs',
+ 'usermerge-logpagetext' => 'O est un jornal de les accions de fusions \
d'usanciérs.', 'usermerge-noselfdelete' => 'Vos vos pouede pas suprimar ou ben \
fusionar vos-mémo !',
- 'usermerge-unmergable' => 'Empossiblo de fusionar l'utilisator : lo numerô ou ben \
lo nom at étâ dèfeni coment pas fusionâblo.',
- 'usermerge-protectedgroup' => 'Empossiblo de fusionar l'utilisator : l'utilisator \
est dens una tropa protègiê.',
- 'right-usermerge' => 'Fusionar des utilisators',
+ 'usermerge-unmergable' => 'Empossiblo de fusionar l'usanciér : lo numerô ou ben \
lo nom at étâ dèfeni coment pas fusionâblo.', + 'usermerge-protectedgroup' => \
'Empossiblo de fusionar l'usanciér : l'usanciér est dens una tropa protègiê.', \
+ 'right-usermerge' => 'Fusionar des usanciérs', + 'usermerge-editcount' => 'Apondre \
lo comptor de changements ?', + 'usermerge-editcount-success' => 'Aponsa du comptor \
de changements de ($1 et $2)', + 'usermerge-autopagedelete' => 'Suprimâ \
ôtomaticament pendent la fusion d'usanciérs', + 'usermerge-page-unmoved' => 'La \
pâge $1 pôt pas étre dèplaciê vers $2.', + 'usermerge-page-moved' => 'La pâge \
$1 at étâ dèplaciê vers $2.', + 'usermerge-move-log' => 'Pâge dèplaciê \
ôtomaticament pendent la fusion de l'usanciér [[User:$1|$1]] en \
[[User:$2|$2]] ', # Fuzzy + 'usermerge-page-deleted' => 'Pâge suprimâ $1',
);
/** Irish (Gaeilge)
@@ -712,7 +890,7 @@ $messages['ga'] = array(
'usermerge-userdeleted-log' => 'Úsáideoir scriosta: $2 ($3)',
);
-/** Galician (Galego)
+/** Galician (galego)
* @author Alma
* @author Toliño
*/
@@ -721,7 +899,7 @@ $messages['gl'] = array(
'usermerge-desc' => "[[Special:UserMerge|Fusiona as referencias dun usuario noutro \
usuario]] na base de datos do wiki (tamén borrará as fusións vellas dos usuarios \
seguintes. Require privilexios ''usermerge'')", 'usermerge-badolduser' => 'Antigo \
nome de usuario non válido', 'usermerge-badnewuser' => 'Novo nome de usuario non \
válido',
- 'usermerge-nonewuser' => 'Nome de usuario baleiro (asúmese que quere fusionalo con \
"$1").<br /> + 'usermerge-nonewuser' => 'Nome de usuario baleiro. Asúmese que quere \
fusionalo con "{{GENDER:$1|$1}}".<br /> Prema en "{{int:usermerge-submit}}" para \
aceptar.', 'usermerge-noolduser' => 'Antigo nome de usuario baleiro',
'usermerge-fieldset' => 'Nomes de usuario a fusionar',
@@ -733,14 +911,21 @@ Prema en "{{int:usermerge-submit}}" para aceptar.',
'usermerge-userdeleted' => '$1 ($2) foi eliminado.',
'usermerge-userdeleted-log' => 'Usuario eliminado: $2 ($3)',
'usermerge-updating' => 'Actualizando táboa $1 ($2 a $3)',
- 'usermerge-success' => 'A fusión desde $1 ($2) a $3 ($4) foi completada.',
- 'usermerge-success-log' => 'Usuario $2 ($3) fusionado con $4 ($5)',
+ 'usermerge-success' => 'A fusión desde $1 ($2) a {{GENDER:$3|$3}} ($4) foi \
completada.', + 'usermerge-success-log' => 'Usuario $2 ($3) fusionado con \
{{GENDER:$4|$4}} ($5)', 'usermerge-logpage' => 'Rexistro de fusión de usuarios',
'usermerge-logpagetext' => 'Este é un rexistro das accións de fusión de \
usuarios.', 'usermerge-noselfdelete' => 'Non se pode eliminar ou fusionar a si \
mesmo!', 'usermerge-unmergable' => 'Non se pode fusionar o usuario (o ID ou o nome \
foron definidos como "non fusionables").', 'usermerge-protectedgroup' => 'Non se \
pode fusionar o usuario (o usuario está nun frupo protexido).', 'right-usermerge' \
=> 'Fusionar usuarios', + 'action-usermerge' => 'fusionar usuarios',
+ 'usermerge-editcount-merge-success' => 'Engadindo $1 \
{{PLURAL:$1|edición|edicións}} do usuario $2 a $3 {{PLURAL:$3|edición|edicións}} \
do usuario $4 ($5 {{PLURAL:$5|edición|edicións}} despois da fusión)', \
+ 'usermerge-autopagedelete' => 'Borrada automaticamente ao fusionar os usuarios', \
+ 'usermerge-page-unmoved' => 'A páxina "$1" non pode ser movida a "$2".', \
+ 'usermerge-page-moved' => 'A páxina "$1" foi movida a "$2".', \
+ 'usermerge-move-log' => 'A páxina moveuse automaticamente cando se fusionou o \
usuario "[[User:$1|$1]]" con "[[User:$2|{{GENDER:$2|$2}}]]"', \
+ 'usermerge-page-deleted' => 'A páxina "$1" foi borrada', );
/** Ancient Greek (Ἀρχαία ἑλληνικὴ)
@@ -751,6 +936,7 @@ $messages['grc'] = array(
);
/** Swiss German (Alemannisch)
+ * @author Als-Chlämens
* @author Als-Holder
*/
$messages['gsw'] = array(
@@ -759,7 +945,7 @@ $messages['gsw'] = array(
'usermerge-badolduser' => 'Uugiltiger alter Benutzername',
'usermerge-badnewuser' => 'Uugiltiger nejer Benutzername',
'usermerge-nonewuser' => 'Läärer nejer Benutzername - s wird e Zämmefierig mit \
„$1" vermuetet.<br />
-Klick uf "{{int:usermerge-submit}}" go s Uusfiere.',
+Klick uf "{{int:usermerge-submit}}" go s Uusfiere.', # Fuzzy
'usermerge-noolduser' => 'Läärer alter Benutzername',
'usermerge-fieldset' => 'Benutzernäme, wu solle zämmegfiert wäre',
'usermerge-olduser' => 'Alter Benutzername (zämmefiere vu):',
@@ -770,14 +956,21 @@ Klick uf "{{int:usermerge-submit}}" go s Uusfiere.',
'usermerge-userdeleted' => '„$1" ($2) isch glescht wore.',
'usermerge-userdeleted-log' => 'Gleschter Benutzername: „$2" ($3)',
'usermerge-updating' => 'Aktualisierig $1 Tabälle ($2 noch $3)',
- 'usermerge-success' => 'D Zämmefierig vu „$1" ($2) noch „$3" ($4) isch \
vollständig.',
- 'usermerge-success-log' => 'Benutzername „$2" ($3) zämmegfiert mit „$4" ($5)',
+ 'usermerge-success' => 'D Zämmefierig vu „$1" ($2) noch „$3" ($4) isch \
vollständig.', # Fuzzy + 'usermerge-success-log' => 'Benutzername „$2" ($3) \
zämmegfiert mit „$4" ($5)', # Fuzzy 'usermerge-logpage' => \
'Benutzerkonte-Zämmefierigs-Logbuech', 'usermerge-logpagetext' => 'Des isch s \
Logbuech vu dr Benutzerkonte-Zämmefierige.', 'usermerge-noselfdelete' => \
'Zämmefierig mit sich sälber isch nit megli!', 'usermerge-unmergable' => \
'Zämmefierig nit megli - ID oder Benutzername isch nit as zämmefierbar definiert.', \
'usermerge-protectedgroup' => 'Zämmefierig nit megli - Benutzername isch in ere \
gschitze Gruppe.', 'right-usermerge' => 'Benutzerkonte zämmefiere',
+ 'usermerge-editcount' => 'Bearbeitigszääler dezuefiege?',
+ 'usermerge-editcount-success' => 'Dezuefiege vum Bearbeitigszääler ($1 un $2)',
+ 'usermerge-autopagedelete' => 'Derwyylischt de Benutzerchontezämmefierig \
automatisch glöscht', + 'usermerge-page-unmoved' => 'D Syte „$1" het nüt chönne \
uf „$2" verschobe werde.', + 'usermerge-page-moved' => 'D Syte „$1" isch uff \
„$2" verschobe worde.', + 'usermerge-move-log' => 'Dur d Benutzerchontezämmefierig \
vu „[[User:$1|$1]]" noch „[[User:$2|$2]]" automatisch verschobeni Syte', # Fuzzy \
+ 'usermerge-page-deleted' => 'Gleschti Syte $1', );
/** Gujarati (ગુજરાતી)
@@ -794,6 +987,7 @@ $messages['gu'] = array(
);
/** Hebrew (עברית)
+ * @author Amire80
* @author Rotemliss
* @author YaronSh
*/
@@ -802,8 +996,8 @@ $messages['he'] = array(
'usermerge-desc' => "[[Special:UserMerge|מיזוג התייחסויות \
ממשתמש אחד לאחר]] בבסיס ה תו ים של הוויקי, כולל \
מחיקת המשתמשים היש ים לאחר המיזוג. דרשת הרשאת \
''usermerge''", 'usermerge-badolduser' => 'שם המשתמש הישן אי ו \
תקין', 'usermerge-badnewuser' => 'שם המשתמש החדש אי ו תקין',
- 'usermerge-nonewuser' => 'שם המשתמש החדש ריק - כ ראה \
שהמיזוג הוא ל־"$1".<br />
-לחצו על "{{int:usermerge-submit}}" לאישור.',
+ 'usermerge-nonewuser' => 'שם המשתמש החדש ריק. כ ראה \
שהמיזוג הוא אל "$1".<br /> + א ללחוץ על \
"{{int:usermerge-submit}}" לאישור.', 'usermerge-noolduser' => 'שם \
המשתמש הישן ריק', 'usermerge-fieldset' => 'שמות משתמש \
למיזוג', 'usermerge-olduser' => 'משתמש ישן (מיזוג מ):',
@@ -814,14 +1008,22 @@ $messages['he'] = array(
'usermerge-userdeleted' => '$1 ($2) מחק.',
'usermerge-userdeleted-log' => 'המשתמש מחק: $2 ($3)',
'usermerge-updating' => 'בתהליך עדכון הטבלה $1 ($2 ל$3)',
- 'usermerge-success' => 'המיזוג מ$1 ($2) ל$3 ($4) הושלם.',
- 'usermerge-success-log' => 'המשתמש $2 ($3) מוזג ל$4 ($5)',
+ 'usermerge-success' => 'המיזוג מהשם $1‏ ($2) אל $3‏ ($4) \
הושלם.', + 'usermerge-success-log' => 'המשתמש $2‏ ($3) מוזג אל \
$4‏ ($5)', 'usermerge-logpage' => 'יומן מיזוג משתמשים',
'usermerge-logpagetext' => 'זהו יומן של פעולות מיזוג \
המשתמשים.', 'usermerge-noselfdelete' => 'לא יתן למחוק או \
למזג מעצמך!', 'usermerge-unmergable' => 'לא יתן למזג \
ממשתמש זה - מספר המשתמש או השם כבר מוגדר כבלתי \
יתן למיזוג.', 'usermerge-protectedgroup' => 'לא יתן למזג \
ממשתמש זה - המשתמש מצא בקבוצה מוג ת.', \
'right-usermerge' => 'מיזוג משתמשים', + 'action-usermerge' => 'למזג \
משתמשים', + 'usermerge-editcount' => 'להוסיף מו ה עריכות?',
+ 'usermerge-editcount-success' => 'הוספת מו ה עריכות של ($1‏, \
$2)', + 'usermerge-autopagedelete' => ' מחק אוטומטית בזמן מיזוג \
חשבו ות', + 'usermerge-page-unmoved' => 'לא יתן להעביר את \
הדף $1 לשם $2.', + 'usermerge-page-moved' => 'הדף $1 הועבר לשם $2.',
+ 'usermerge-move-log' => 'הדף הועבר אוטומטית בזמן מיזוג \
חשבון "[[User:$1|$1]]" אל "[[User:$2|$2]]"', + 'usermerge-page-deleted' => \
'הדף $1 מחק', );
/** Hindi (हिन्दी)
@@ -831,7 +1033,7 @@ $messages['hi'] = array(
'usermerge-badtoken' => 'गलत एडिट टोकन',
);
-/** Upper Sorbian (Hornjoserbsce)
+/** Upper Sorbian (hornjoserbsce)
* @author Michawiki
*/
$messages['hsb'] = array(
@@ -839,7 +1041,7 @@ $messages['hsb'] = array(
'usermerge-desc' => "[[Special:UserMerge|Zjednoća referency wužiwarjow]] we \
wikowej datowej bance - stare wužiwarske konto so po zjednoćenju wušmórnje. Žada \
sej prawa ''usermerge''.", 'usermerge-badolduser' => 'Njepłaćiwe stare wužiwarske \
mjeno', 'usermerge-badnewuser' => 'Njepłaćiwe nowe wužiwarske mjeno',
- 'usermerge-nonewuser' => 'Falowace nowe wužiwarske mjeno - najskerje zjednoćenje \
do "$1".<br /> + 'usermerge-nonewuser' => 'Falowace nowe wužiwarske mjeno - \
najskerje zjednoćenje do "{{GENDER:$1|$1}}".<br /> Klikń na \
"{{int:usermerge-submit}}", zo by akceptował.', 'usermerge-noolduser' => 'Falowace \
stare wužiwarske mjeno', 'usermerge-fieldset' => 'Wužiwarskej mjenje, kotrejž \
matej so zjednoćić', @@ -851,45 +1053,54 @@ Klikń na "{{int:usermerge-submit}}", \
zo by akceptował.', 'usermerge-userdeleted' => '$1($2) bu zničeny.',
'usermerge-userdeleted-log' => 'Wušmórnjeny wužiwar: $2($3)',
'usermerge-updating' => '$1 tabela so aktualizuje ($2 do $3)',
- 'usermerge-success' => 'Zjednoćenje wot $1($2) do $3($4) je dokónčene.',
- 'usermerge-success-log' => 'Wužiwar $2($3) je so z $4 ($5) zjednoćił',
+ 'usermerge-success' => 'Zjednoćenje wot $1 ($2) do {{GENDER:$3|$3}} ($4) je \
dokónčene.', + 'usermerge-success-log' => 'Wužiwar $2 ($3) je so z \
{{GENDER:$4|$4}} ($5) zjednoćił', 'usermerge-logpage' => 'Protokol wužiwarskich \
zjednoćenjow', 'usermerge-logpagetext' => 'To je protokol wužiwarskich \
zjednoćenjow.', 'usermerge-noselfdelete' => 'Njemóžeš sam wušmórnyć abo \
zjednoćić!', 'usermerge-unmergable' => 'Zjednoćenje wužiwarjow njemóžno - ID \
abo wužiwarske mjeno bu jako njezjednoćujomne definowane.', \
'usermerge-protectedgroup' => 'Zjednoćenje wužiwarjow njemóžno - wužiwar je w \
škitanej skupinje', 'right-usermerge' => 'Wužiwarjow zjednoćić',
+ 'action-usermerge' => 'wužiwarjow zjednoćić',
+ 'usermerge-editcount' => 'Ličenje změnow přidać?',
+ 'usermerge-editcount-success' => 'Přidawanje ličenja změnow ($1 a $2)',
+ 'usermerge-autopagedelete' => 'Při zjednoćenju wužiwarjow awtomatisce zhašany',
+ 'usermerge-page-unmoved' => 'Strona $1 njeda so do $2 přesunyć.',
+ 'usermerge-page-moved' => 'Strona $1 bu do $2 přesunjena.',
+ 'usermerge-move-log' => 'Strona za zjednoćenje wužiwarja "[[User:$1|$1]]" z \
"[[User:$2|{{GENDER:$2|$2}}]]" awtomatisce přesunjena', + 'usermerge-page-deleted' \
=> 'Zhašana strona $1', );
/** Haitian (Kreyòl ayisyen)
+ * @author Boukman
* @author Masterches
*/
$messages['ht'] = array(
- 'usermerge' => 'Mèt ansanm kont itilizatè yo ak efase tou',
- 'usermerge-desc' => '[[Special:UserMerge|Mèt ansanm referans yo depi yon \
itilizatè nan referans yon lòt itilizatè]] nan baz done wiki a - l ap efase tou \
vye non itilizatè yo apre fizyon, reyinyon sa. Ou dwèt genyen dwa pou fè fizyon \
sa.',
- 'usermerge-badolduser' => 'Lòt vyen non itilizatè ou an pa bon, li pa korèk, \
genyen yon erè anndan l.',
- 'usermerge-badnewuser' => 'Nouvo non itilizatè ou chwazi an pa bon, li pa korèk, \
genyen yon erè anndan l',
- 'usermerge-nonewuser' => 'Efase nouvo non itilizatè - depi ou vle mèt ansanm kont \
ou an ak $1.<br />
-Klike (prese) <u>Mèt ansanm kont Itilizatè</u> pou aksepte operasyon an.',
- 'usermerge-noolduser' => 'Efase vye non itilizatè an',
- 'usermerge-olduser' => 'Ansyen non itilizatè (mèt ansanm)',
- 'usermerge-newuser' => 'Nouvo non itilizatè (mèt ansanm)',
- 'usermerge-deleteolduser' => 'Efase ansyen, vye non itilizatè a ?',
+ 'usermerge' => 'Mete ansanm ak efase kont itilizatè yo',
+ 'usermerge-desc' => "[[Special:UserMerge|Mèt ansanm referans yo depi yon \
itilizatè nan referans yon lòt itilizatè]] nan baz done wiki a - l ap efase tou \
vye non itilizatè yo apre fizyon fin fèt. Ou bezwen genyen dwa ''usermerge'' pou \
fè fizyon sa.", + 'usermerge-badolduser' => 'Ansyen non itilizatè a pa bon.',
+ 'usermerge-badnewuser' => 'Nouvo non itilizatè a pa bon.',
+ 'usermerge-nonewuser' => 'Nouvo non itilizatè ki vid - nou kwè ou vle mete l \
ansanm ak $1.<br /> +Klike "{{int:usermerge-submit}}" pou aksepte operasyon an.', # \
Fuzzy + 'usermerge-noolduser' => 'Ansyen non itilizatè a vid',
+ 'usermerge-olduser' => 'Ansyen non itilizatè (mete ansanm depi)',
+ 'usermerge-newuser' => 'Nouvo non itilizatè (mete ansanm ak)',
+ 'usermerge-deleteolduser' => 'Efase ansyen non itilizatè a',
'usermerge-submit' => 'Mèt ansanm kont itilizatè yo',
- 'usermerge-badtoken' => 'Edisyon ou fè an pa bon, li pa korèk, genyen yon erè \
nan operasyon an', + 'usermerge-badtoken' => 'Tikè pou modifikasyon pa bon',
'usermerge-userdeleted' => '$1 ($2) efase.',
'usermerge-userdeleted-log' => 'Non itilizatè ki efase a: $2 ($3)',
- 'usermerge-updating' => 'Mèt a jou, modifye tab $1 (depi $2 jouk $3)',
- 'usermerge-success' => 'Nou rive mèt ansanm $1 ($2) ak $3 ($4), depi premye kont \
an.',
- 'usermerge-success-log' => 'Itilizatè $2 ($3) fizyone ak $4 ($5)',
- 'usermerge-logpage' => 'Jounal itilizatè pou referans fizyon, "mèt ansanm kont \
itilizatè yo"',
- 'usermerge-logpagetext' => "Men jounal ki ap reprann tout aksyon ki fèt nan \
seksyon 'Mete ansanm kont itilizatè yo, fizyone yo'.",
- 'usermerge-noselfdelete' => 'Ou pa kapab efase tèt ou oubyen mèt yon lòt kont \
sou tèt ou, depi kont ou an menm.', + 'usermerge-updating' => 'Mete ajou tablo $1 \
(depi $2 jouk $3)', + 'usermerge-success' => 'Nou rive mèt ansanm $1 ($2) ak $3 \
($4), depi premye kont an.', # Fuzzy + 'usermerge-success-log' => 'Itilizatè $2 ($3) \
fizyone ak $4 ($5)', # Fuzzy + 'usermerge-logpage' => 'Jounal pou fizyon kont \
itilizatè', + 'usermerge-logpagetext' => 'Men jounal ki dekri tout aksyon ki te fèt \
pou fizyon kont itilizatè yo.', + 'usermerge-noselfdelete' => 'Ou pa kapab efase \
tèt ou oubyen fizyone tèt ou.', 'usermerge-unmergable' => 'Nou pa kapab mèt \
ansanm kont sa yo - ID an oubyen non an pa kapab mete ansanm, li sanble l make nan \
definisyon yo.', 'usermerge-protectedgroup' => 'Nou pa kapab mèt ansanm kont \
itilizatè yo - itilizatè sa a nan yon gwoup ki pwoteje.', );
-/** Hungarian (Magyar)
+/** Hungarian (magyar)
* @author Dani
* @author Glanthor Reviol
*/
@@ -899,7 +1110,7 @@ $messages['hu'] = array(
'usermerge-badolduser' => 'Érvénytelen régi felhasználói név',
'usermerge-badnewuser' => 'Érvénytelen új felhasználói név',
'usermerge-nonewuser' => 'Üres új felhasználónév – feltételezett cél: \
„$1"<br />
-Kattints a „{{int:usermerge-submit}}"-ra az elfogadáshoz.',
+Kattints a „{{int:usermerge-submit}}"-ra az elfogadáshoz.', # Fuzzy
'usermerge-noolduser' => 'A régi felhasználói név üres',
'usermerge-fieldset' => 'Összevonandó felhasználói nevek',
'usermerge-olduser' => 'Régi felhasználói név (honnan):',
@@ -910,8 +1121,8 @@ Kattints a „{{int:usermerge-submit}}"-ra az elfogadáshoz.',
'usermerge-userdeleted' => '„$1" ($2) törölve.',
'usermerge-userdeleted-log' => 'Törölt felhasználó: $2 ($3)',
'usermerge-updating' => '$1 tábla frissítése ($2 → $3)',
- 'usermerge-success' => '„$1" ($2) fiók beolvasztása a(z) „$3" ($4) \
felhasználói fiókba elkészült.',
- 'usermerge-success-log' => '„$2" ($3) felhasználó beolvasztva a(z) „$4" ($5) \
felhasználói fiókba', + 'usermerge-success' => '„$1" ($2) fiók beolvasztása \
a(z) „$3" ($4) felhasználói fiókba elkészült.', # Fuzzy \
+ 'usermerge-success-log' => '„$2" ($3) felhasználó beolvasztva a(z) „$4" ($5) \
felhasználói fiókba', # Fuzzy 'usermerge-logpage' => 'Felhasználói nevek \
egyesítésének naplója', 'usermerge-logpagetext' => 'Ez a felhasználó nevek \
összevonásának naplója.', 'usermerge-noselfdelete' => 'Nem tudsz törölni vagy \
összevonni a saját fiókodból!', @@ -920,7 +1131,7 @@ Kattints a \
„{{int:usermerge-submit}}"-ra az elfogadáshoz.', 'right-usermerge' => \
'szerkesztők egyesítése', );
-/** Interlingua (Interlingua)
+/** Interlingua (interlingua)
* @author McDutchie
*/
$messages['ia'] = array(
@@ -929,7 +1140,7 @@ $messages['ia'] = array(
'usermerge-badolduser' => 'Nomine de usator ancian invalide',
'usermerge-badnewuser' => 'Nomine de nove usator invalide',
'usermerge-nonewuser' => 'Nomine de nove usator vacue; nos assume un fusion con \
$1.<br />
-Clicca "{{int:usermerge-submit}}" pro acceptar.',
+Clicca "{{int:usermerge-submit}}" pro acceptar.', # Fuzzy
'usermerge-noolduser' => 'Nomine de usator ancian vacue',
'usermerge-fieldset' => 'Nomines de usator a fusionar',
'usermerge-olduser' => 'Ancian usator (fusionar ab):',
@@ -940,14 +1151,21 @@ Clicca "{{int:usermerge-submit}}" pro acceptar.',
'usermerge-userdeleted' => '$1 ($2) ha essite delite.',
'usermerge-userdeleted-log' => 'Usator delite: $2 ($3)',
'usermerge-updating' => 'Actualisa le tabella $1 (de $2 a $3)',
- 'usermerge-success' => 'Le fusion de $1 ($2) a $3 ($4) es complete.',
- 'usermerge-success-log' => 'Usator $2 ($3) fusionate con $4 ($5)',
+ 'usermerge-success' => 'Le fusion de $1 ($2) a $3 ($4) es complete.', # Fuzzy
+ 'usermerge-success-log' => 'Usator $2 ($3) fusionate con $4 ($5)', # Fuzzy
'usermerge-logpage' => 'Registro de fusiones de usatores',
'usermerge-logpagetext' => 'Isto es un registro de actiones de fusion de \
usatores.', 'usermerge-noselfdelete' => 'Tu non pote deler o fusionar ab te mesme!',
'usermerge-unmergable' => 'Impossibile fusionar ab iste usator - le ID o nomine ha \
essite definite como non fusionabile.', 'usermerge-protectedgroup' => 'Impossibile \
fusionar ab iste usator - le usator es membro de un gruppo protegite.', \
'right-usermerge' => 'Fusionar usatores', + 'usermerge-editcount' => 'Adder numero de \
modificationes?', + 'usermerge-editcount-success' => 'Es addite le numero de \
modificationes de ($1 e $2)', + 'usermerge-autopagedelete' => 'Automaticamente delite \
durante le fusion de usatores', + 'usermerge-page-unmoved' => 'Le pagina $1 non \
poteva esser renominate a $2.', + 'usermerge-page-moved' => 'Le pagina $1 ha essite \
renominate a $2.', + 'usermerge-move-log' => 'Le pagina ha essite automaticamente \
renominate con le fusion del usator "[[User:$1|$1]]" in "[[User:$2|$2]]"', # Fuzzy \
+ 'usermerge-page-deleted' => 'Pagina $1 delite', );
/** Indonesian (Bahasa Indonesia)
@@ -960,7 +1178,7 @@ $messages['id'] = array(
'usermerge-badolduser' => 'Nama pengguna lama tidak sah',
'usermerge-badnewuser' => 'Nama pengguna baru tidak sah',
'usermerge-nonewuser' => 'Nama pengguna baru tidak dituliskan - diasumsikan akan \
digabungkan ke "$1".<br />
-Klik "{{int:usermerge-submit}}" untuk melanjutkan.',
+Klik "{{int:usermerge-submit}}" untuk melanjutkan.', # Fuzzy
'usermerge-noolduser' => 'Nama pengguna lama tidak diisi',
'usermerge-fieldset' => 'Akun-akun pengguna yang akan digabungkan',
'usermerge-olduser' => 'Pengguna lama (digabungkan dari):',
@@ -971,8 +1189,8 @@ Klik "{{int:usermerge-submit}}" untuk melanjutkan.',
'usermerge-userdeleted' => '$1 ($2) telah dihapuskan.',
'usermerge-userdeleted-log' => 'Pengguna telah dihapuskan: $2 ($3)',
'usermerge-updating' => 'Memperbaharui tabel $1 ($2 hingga $3)',
- 'usermerge-success' => '$1 ($2) telah selesai digabungkan ke $3 ($4).',
- 'usermerge-success-log' => 'Pengguna $2 ($3) telah digabungkan ke $4 ($5)',
+ 'usermerge-success' => '$1 ($2) telah selesai digabungkan ke $3 ($4).', # Fuzzy
+ 'usermerge-success-log' => 'Pengguna $2 ($3) telah digabungkan ke $4 ($5)', # Fuzzy
'usermerge-logpage' => 'Log penggabungan pengguna',
'usermerge-logpagetext' => 'Ini adalah catatan tindakan penggabungan pengguna.',
'usermerge-noselfdelete' => 'Anda tidak dapat menghapus atau menggabungkan dari \
Anda sendiri!', @@ -981,8 +1199,38 @@ Klik "{{int:usermerge-submit}}" untuk \
melanjutkan.', 'right-usermerge' => 'Menggabungkan pengguna',
);
-/** Italian (Italiano)
+/** Interlingue (Interlingue)
+ * @author Renan
+ */
+$messages['ie'] = array(
+ 'usermerge' => 'Fuser se e deleter usatores',
+ 'usermerge-desc' => "[[Special:UserMerge|Referenties de fusion de un usator por \
altri usator]] in li funde de data del wiki - anc va deleter usatores antiqui \
succedent fusion. Exige avantages de ''fusion de usator''", + 'usermerge-badolduser' \
=> 'Antiqui nómine de usator ínvalid', + 'usermerge-badnewuser' => 'Nov nómine de \
usator ínvalid', + 'usermerge-nonewuser' => 'Nov nómine de usator vacui - acceptant \
fusion por "$1".<br /> +Clacca "{{int:usermerge-submit}}" por acceptar.', # Fuzzy
+ 'usermerge-noolduser' => 'Antiqui nómine de usator vacui',
+ 'usermerge-fieldset' => 'Nómines de usator por fusion',
+ 'usermerge-olduser' => 'Antiqui usator (fuser se de):',
+ 'usermerge-newuser' => 'Nov usator (fuser se por):',
+ 'usermerge-deleteolduser' => 'Deleter usator antiqui',
+ 'usermerge-submit' => 'Fuser usator',
+ 'usermerge-badtoken' => 'Simbol de redaction ínvalid',
+ 'usermerge-userdeleted' => '$1 ($2) ha esset deletet.',
+ 'usermerge-userdeleted-log' => 'Usator deletet: $2 ($3)',
+ 'usermerge-updating' => 'Modernisant tabelle $1 ($2 por $3)',
+ 'usermerge-success' => 'Fuser se de $1 ($2) por $3 ($4) es complet.', # Fuzzy
+ 'usermerge-logpage' => 'Diarium de fusion de usator',
+ 'usermerge-logpagetext' => 'Ti es un diarium de actiones de fusion de usator.',
+ 'usermerge-noselfdelete' => 'Vu ne posse deleter o fuser se vu self!',
+ 'usermerge-unmergable' => 'Ne posse fuser se de ti usator - ID o nómine ha esset \
definit quam ínfusibil.', + 'usermerge-protectedgroup' => 'Ne posse fuser de ti \
usator - usator es in un gruppe protectet.', +);
+
+/** Italian (italiano)
+ * @author Beta16
* @author Darth Kule
+ * @author Nemo bis
* @author Pietrodn
*/
$messages['it'] = array(
@@ -990,7 +1238,7 @@ $messages['it'] = array(
'usermerge-desc' => "[[Special:UserMerge|Unisce i riferimenti di un utente con \
quelli di un altro]] nel database della wiki e inoltre canceller il vecchio utente \
dopo l'unione. Richiede privilegi ''usermerge''", 'usermerge-badolduser' => 'Vecchio \
nome utente non valido', 'usermerge-badnewuser' => 'Nuovo nome utente non valido',
- 'usermerge-nonewuser' => 'Nuovo nome utente vuoto - l\'unione verr effettuata con \
l\'utente "$1".<br /> + 'usermerge-nonewuser' => 'Nuovo nome utente vuoto - l\'unione \
verr effettuata con l\'utente "{{GENDER:$1|$1}}".<br /> Fare clic su \
"{{int:usermerge-submit}}" per accettare.', 'usermerge-noolduser' => 'Vecchio nome \
utente vuoto', 'usermerge-fieldset' => 'Nomi utente da unire',
@@ -1002,14 +1250,21 @@ Fare clic su "{{int:usermerge-submit}}" per accettare.',
'usermerge-userdeleted' => '$1 ($2) è stato cancellato.',
'usermerge-userdeleted-log' => 'Utente cancellato: $2 ($3)',
'usermerge-updating' => 'Aggiornamento tabella $1 ($2 a $3)',
- 'usermerge-success' => "L'unione di $1 ($2) a $3 ($4) è completa.",
- 'usermerge-success-log' => 'Utente $2 ($3) unito a $4 ($5)',
- 'usermerge-logpage' => 'Log unione utente',
+ 'usermerge-success' => "L'unione di $1 ($2) a {{GENDER:$3|$3}} ($4) è completa.",
+ 'usermerge-success-log' => 'Utente $2 ($3) unito a {{GENDER:$4|$4}} ($5)',
+ 'usermerge-logpage' => 'Unioni delle utenze',
'usermerge-logpagetext' => 'Di seguito sono elencate le azioni di unione di \
utenti.', 'usermerge-noselfdelete' => 'Non puoi cancellare o unire il tuo account!',
'usermerge-unmergable' => "Impossibile unire da questo utente - l'ID o il nome è \
stato definito non unibile.", 'usermerge-protectedgroup' => "Impossibile unire da \
questo utente - l'utente fa parte di un gruppo protetto.", 'right-usermerge' => \
'Unisce utenti', + 'action-usermerge' => 'unire utenti',
+ 'usermerge-editcount-merge-success' => "$1 {{PLURAL:$1|contributo \
aggiunto|contributi aggiunti}} dell'utente $2 ai $3 \
{{PLURAL:$3|contributo|contributi}} dell'utente $4 ($5 \
{{PLURAL:$5|contributo|contributi}} dopo l'unione)", + 'usermerge-autopagedelete' => \
'Cancellata automaticamente quando si uniscono gli utenti', \
+ 'usermerge-page-unmoved' => 'La pagina $1 non può essere spostata a $2.', \
+ 'usermerge-page-moved' => 'La pagina $1 è stata spostata a $2.', \
+ 'usermerge-move-log' => 'Pagina spostata automaticamente durante l\'unione \
dell\'utente "[[User:$1|$1]]" a "[[User:$2|{{GENDER:$2|$2}}]]"', \
+ 'usermerge-page-deleted' => 'Pagina cancellata $1', );
/** Japanese (日本語)
@@ -1017,32 +1272,40 @@ Fare clic su "{{int:usermerge-submit}}" per accettare.',
* @author Fievarsty
* @author Fryed-peach
* @author Mzm5zbC3
+ * @author Shirayuki
*/
$messages['ja'] = array(
'usermerge' => '利用者の統合と削除',
- 'usermerge-desc' => \
"ウィキデータベース上における[[Special:UserMerge|ある利用者を別 \
利用者へ統合し]]、また統合元の利用者を削除する(「{{int:right-usermerge}}」権限 \
''usermerge'' が必要)",
- 'usermerge-badolduser' => '無効な旧利用者名',
- 'usermerge-badnewuser' => '無効な新利用者名',
- 'usermerge-nonewuser' => \
'新しい利用者名の欄が空です。「$1」への統合と仮定します。<br \
/> + 'usermerge-desc' => \
"ウィキデータベース上における[[Special:UserMerge|ある利用者を別の利用者へ統合し]]、また統合元の利用者を削除する \
(「{{int:right-usermerge}}」できる権限 ''usermerge'' が必要)", \
+ 'usermerge-badolduser' => '旧利用者名が無効です。', \
+ 'usermerge-badnewuser' => '新利用者名が無効です。', \
+ 'usermerge-nonewuser' => \
'新しい利用者名の欄が空です。「{{GENDER:$1|$1}}」への統合と見なします。<br \
/> 「{{int:usermerge-submit}}」をクリックして承認してく さい。',
- 'usermerge-noolduser' => '旧利用者名の欄が空です',
+ 'usermerge-noolduser' => '旧利用者名の欄が空です。',
'usermerge-fieldset' => '統合する利用者名',
'usermerge-olduser' => '旧利用者 (統合元):',
'usermerge-newuser' => '新利用者 (統合先):',
- 'usermerge-deleteolduser' => '旧利用者を削除する',
+ 'usermerge-deleteolduser' => '旧利用者を削除',
'usermerge-submit' => '利用者の統合',
- 'usermerge-badtoken' => '編集トークンが不正',
+ 'usermerge-badtoken' => '編集トークンが無効です。',
'usermerge-userdeleted' => '$1 ($2) は削除されました。',
'usermerge-userdeleted-log' => '利用者: $2 ($3) を削除しました',
'usermerge-updating' => '$1 のテーブルを更新 ($2 を $3 へ)',
- 'usermerge-success' => '$1 ($2) の $3 ($4) への統合が完了しました。',
- 'usermerge-success-log' => '利用者 $2 ($3) を $4 ($5) へ統合しました',
+ 'usermerge-success' => '$1 ($2) の {{GENDER:$3|$3}} ($4) \
への統合が完了しました。', + 'usermerge-success-log' => '利用者 $2 \
($3) を {{GENDER:$4|$4}} ($5) へ統合しました', 'usermerge-logpage' => \
'利用者統合記録', 'usermerge-logpagetext' => \
'これは、利用者の統合を記録したものです。', \
'usermerge-noselfdelete' => \
'あなたは、自身を統合あるいは削除することはできません。',
- 'usermerge-unmergable' => \
'利用者を統合できません。IDまたは名前が統合不可能となっています。',
- 'usermerge-protectedgroup' => \
'利用者を統合できません。この利用者は被保護グループに属しています。',
- 'right-usermerge' => '利用者を統合する',
+ 'usermerge-unmergable' => '利用者を統合できません: \
IDまたは名前が統合不可能となっています。', \
+ 'usermerge-protectedgroup' => '利用者を統合できません: \
この利用者は被保護グループに属しています。', + 'right-usermerge' \
=> '利用者を統合', + 'action-usermerge' => '利用者の統合',
+ 'usermerge-editcount-merge-success' => '利用者 $2 の $1 \
回の{{PLURAL:$1|編集}}を利用者 $4 の $3 回の{{PLURAL:$3|編集}}へ追 \
(統合後は $5 回の{{PLURAL:$5|編集}})', + 'usermerge-autopagedelete' => \
'利用者の統合と共に自動的に削除しました', \
+ 'usermerge-page-unmoved' => \
'ページ「$1」を「$2」に移動できませんでした。', \
+ 'usermerge-page-moved' => 'ページ「$1」を「$2」に移動しました。', \
+ 'usermerge-move-log' => \
'統合と共に「[[User:$1|$1]]」を「[[User:$2|{{GENDER:$2|$2}}]]」へ自動的に移動しました',
+ 'usermerge-page-deleted' => 'ページ「$1」を削除しました',
);
/** Javanese (Basa Jawa)
@@ -1055,7 +1318,7 @@ $messages['jv'] = array(
'usermerge-badolduser' => 'Jeneng panganggo lawas ora sah',
'usermerge-badnewuser' => 'Jeneng panganggo anyar ora absah',
'usermerge-nonewuser' => 'Jeneng panganggo kothong - dianggep bakal digabungaké \
menyang $1.<br />
-Klik "{{int:usermerge-submit}}" kanggo nerusaké.',
+Klik "{{int:usermerge-submit}}" kanggo nerusaké.', # Fuzzy
'usermerge-noolduser' => 'Jeneng panganggo sing lawas kosong',
'usermerge-olduser' => 'Panganggo lawas (digabungaké saka):',
'usermerge-newuser' => 'Panganggo anyar (digabungaké menyang):',
@@ -1065,8 +1328,8 @@ Klik "{{int:usermerge-submit}}" kanggo nerusaké.',
'usermerge-userdeleted' => '$1 ($2) wis dibusak.',
'usermerge-userdeleted-log' => 'Panganggo dibusak: $2 ($3)',
'usermerge-updating' => 'Nganyari tabèl $1 ($2 menyang $3)',
- 'usermerge-success' => '$1 ($2) wis rampung digabungaké menyang $3 ($4).',
- 'usermerge-success-log' => 'Panganggo $2 ($3) wis digabungaké menyang $4 ($5)',
+ 'usermerge-success' => '$1 ($2) wis rampung digabungaké menyang $3 ($4).', # Fuzzy
+ 'usermerge-success-log' => 'Panganggo $2 ($3) wis digabungaké menyang $4 ($5)', # \
Fuzzy 'usermerge-logpage' => 'Log panggabungan panganggo',
'usermerge-logpagetext' => 'Iki sawijining log aksi panggabungan panganggo.',
'usermerge-noselfdelete' => 'Panjenengan ora bisa mbusak utawa nggabung saka \
panjenengan dhéwé!', @@ -1075,6 +1338,25 @@ Klik "{{int:usermerge-submit}}" kanggo \
nerusaké.', 'right-usermerge' => 'Gabung panganggo',
);
+/** Georgian (ქა თული)
+ * @author David1010
+ */
+$messages['ka'] = array(
+ 'usermerge-badolduser' => 'ა ასწო ი ძველი \
მომხმა ებლის სახელი', + 'usermerge-badnewuser' => \
'ა ასწო ი ახალი მომხმა ებლის \
სახელი', + 'usermerge-noolduser' => 'ცა იელი \
ძველი მომხმა ებლის სახელი', \
+ 'usermerge-fieldset' => 'მომხმა ებლის \
სახელები გასაე თიანებლად', \
+ 'usermerge-olduser' => 'ძველი მომხმა ებელი \
(გაე თიანება):', + 'usermerge-newuser' => 'ახალი \
მომხმა ებელი (გაე თიანება):', \
+ 'usermerge-deleteolduser' => 'ძველი მომხმა ებლის \
წაშლა', + 'usermerge-submit' => 'მომხმა ებლების \
გაე თიანება', + 'usermerge-userdeleted' => '$1 ($2) \
წაიშალა.', + 'usermerge-userdeleted-log' => 'წაშლილი \
მომხმა ებელი: $2 ($3)', + 'right-usermerge' => \
'მომხმა ებლების გაე თიანება', \
+ 'usermerge-editcount' => 'დაემატოს ედაქტი \
ებათა მთვლელი?', + 'usermerge-page-deleted' => \
'წაშლილი გვე დი $1', +);
+
/** Khmer (ភាសាខ្មែរ)
* @author Chhorran
* @author Lovekhmer
@@ -1083,8 +1365,8 @@ Klik "{{int:usermerge-submit}}" kanggo nerusaké.',
*/
$messages['km'] = array(
'usermerge' => 'បញ្ចូលរួមគ្នានិងលុបអ្នកប្រើប្រាស់',
- 'usermerge-badolduser' => \
'ឈ្មោះអ្នកប្រើប្រាស់ចាស់មិនត្រឹមត្រូវទេ',
- 'usermerge-badnewuser' => \
'ឈ្មោះអ្នកប្រើប្រាស់ថ្មីមិនត្រឹមត្រូវទេ',
+ 'usermerge-badolduser' => \
'អត្តនាមចាស់មិនត្រឹមត្រូវទេ', \
+ 'usermerge-badnewuser' => \
'អត្តនាមថ្មីមិនត្រឹមត្រូវទេ', \
'usermerge-olduser' => \
'អ្នកប្រើប្រាស់ចាស់(បញ្ចូលរួមគ្នាពី)៖',
'usermerge-newuser' => \
'អ្នកប្រើប្រាស់ថ្មី(បញ្ចូលរួមគ្នាទៅ)៖',
'usermerge-deleteolduser' => \
'លុបអ្នកប្រើប្រាស់ចាស់ចោល', @@ \
-1092,8 +1374,8 @@ $messages['km'] = array( 'usermerge-userdeleted' => '$1 ($2) \
ត្រូវបានលុប ើយ។', 'usermerge-userdeleted-log' => \
'បានលុបអ្នកប្រើប្រាស់៖ $2($3)', \
'usermerge-updating' => 'បន្ទាន់សម័យ $1 តារាង ($2 to \
$3)',
- 'usermerge-success' => \
'ការបញ្ចូលរួមគ្នាពី$1($2)ទៅ$3($4)បានបញ្ចប់ដោយពេញលេញ។',
- 'usermerge-success-log' => 'អ្នកប្រើប្រាស់ $2 ($3) \
បញ្ចូលរួមគ្នាទៅ $4 ($5)', + 'usermerge-success' => \
'ការបញ្ចូលរួមគ្នាពី$1($2)ទៅ$3($4)បានបញ្ចប់ដោយពេញលេញ។', \
# Fuzzy + 'usermerge-success-log' => 'អ្នកប្រើប្រាស់ $2 \
($3) បញ្ចូលរួមគ្នាទៅ $4 ($5)', # Fuzzy \
'usermerge-logpage' => 'កំណត់ \
េតុនៃការបញ្ចួលអ្នកប្រើប្រាស់រួមគ្នា',
'usermerge-logpagetext' => 'នេះជាកំណត់ \
េតុនៃសកម្មភាពបញ្ចូលអ្នកប្រើប្រាស់រួមគ្នា។',
'usermerge-noselfdelete' => 'អ្នកមិនអាច លុបចេញ ឬ \
បញ្ចូលរួមគ្នា \
ពីខ្លួនអ្នកផ្ទាល់ !', @@ -1103,45 +1385,84 @@ \
$messages['km'] = array(
/** Korean (한국어)
* @author Kwj2772
+ * @author 아라
*/
$messages['ko'] = array(
- 'usermerge' => '사용자 계 병합 및 삭 ',
- 'usermerge-olduser' => '이 사용자',
- 'usermerge-deleteolduser' => '이 계 을 삭 하기',
- 'usermerge-submit' => '계 합치기',
- 'usermerge-userdeleted-log' => '$2 ($3) 사용자를 삭 함',
- 'usermerge-success-log' => '$2 ($3) 사용자를 $4 ($5) 로 병합함',
+ 'usermerge' => '사용자 합치기 및 삭 ',
+ 'usermerge-desc' => "위키 데이터 이스에서 [[Special:UserMerge|참 한 \
한 사용자에서 다른 사용자로 합칩니다]] - 합치 나서 이에 \
따라 이 사용자는 삭 됩니다. ''usermerge'' 권한 필요", \
+ 'usermerge-badolduser' => '잘못된 이 사용자 이름입니다.', \
+ 'usermerge-badnewuser' => '잘못된 새 사용자 이름입니다.', \
+ 'usermerge-nonewuser' => '빈 새 사용자 이름입니다. "{{GENDER:$1|$1}}" \
사용자로 가 하여 합칩니다.<br /> +동의하면 \
"{{int:usermerge-submit}}"을 클릭하세요.', + 'usermerge-noolduser' => '이 \
사용자 이름이 비어 있음', + 'usermerge-fieldset' => '사용자 이름 \
합치기', + 'usermerge-olduser' => '(합쳐질) 이 사용자:',
+ 'usermerge-newuser' => '(합 ) 새 사용자:',
+ 'usermerge-deleteolduser' => '이 사용자를 삭 하기',
+ 'usermerge-submit' => '사용자 합치기',
+ 'usermerge-badtoken' => '잘못된 편집 큰',
+ 'usermerge-userdeleted' => '$1 ($2) 사용자가 삭 되었습니다.',
+ 'usermerge-userdeleted-log' => '사용자가 $2 ($3) 사용자를 삭 \
했습니다', + 'usermerge-updating' => '사용자가 $1 테이블을 \
업데이트했습니다 ($2부터 $3까지)', + 'usermerge-success' => '$1 ($2) \
사용자를 {{GENDER:$3|$3}} ($4) 사용자에 합치는 것을 \
완료했습니다.', + 'usermerge-success-log' => '$2 ($3) 사용자를 \
{{GENDER:$4|$4}} ($5) 로 합쳤습니다', 'usermerge-logpage' => '사용자 병합 \
기록', + 'usermerge-logpagetext' => '사용자 병합 행위 기록입니다.',
+ 'usermerge-noselfdelete' => '자 으로부터 삭 나 합치기를 수 \
없습니다!', + 'usermerge-unmergable' => '사용자로부터 합 수 \
없습니다 - ID나 이름이 합 수 없도록 지 되어 있습니다.', \
+ 'usermerge-protectedgroup' => '사용자로부터 합 수 없습니다 - \
사용자는 보호된 그룹에 있습니다.', + 'right-usermerge' => '사용자 \
합치기', + 'action-usermerge' => '사용자 합치기',
+ 'usermerge-editcount-merge-success' => '$2 사용자의 {{PLURAL:$1|편집}} \
$1회를 $4 사용자의 {{PLURAL:$3|편집}} $3회를 추가 (합치 나서 \
{{PLURAL:$5|편집}} $5회)', + 'usermerge-autopagedelete' => '사용자를 합 \
때 자동으로 삭 했습니다', + 'usermerge-page-unmoved' => '$1 문서를 $2 \
문서로 이동하지 못했습니다.', + 'usermerge-page-moved' => '$1 문서를 \
$2 문서로 옮겼습니다.', + 'usermerge-move-log' => '"[[User:$1|$1]]" \
사용자를 "[[User:$2|{{GENDER:$2|$2}}]]" 사용자로 합치면서 문서를 \
자동으로 옮겼습니다', + 'usermerge-page-deleted' => '$1 문서를 삭 \
했습니다', );
/** Colognian (Ripoarisch)
* @author Purodha
*/
$messages['ksh'] = array(
- 'usermerge' => 'Metmaacher zosammelääje un fött schmiiße',
- 'usermerge-desc' => '[[Special:UserMerge|Läät de Date fun einem Metmaacher met \
anem andere Metmaacher komplät zosamme]] en dem Wiki singe Datebank, un kann donoh \
och de övverhollte Metmaacher fottschmieße. Doför bruch mer et \
„{{int:right-usermerge}}" Rääsch (<i lang="en">usermerge</i>)', + 'usermerge' => \
'Metmaacher zosammelääje un fott schmiiße', + 'usermerge-desc' => \
'[[Special:UserMerge|Läät de Date fun einem Metmaacher met anem andere Metmaacher \
komplät zosamme]] en dem Wiki singe Datebank, un kann donoh och de övverhollte \
Metmaacher fottschmieße. Doför bruch mer et „{{int:right-usermerge}}" Rääsch \
(<em lang="en">usermerge</em>)', 'usermerge-badolduser' => 'Dä ahle Metmaachername \
es nit jöltesch', 'usermerge-badnewuser' => 'Dä neue Metmaachername es nit \
jöltesch', 'usermerge-nonewuser' => 'Keine neue Metmaachername aanjejovve. Mer \
vermoode, dat De met „$1" zosamme lääje wells.<br />
-Kleck op „{{int:usermerge-submit}}" öm dat esu ze maache.',
+Kleck op „{{int:usermerge-submit}}" öm dat esu ze maache.', # Fuzzy
'usermerge-noolduser' => 'Keine ahle Metmaachername aanjejovve',
'usermerge-fieldset' => 'De Name vun dä Metmaacher zum Zosamme lääje',
'usermerge-olduser' => 'Dä ahle Metmaachername (Zosamme lääje fun …):',
- 'usermerge-newuser' => 'Dä neu Metmaachername (Zosamme lääje noh …):',
+ 'usermerge-newuser' => 'Dä neuje Metmaachername (Zosamme lääje noh …):',
'usermerge-deleteolduser' => 'Dä ahle Metmaacher fott schmieße',
'usermerge-submit' => 'Zosammelääje',
'usermerge-badtoken' => 'Onjöltesch Kennzeiche',
'usermerge-userdeleted' => '„$1" ($2) es jetz fott jeschmeße.',
'usermerge-userdeleted-log' => 'Fott jeschmeße Metmaacherame: „$2" ($3)',
'usermerge-updating' => 'Jeändert: Tabäll $1 (vun $2 noh $3)',
- 'usermerge-success' => 'Et Zosammelääje vun „$1" ($2) noh „$3" ($4) es \
komplätt.',
- 'usermerge-success-log' => 'Metmaacher Name „$2" ($3) zosammejelaat met „$4" \
($5)', + 'usermerge-success' => 'Et Zosammelääje vun „$1" ($2) noh „$3" ($4) es \
komplätt.', # Fuzzy + 'usermerge-success-log' => 'Metmaacher Name „$2" ($3) \
zosammejelaat met „$4" ($5)', # Fuzzy 'usermerge-logpage' => 'Logboch övver et \
Metmaacher-Zosammelääje', 'usermerge-logpagetext' => 'Dat hee es et Logboch övver \
de zosammejelaate Metmaachere.', 'usermerge-noselfdelete' => 'Ene Metmaacher met \
sesch sellver zosamme ze lääje, wat ene Quatsch! Dat jeiht nit.', \
'usermerge-unmergable' => 'Schadt. Die esu zosamme ze Lääje es nit müjjelech. Dat \
dä Metmaacher nit zosamme jelaat wääde kann, es övver singe Name odder per sing \
Nommer esu faßjelaat woode.', 'usermerge-protectedgroup' => 'Schadt. Die esu \
zosamme ze Lääje es nit müjjelech. Dä Metmaacher es en en Jropp, die et \
Zosammelääje verbeede deiht.', 'right-usermerge' => 'Metmaacher zosammelääje',
+ 'usermerge-editcount' => 'De Aanzahl Änderonge zusamme träcke?',
+ 'usermerge-editcount-success' => 'Mer sin de Aanzahl Änderonge {{GENDER:$1|vum \
Metmaacher|vun dä Metmaacherėn|vum däm Metmaacher|vun dä Metmaacherėn|vum \
Metmaacher}} [[User:$1|$1]] un {{GENDER:$2|däm Metmaacher|dä Metmaacherėn|däm \
Metmaacher|dä Metmaacherėn|däm Metmaacher}} „[[User:$2|$2]]" aam zesamme \
träcke.', # Fuzzy + 'usermerge-autopagedelete' => 'Automattesch fottjeschmeße beim \
Metmaacher Zusammelääje', + 'usermerge-page-unmoved' => 'Mer kůnnte di Sigg „$1" \
nit op „$2" ömnänne.', + 'usermerge-page-moved' => 'De Sigg „$1" wood wood op \
„$2" ömjenannt.', + 'usermerge-move-log' => 'Di Sigg weet automatesch ömjenannt \
weil mer {{GENDER:$1|dä Metmaacher|de Metmaacherėn|dä Metmaacher|de \
Metmaacherėn|dä Metmaacher}} „[[User:$1|$1]]" met {{GENDER:$2|däm Metmaacher|dä \
Metmaacherėn|däm Metmaacher|dä Metmaacherėn|däm Metmaacher}} „[[User:$2|$2]]" \
aam zesamme lääje sin.', # Fuzzy + 'usermerge-page-deleted' => 'De Sigg „$1" es \
fottjeschmeße.', +);
+
+/** Kurdish (Latin script) (Kurdî (latînî))
+ * @author Gomada
+ */
+$messages['ku-latn'] = array(
+ 'usermerge-page-deleted' => 'Rûpela $1 jê bir',
);
/** Luxembourgish (Lëtzebuergesch)
@@ -1153,7 +1474,7 @@ $messages['lb'] = array(
'usermerge-desc' => "[[Special:UserMerge|Féiert Benotzerkonte vun engem Benotzer \
mat engem anere Benotzer]] an der Wiki-Datebank zesummen - déi al Benotzerkonte ginn \
no der Zesummeféierung och geläscht. Erfuedert ''usermerge''-Rechter.", \
'usermerge-badolduser' => 'Ongëltegen ale Benotzernumm', 'usermerge-badnewuser' => \
'Ongëltegen neie Benotzernumm',
- 'usermerge-nonewuser' => 'Eidelen neie Benotzernumm - wahrscheinlech eng \
Zesummeféierung mat "$1".<br /> + 'usermerge-nonewuser' => 'Eidelen neie \
Benotzernumm - wahrscheinlech eng Zesummeféierung mat "{{GENDER:$1|$1}}.<br /> \
Klickt op "{{int:usermerge-submit}}" wann Dir d\'accord sidd.', \
'usermerge-noolduser' => 'Eidelen ale Benotzernumm', 'usermerge-fieldset' => \
'Benotzernimm fir zesummenzeféieren', @@ -1165,14 +1486,21 @@ Klickt op \
"{{int:usermerge-submit}}" wann Dir d\'accord sidd.', 'usermerge-userdeleted' => '$1 \
($2) gouf geläscht.', 'usermerge-userdeleted-log' => 'Geläschte Benotzer: $2($3)',
'usermerge-updating' => 'Aktualiséierung vun der Tabell $1 ($2 op $3)',
- 'usermerge-success' => 'D\'Zesummeféierung vum "$1" ($2) op "$3" ($4) ass net \
komplett.',
- 'usermerge-success-log' => 'Benotzer $2 ($3) gouf zesummegeféiert mat $4 ($5)',
+ 'usermerge-success' => 'D\'Zesummeféierung vum "$1" ($2) op "{{GENDER:$3|$3}}" \
($4) ass net komplett.', + 'usermerge-success-log' => 'Benotzer $2 ($3) gouf \
zesummegeféiert mat {{GENDER:$4|$4}} ($5)', 'usermerge-logpage' => 'Lëscht vun de \
Benotzerkonten déi zesummegeféiert goufen', 'usermerge-logpagetext' => 'Dëst ass \
eng Lëscht vun de Benotzerkonten, déi zesummegeféiert goufen.', \
'usermerge-noselfdelete' => 'Dir kënnt Iech net selwer läschen oder mat Iech selwer \
zesummeféieren!', 'usermerge-unmergable' => "Zesammenféierung ass net méiglech - \
d'ID oder de Benotzernumm gouf als net zesummeféierbar definéiert.", \
'usermerge-protectedgroup' => "D'Zesammenféierung ass net méiglech - De Benotzer \
ass an engem geschützte Grupp.", 'right-usermerge' => 'Benotzer zesummeféieren',
+ 'action-usermerge' => 'Benotzer zesummeféieren',
+ 'usermerge-editcount-merge-success' => '{{PLURAL:$1|Eng Ännerung|$1 Ännerunge}} \
vum Benotzer $2 bäi $3 {{PLURAL:$3|Eng Ännerung|$3 Ännerunge}} vum Benotzer $4 \
derbäigesat ($5 {{PLURAL:$1|Eng Ännerung|$1 Ännerungen}} nom Zesummeféieren)', \
+ 'usermerge-autopagedelete' => "Automatesch geläscht wéi d'Benotzer \
zesummegeluecht goufen", + 'usermerge-page-unmoved' => "D'Säit $1 konnt net op $2 \
geréckelt ginn.", + 'usermerge-page-moved' => "D'Säit $1 gouf op $2 geréckelt.",
+ 'usermerge-move-log' => 'D\'Säit gouf automatesch geréckelt wéi de Benotzer \
"[[User:$1|$1]]" mam "[[User:$2|$2{{GENDER:$2|$2}}]]" zesummegeluecht gouf', \
+ 'usermerge-page-deleted' => 'Säit $1 ass geläscht', );
/** Malagasy (Malagasy)
@@ -1182,7 +1510,7 @@ $messages['mg'] = array(
'right-usermerge' => 'Manempo ny kaontim-pikambana',
);
-/** Macedonian (Македонски)
+/** Macedonian (македонски)
* @author Bjankuloski06
* @author Brest
*/
@@ -1191,26 +1519,33 @@ $messages['mk'] = array(
'usermerge-desc' => "[[Special:UserMerge|Спојува наводи од еден \
корисник во друг]] во вики базата на податици - \
ги брише и старите корисници по спојувањето. \
Бара ''usermerge'' привилегии", 'usermerge-badolduser' => \
'Погрешно старо корисничко име', 'usermerge-badnewuser' => \
'Погрешно ново корисничко име',
- 'usermerge-nonewuser' => 'Празно ново корисничко име - се \
подразбира спојување со „$1".<br />
-Кликнете на „{{int:usermerge-submit}}" за да прифатите.',
+ 'usermerge-nonewuser' => 'Празно ново корисничко име. Се \
подразбира спојување со „{{GENDER:$1|$1}}".<br /> \
+Стиснете на „{{int:usermerge-submit}}" за да прифатите.', \
'usermerge-noolduser' => 'Празно старо корисничко име', \
'usermerge-fieldset' => 'Кориснички имиња за спојување', \
'usermerge-olduser' => 'Стар корисник (за спојување од):', \
'usermerge-newuser' => 'Нов корисник (за спојување со):', \
'usermerge-deleteolduser' => 'Избриши стар корисник', \
'usermerge-submit' => 'Спој го корисникот',
- 'usermerge-badtoken' => 'Погрешен жетон за уредување',
+ 'usermerge-badtoken' => 'Погрешна шифра за уредување',
'usermerge-userdeleted' => '$1 ($2) беше избришано.',
'usermerge-userdeleted-log' => 'Избришан корисник: $2 ($3)',
'usermerge-updating' => 'Обновувам табела $1 ($2 до $3)',
- 'usermerge-success' => 'Спојувањето од $1 ($2) до $3 ($4) е \
готово.',
- 'usermerge-success-log' => 'Корисникот $2 ($3) е споен со $4 \
($5)', + 'usermerge-success' => 'Спојувањето од $1 ($2) до \
{{GENDER:$3|$3}} ($4) е готово.', + 'usermerge-success-log' => \
'Корисникот $2 ($3) е споен со {{GENDER:$4|$4}} ($5)', \
'usermerge-logpage' => 'Дневник на спојувања на \
кориснички сметки', 'usermerge-logpagetext' => 'Ова е \
дневник на спојувања на кориснички имиња.', \
'usermerge-noselfdelete' => 'Не можете да се избришете или \
споите самите себеси!', 'usermerge-unmergable' => 'Не можам \
да спојам од корисникот - ид. бр.или името е \
определено како неспојливо.', 'usermerge-protectedgroup' => \
'Не можам да спојам од корисникот - корисникот \
е во заштитена група.', 'right-usermerge' => 'Спојување \
на корисници', + 'action-usermerge' => 'спојување на \
корисници', + 'usermerge-editcount-merge-success' => 'Додадени $1 \
{{PLURAL:$1|уредување|уредувања}} на корисникот $2 \
кон {{PLURAL:$3|едното уредување|$3-те уредувања}} на \
корисникот $4 (со спојувањето се добија $5 \
{{PLURAL:$5|уредување|уредувања}})', + 'usermerge-autopagedelete' \
=> 'Се брише автоматски, при спојување на \
корисници', + 'usermerge-page-unmoved' => 'Не моежев да ја \
преместам страницата $1 на $2.', + 'usermerge-page-moved' => \
'Страницата $1 е преместена на $2.', + 'usermerge-move-log' => \
'Автоматско преместување на страница при \
припојувањето на корисникот „[[User:$1|$1]]" кон \
„[[User:$2|{{GENDER:$2|$2}}]]"', + 'usermerge-page-deleted' => 'Избришана \
страница $1', );
/** Malayalam (മലയാളം)
@@ -1228,8 +1563,8 @@ $messages['ml'] = array(
'usermerge-userdeleted' => '$1 ($2) മായ്ച്ചു.',
'usermerge-userdeleted-log' => 'ഉപയോക്താവിനെ \
മായ്ച്ചു: $2 ($3)', 'usermerge-updating' => '$1 പട്ടിക \
($2 to $3) പുതുക്കുന്നു',
- 'usermerge-success' => '$1 ($2) നെ $3 ($4) ലേക്കു \
സംയോജിപ്പിക്കുന്ന പ്രക്രിയ \
പൂർത്തിയായി.',
- 'usermerge-success-log' => '$2 ($3) എന്ന \
ഉപയോക്താവിനെ $4 ($5)ലേക്കു \
സംയോജിപ്പിച്ചു', + 'usermerge-success' => '$1 ($2) \
നെ $3 ($4) ലേക്കു \
സംയോജിപ്പിക്കുന്ന പ്രക്രിയ \
പൂർത്തിയായി.', # Fuzzy + 'usermerge-success-log' => '$2 ($3) \
എന്ന ഉപയോക്താവിനെ $4 ($5)ലേക്കു \
സംയോജിപ്പിച്ചു', # Fuzzy 'usermerge-logpage' => \
'ഉപയോക്തൃസംയോജന പ്രവർത്തനരേഖ', \
'usermerge-logpagetext' => 'ഉപയോക്താക്കളെ \
സംയോജിപ്പിച്ചതിന്റെ \
പ്രവർത്തനരേഖയാണിത്', 'usermerge-noselfdelete' => \
'താങ്കൾക്ക് താങ്കളെത്തന്നെ \
മായ്ക്കാനോ, മറ്റൊരു \
അക്കുണ്ടിലേക്കു \
സംയോജിപ്പിക്കാനോ പറ്റില്ല!', @@ \
-1244,21 +1579,66 @@ $messages['mr'] = array( 'usermerge-badolduser' => \
'चुकीचे जुने सदस्यनाव', 'usermerge-badnewuser' \
=> 'चुकीचे नवे सदस्यनाव', 'usermerge-noolduser' => \
'रिकामे जुने सदस्यनाव',
- 'usermerge-olduser' => 'जुना सदस्य (इथून एकत्र \
करा)',
- 'usermerge-newuser' => 'नवीन सदस्य (मध्ये \
एकत्र करा)',
- 'usermerge-deleteolduser' => 'जुना सदस्य वगळायचा \
का?', + 'usermerge-olduser' => 'जुना सदस्य (इथून \
एकत्र करा)', # Fuzzy + 'usermerge-newuser' => 'नवीन \
सदस्य (मध्ये एकत्र करा)', # Fuzzy \
+ 'usermerge-deleteolduser' => 'जुना सदस्य वगळायचा \
का?', # Fuzzy 'usermerge-submit' => 'सदस्य एकत्र करा',
'usermerge-badtoken' => 'चुकीचे एडीट टोकन',
'usermerge-userdeleted' => '$1 ($2) ला वगळण्यात आलेले \
आहे.', 'usermerge-userdeleted-log' => 'सदस्य वगळला: $2 \
($3)', 'usermerge-updating' => '$1 सारणी ताजीतवानी \
करीत आहोत ($2 ते $3)',
- 'usermerge-success-log' => 'सदस्य $2 ($3) ला $4 ($5) मध्ये \
एकत्र केले', + 'usermerge-success-log' => 'सदस्य $2 ($3) \
ला $4 ($5) मध्ये एकत्र केले', # Fuzzy \
'usermerge-logpage' => 'सदस्य एकत्रीकरण \
नोंद',
- 'usermerge-logpagetext' => 'ही सदस्य \
एकत्रीकरणाची सूची आहे', \
+ 'usermerge-logpagetext' => 'ही सदस्य \
एकत्रीकरणाची सूची आहे', # Fuzzy \
'usermerge-noselfdelete' => 'तुम्ही स्वत:लाच वगळू \
किंवा एकत्र करू शकत नाही.', \
'right-usermerge' => 'सदस्य एकत्र करा', );
+/** Malay (Bahasa Melayu)
+ * @author Anakmalaysia
+ */
+$messages['ms'] = array(
+ 'usermerge' => 'Gabungkan dan gugurkan pengguna',
+ 'usermerge-desc' => "[[Special:UserMerge|Menggabungkan rujukan daripada seorang \
pengguna kepada seorang pengguna yang lain]] di dalam pangkalan data wiki - juga akan \
menggugurkan pengguna-pengguna lama ekoran penggabungan. Memerlukan keistimewaan \
''usermerge''", + 'usermerge-badolduser' => 'Nama pengguna lama tidak sah',
+ 'usermerge-badnewuser' => 'Nama pengguna baru tidak sah',
+ 'usermerge-nonewuser' => 'Nama pengguna baru kosong, dianggap hendak digabungkan \
dengan "{{GENDER:$1|$1}}".<br /> +
+Klik "{{int:usermerge-submit}}" untuk menerima.',
+ 'usermerge-noolduser' => 'Nama pengguna lama kosong',
+ 'usermerge-fieldset' => 'Nama-nama pengguna yang hendak digabungkan',
+ 'usermerge-olduser' => 'Pengguna lama (digabungkan dari):',
+ 'usermerge-newuser' => 'Pengguna baru (digabungkan ke):',
+ 'usermerge-deleteolduser' => 'Buang pengguna lama',
+ 'usermerge-submit' => 'Gabungkan pengguna',
+ 'usermerge-badtoken' => 'Token penyuntingan tidak sah',
+ 'usermerge-userdeleted' => '$1 ($2) telah dihapuskan.',
+ 'usermerge-userdeleted-log' => 'Pengguna terhapus: $2 ($3)',
+ 'usermerge-updating' => 'Mengemaskinikan jadual $1 ($2 kepada $3)',
+ 'usermerge-success' => 'Penggabungan dari $1 ($2) kepada {{GENDER:$3|$3}} ($4) \
selesai.', + 'usermerge-success-log' => 'Pengguna $2 ($3) digabungkan kepada \
{{GENDER:$4|$4}} ($5)', + 'usermerge-logpage' => 'Log penggabungan pengguna',
+ 'usermerge-logpagetext' => 'Ini merupakan log tindakan menggabungkan pengguna.',
+ 'usermerge-noselfdelete' => 'Anda tidak boleh menghapuskan atau menggabungkan diri \
anda sendiri!', + 'usermerge-unmergable' => 'Tidak dapat menggabungkan pengguna - ID \
atau namanya telah ditakrifkan sebagai tidak boleh digabungkan.', \
+ 'usermerge-protectedgroup' => 'Tidak dapat menggabungkan pengguna - pengguna \
menganggotai kumpulan yang terlindung.', + 'right-usermerge' => 'Menggabungkan \
pengguna', + 'action-usermerge' => 'menggabungkan pengguna',
+ 'usermerge-editcount-merge-success' => 'Menambahkan $1 {{PLURAL:$1|suntingan}} \
pengguna $2 kepada $3 {{PLURAL:$3|suntingan}} pengguna $4 ($5 {{PLURAL:$5|suntingan}} \
selepas penggabungan)', + 'usermerge-autopagedelete' => 'Dihapuskan secara automatik \
apabila menggabungkan pengguna', + 'usermerge-page-unmoved' => 'Halaman $1 tidak \
dapat dipindahkan ke $2.', + 'usermerge-page-moved' => 'Halaman $1 telah dipindahkan \
ke $2.', + 'usermerge-move-log' => 'Halaman dipindahkan secara automatik ketika \
menukar nama "[[User:$1|$1]]" menjadi "[[User:$2|{{GENDER:$2|$2}}]]"', \
+ 'usermerge-page-deleted' => 'Halaman $1 dipadamkan', +);
+
+/** Maltese (Malti)
+ * @author Chrisportelli
+ */
+$messages['mt'] = array(
+ 'right-usermerge' => 'Iwaħħad utenti',
+);
+
/** Nahuatl (Nāhuatl)
* @author Fluence
*/
@@ -1269,18 +1649,56 @@ $messages['nah'] = array(
'usermerge-userdeleted-log' => 'Tlapoloc tlatequitiltilīlli: $2 ($3)',
);
-/** Nedersaksisch (Nedersaksisch)
+/** Norwegian Bokmål (norsk bokmål)
+ * @author Event
+ * @author Nghtwlkr
+ */
+$messages['nb'] = array(
+ 'usermerge' => 'Brukersammenslåing og -sletting',
+ 'usermerge-desc' => "Gir muligheten til å [[Special:UserMerge|slå sammen \
kontoer]] ved at alle referanser til en bruker byttes ut til en annen bruker i \
databasen, for så å slette den ene kontoen. Trenger rettigheten ''usermerge''.", \
+ 'usermerge-badolduser' => 'Gammelt brukernavn ugyldig', + 'usermerge-badnewuser' => \
'Nytt brukernavn ugyldig', + 'usermerge-nonewuser' => 'Nytt brukernavn tomt – \
antar sammenslåing til $1 .<br /> +Klikk {{int:usermerge-submit}} for å \
godta.', # Fuzzy + 'usermerge-noolduser' => 'Gammelt brukernavn tomt',
+ 'usermerge-fieldset' => 'Brukernavn som skal slås sammen',
+ 'usermerge-olduser' => 'Gammelt brukernavn (slå sammen fra):',
+ 'usermerge-newuser' => 'Nytt brukernavn (slå sammen til):',
+ 'usermerge-deleteolduser' => 'Slett gammel bruker',
+ 'usermerge-submit' => 'Slå sammen brukere',
+ 'usermerge-badtoken' => 'Ugyldig redigeringstegn',
+ 'usermerge-userdeleted' => '$1 ($2) har blitt slettet.',
+ 'usermerge-userdeleted-log' => 'Slettet bruker: $2 ($3)',
+ 'usermerge-updating' => 'Oppdaterer $1-tabell ($2 til $3)',
+ 'usermerge-success' => 'Sammenslåing fra $1 ($2) til $3 ($4) er fullført.', # \
Fuzzy + 'usermerge-success-log' => 'Brukeren $2 ($3) slått sammen med $4 ($5)', # \
Fuzzy + 'usermerge-logpage' => 'Brukersammenslåingslogg',
+ 'usermerge-logpagetext' => 'Dette er en logg over brukersammenslåinger.',
+ 'usermerge-noselfdelete' => 'Du kan ikke slette eller slå sammen din egen konto!',
+ 'usermerge-unmergable' => 'Kan ikke slå sammen den gamle kontoen. ID-en eller \
navnet anses som ikke-sammenslåbart.', + 'usermerge-protectedgroup' => 'Kan ikke \
slå sammen den gamle kontoen. Brukeren er medlem i en beskyttet brukergruppe.', \
+ 'right-usermerge' => 'Slå sammen kontoer', + 'usermerge-editcount' => 'Legge til \
antall redigeringer?', + 'usermerge-editcount-success' => 'Legge til antall \
redigeringer for ($1 og $2)', + 'usermerge-autopagedelete' => 'Automatisk slettet ved \
brukersammenslåing', + 'usermerge-page-unmoved' => 'Side $1 kunne ikke flyttes til \
$2.', + 'usermerge-page-moved' => 'Side $1 er flyttet til $2.',
+ 'usermerge-move-log' => 'Flyttet siden automatisk i forbindelse med sammenslåing \
av bruker "[[User:$1|$1]]" til "[[User:$2|$2]]"', # Fuzzy + 'usermerge-page-deleted' \
=> 'Slettet side $1', +);
+
+/** Low Saxon (Netherlands) (Nedersaksies)
* @author Servien
*/
$messages['nds-nl'] = array(
'usermerge' => 'Gebrukers samenvoegen en vortdoon',
- 'usermerge-desc' => "Voeg een [[Special:UserMerge|speciale pagina]] toe um \
gebrukers samen te voegen en de ouwe gebruker(s) vort te doon (hierveur is 't rech \
''usermerge'' neudig)", + 'usermerge-desc' => "Zet n [[Special:UserMerge|spesiale \
zied]] derbie um gebrukers samen te voegen en de ouwe gebruker(s) vort te doon \
(hierveur is t recht ''usermerge'' neudig)", 'usermerge-badolduser' => 'Ongeldige \
ouwe gebrukersnaam', 'usermerge-badnewuser' => 'Ongeldige nieje gebrukersnaam',
- 'usermerge-nonewuser' => 'De nieje gebrukersnaam is neet op-egeven - der wönnen \
vanuut egaon dat der samengevoeg mut wönnen naor $1.<br /> + 'usermerge-nonewuser' \
=> 'De nieje gebrukersnaam is niet op-egeven. Der wörden vanuut egaon dat der \
samenevoegd mut wörden naor "{{GENDER:$1|$1}}".<br /> Klik \
"{{int:usermerge-submit}}" um de haandeling uut te voeren.',
- 'usermerge-noolduser' => 'Ouwe gebrukersnaam is neet op-egeven',
- 'usermerge-fieldset' => 'Gebrukersnamen dee samen-evoegen mutten wönnen',
+ 'usermerge-noolduser' => 'Ouwe gebrukersnaam is niet op-egeven',
+ 'usermerge-fieldset' => 'Gebrukersnamen die samenevoegen mutten wörden',
'usermerge-olduser' => 'Ouwe gebruker (samenvoegen van):',
'usermerge-newuser' => 'Nieje gebruker (samenvoegen naor):',
'usermerge-deleteolduser' => 'Ouwe gebruker vortdoon',
@@ -1288,15 +1706,22 @@ Klik "{{int:usermerge-submit}}" um de haandeling uut te \
voeren.', 'usermerge-badtoken' => 'Ongeldig bewarkingstoken',
'usermerge-userdeleted' => '$1 ($2) is vort-edaon.',
'usermerge-userdeleted-log' => 'Vort-edaone gebruker: $2 ($3)',
- 'usermerge-updating' => "Tebel $1 an 't biewarken ($2 naor $3)",
- 'usermerge-success' => 'Samenvoegen van $1 ($2) naor $3 ($4) is of-erond.',
- 'usermerge-success-log' => 'Gebruker $2 ($3) samen-evoeg naor $4 ($5)',
+ 'usermerge-updating' => 'Tabel $1 an t biewarken ($2 naor $3)',
+ 'usermerge-success' => 'Samenvoegen van $1 ($2) naor {{GENDER:$3|$3}} ($4) is \
aoferond.', + 'usermerge-success-log' => 'Gebruker $2 ($3) samenevoegd naor \
{{GENDER:$4|$4}} ($5)', 'usermerge-logpage' => 'Logboek gebrukerssamenvoegingen',
- 'usermerge-logpagetext' => "Dit is 't logboek van gebrukerssamenvoegingen.",
- 'usermerge-noselfdelete' => 'Je kunnen je eigen neet vortdoon of samenvoegen!',
- 'usermerge-unmergable' => "Disse gebruker kan neet samen-evoeg wönnen. De \
gebrukersnaam of 't gebrukersnummer is in-esteld as neet \
samenvoegen.",
- 'usermerge-protectedgroup' => 'Kan de gebrukers neet samenvoegen. De gebruker zit \
in een bescharmde groep.', + 'usermerge-logpagetext' => 'Dit is t logboek van \
gebrukerssamenvoegingen.', + 'usermerge-noselfdelete' => 'Je kunnen je eigen niet \
vortdoon of samenvoegen!', + 'usermerge-unmergable' => 'Disse gebruker kan niet \
samenevoeg wörden. De gebrukersnaam of t gebrukersnummer is in-esteld as niet \
samenvoegen.', + 'usermerge-protectedgroup' => 'Kan de gebrukers niet samenvoegen. De \
gebruker zit in n bescharmde groep.', 'right-usermerge' => 'Gebrukers samenvoegen',
+ 'action-usermerge' => 'gebrukers samenvoegen',
+ 'usermerge-editcount-merge-success' => '$1 {{PLURAL:$1|bewarking|bewarkingen}} van \
de gebruker $2 bie $3 {{PLURAL:$3|bewarking|bewarkingen}} van de gebruker $4 zetten \
($5 {{PLURAL:$5|bewarking|bewarkingen}} nao samenvoegen)', \
+ 'usermerge-autopagedelete' => 'Automaties vortedaon bie t samenvoegen van \
gebrukers', + 'usermerge-page-unmoved' => 'De zied $1 kon niet herneumd wörden naor \
$2.', + 'usermerge-page-moved' => 'De zied $1 is herneumd naor $2.',
+ 'usermerge-move-log' => 'Zied is automaties verplaotst bie t herneumen van de \
gebruker "[[User:$1|$1]]" naor "[[User:$2|$2]]"', + 'usermerge-page-deleted' => \
'Vortedaone zied $1', );
/** Dutch (Nederlands)
@@ -1305,12 +1730,13 @@ Klik "{{int:usermerge-submit}}" um de haandeling uut te \
voeren.',
*/
$messages['nl'] = array(
'usermerge' => 'Gebruikers samenvoegen en verwijderen',
- 'usermerge-desc' => "Voegt een [[Special:UserMerge|speciale pagina]] toe om \
gebruikers samen te voegen en de oude gebruiker(s) te verwijderen (hiervoor is het \
recht ''usermerge'' nodig)", + 'usermerge-desc' => "Voegt een \
[[Special:UserMerge|speciale pagina]] toe om gebruikers samen te voegen en de oude \
gebruiker(s) te verwijderen. Hiervoor is het recht ''usermerge'' nodig.", \
'usermerge-badolduser' => 'Ongeldige oude gebruiker', 'usermerge-badnewuser' => \
'Ongeldige nieuwe gebruiker',
- 'usermerge-nonewuser' => 'De nieuwe gebruikersnaam is niet ingegeven - er wordt \
aangenomen dat er samengevoegd moet worden naar $1.<br /> + 'usermerge-nonewuser' => \
'De nieuwe gebruikersnaam is niet opgegeven. +Er wordt aangenomen dat er samengevoegd \
moet worden naar "{{GENDER:$1|$1}}".<br /> Klik "{{int:usermerge-submit}}" om de \
handeling uit te voeren.',
- 'usermerge-noolduser' => 'Oude gebruiker is niet ingegeven',
+ 'usermerge-noolduser' => 'De oude gebruiker is niet opgegeven.',
'usermerge-fieldset' => 'Samen te voegen gebruikersnamen',
'usermerge-olduser' => 'Oude gebruiker (samenvoegen van):',
'usermerge-newuser' => 'Nieuwe gebruiker (samenvoegen naar):',
@@ -1320,27 +1746,36 @@ Klik "{{int:usermerge-submit}}" om de handeling uit te \
voeren.', 'usermerge-userdeleted' => '$1 ($2) is verwijderd.',
'usermerge-userdeleted-log' => 'Verwijderde gebruiker: $2 ($3)',
'usermerge-updating' => 'Tabel $1 aan het bijwerken ($2 naar $3)',
- 'usermerge-success' => 'Samenvoegen van $1 ($2) naar $3 ($4) is afgerond.',
- 'usermerge-success-log' => 'Gebruiker $2 ($3) samengevoegd naar $4 ($5)',
+ 'usermerge-success' => 'Samenvoegen van $1 ($2) naar {{GENDER:$3|$3}} ($4) is \
afgerond.', + 'usermerge-success-log' => 'Gebruiker $2 ($3) samengevoegd naar \
{{GENDER:$4|$4}} ($5)', 'usermerge-logpage' => 'Logboek gebruikerssamenvoegingen',
'usermerge-logpagetext' => 'Dit is het logboek van gebruikerssamenvoegingen.',
'usermerge-noselfdelete' => 'U kunt uzelf niet verwijderen of samenvoegen!',
'usermerge-unmergable' => 'Deze gebruiker kan niet samengevoegd worden. De \
gebruikersnaam of het gebruikersnummer is ingesteld als niet samen te voegen.', \
'usermerge-protectedgroup' => 'Het is niet mogelijk de gebruikers samen te voegen. De \
gebruiker zit in een beschermde groep.', 'right-usermerge' => 'Gebruikers \
samenvoegen', + 'action-usermerge' => 'gebruikers samenvoegen',
+ 'usermerge-editcount' => 'Aantal bewerkingen toevoegen?',
+ 'usermerge-editcount-success' => 'Bezig met het toevoegen van het aantal \
bewerkingen voor ($1 en $2)', + 'usermerge-autopagedelete' => 'Automatisch verwijderd \
bij het samenvoegen van gebruikers', + 'usermerge-page-unmoved' => 'De pagina $1 kon \
niet hernoemd worden naar $2.', + 'usermerge-page-moved' => 'De pagina $1 is hernoemd \
naar $2.', + 'usermerge-move-log' => 'Pagina automatisch hernoemd bij het samenvoegen \
van gebruiker "[[User:$1|$1]]" naar "[[User:$2|{{GENDER:$2|$2}}]]"', \
+ 'usermerge-page-deleted' => 'Verwijderde pagina $1', );
-/** Norwegian Nynorsk (Norsk (nynorsk))
+/** Norwegian Nynorsk (norsk nynorsk)
* @author Frokor
* @author Gunnernett
* @author Harald Khan
+ * @author Njardarlogar
*/
$messages['nn'] = array(
'usermerge' => 'Slå saman og slett brukarar',
'usermerge-desc' => "Gjev høve til å [[Special:UserMerge|slå saman kontoar]] ved \
at alle referansar til ein brukar vert bytta ut til ein annen brukar i databasen, for \
så å slette den eine kontoen. Krev rett til ''usermerge''.", \
'usermerge-badolduser' => 'Gammalt brukernamn ugyldig', 'usermerge-badnewuser' => \
'Nytt brukernamn ugyldig',
- 'usermerge-nonewuser' => 'Nytt brukarnamn tomt – går ut frå samanslåing \
til $1.<br />Klikk "{{int:usermerge-submit}}" for å godta', + 'usermerge-nonewuser' \
=> 'Nytt brukarnamn tomt – går ut frå samanslåing til $1.<br />Klikk \
"{{int:usermerge-submit}}" for å godta', # Fuzzy 'usermerge-noolduser' => 'Gammalt \
brukarnamn tomt', 'usermerge-fieldset' => 'Brukarnamn som skal verta slegne saman',
'usermerge-olduser' => 'Gammalt brukarnamn (slå saman frå):',
@@ -1351,8 +1786,8 @@ $messages['nn'] = array(
'usermerge-userdeleted' => '$1 ($2) er sletta.',
'usermerge-userdeleted-log' => 'Sletta brukar: $2 ($3)',
'usermerge-updating' => 'Oppdaterer $1-tabell ($2 til $3)',
- 'usermerge-success' => 'Samanslåing frå $1 ($2) til $3 ($4) er ferdig.',
- 'usermerge-success-log' => 'Brukaren $2 ($3) slått saman med $4 ($5)',
+ 'usermerge-success' => 'Samanslåing frå $1 ($2) til $3 ($4) er ferdig.', # Fuzzy
+ 'usermerge-success-log' => 'Brukaren $2 ($3) slått saman med $4 ($5)', # Fuzzy
'usermerge-logpage' => 'Brukarsamanslåingslogg',
'usermerge-logpagetext' => 'Dette er ein logg over brukarsamanslåingar.',
'usermerge-noselfdelete' => 'Du kan ikkje slette eller slå saman din eigen \
konto!', @@ -1361,38 +1796,7 @@ $messages['nn'] = array(
'right-usermerge' => 'Slå saman kontoar',
);
-/** Norwegian (bokmål) (Norsk (bokmål))
- * @author Jon Harald Søby
- * @author Nghtwlkr
- */
-$messages['no'] = array(
- 'usermerge' => 'Brukersammenslåing og -sletting',
- 'usermerge-desc' => "Gir muligheten til å [[Special:UserMerge|slå sammen \
kontoer]] ved at alle referanser til en bruker byttes ut til en annen bruker i \
databasen, for så å slette den ene kontoen. Trenger rettigheten \
''usermerge''.",
- 'usermerge-badolduser' => 'Gammelt brukernavn ugyldig',
- 'usermerge-badnewuser' => 'Nytt brukernavn ugyldig',
- 'usermerge-nonewuser' => 'Nytt brukernavn tomt – antar sammenslåing til $1 \
.<br />
-Klikk {{int:usermerge-submit}} for å godta.',
- 'usermerge-noolduser' => 'Gammelt brukernavn tomt',
- 'usermerge-fieldset' => 'Brukernavn som skal slås sammen',
- 'usermerge-olduser' => 'Gammelt brukernavn (slå sammen fra):',
- 'usermerge-newuser' => 'Nytt brukernavn (slå sammen til):',
- 'usermerge-deleteolduser' => 'Slett gammel bruker',
- 'usermerge-submit' => 'Slå sammen brukere',
- 'usermerge-badtoken' => 'Ugydlgi redigeringstegn',
- 'usermerge-userdeleted' => '$1 ($2) har blitt slettet.',
- 'usermerge-userdeleted-log' => 'Slettet bruker: $2 ($3)',
- 'usermerge-updating' => 'Oppdaterer $1-tabell ($2 til $3)',
- 'usermerge-success' => 'Sammenslåing fra $1 ($2) til $3 ($4) er ferdig.',
- 'usermerge-success-log' => 'Brukeren $2 ($3) slått sammen med $4 ($5)',
- 'usermerge-logpage' => 'Brukersammenslåingslogg',
- 'usermerge-logpagetext' => 'Dette er en logg over brukersammenslåinger.',
- 'usermerge-noselfdelete' => 'Du kan ikke slette eller slå sammen din egen konto!',
- 'usermerge-unmergable' => 'Kan ikke slå sammen den gamle kontoen. ID-en eller \
navnet anses som ikke-sammenslåbart.',
- 'usermerge-protectedgroup' => 'Kan ikke slå sammen den gamle kontoen. Brukeren er \
medlem i en beskyttet brukergruppe.',
- 'right-usermerge' => 'Slå sammen kontoer',
-);
-
-/** Occitan (Occitan)
+/** Occitan (occitan)
* @author Cedric31
*/
$messages['oc'] = array(
@@ -1401,7 +1805,7 @@ $messages['oc'] = array(
'usermerge-badolduser' => "Nom d'utilizaire ancian invalid",
'usermerge-badnewuser' => "Nom d'utilizaire novèl invalid",
'usermerge-nonewuser' => "Nom d'utilizaire novèl void. Fasèm l'ipotèsi que \
volètz fusionar dins $1 .<br />
-Clicatz sus {{int:usermerge-submit}} per acceptar.",
+Clicatz sus {{int:usermerge-submit}} per acceptar.", # Fuzzy
'usermerge-noolduser' => "Nom d'utilizaire ancian void",
'usermerge-fieldset' => 'Noms d'utilizaires de fusionar',
'usermerge-olduser' => 'Utilizaire ancian (fusionar dempuèi) :',
@@ -1412,8 +1816,8 @@ Clicatz sus {{int:usermerge-submit}} per acceptar.",
'usermerge-userdeleted' => '$1($2) es destruch.',
'usermerge-userdeleted-log' => 'Contributor escafat : $2($3)',
'usermerge-updating' => 'Mesa a jorn de la taula $1 (de $2 a $3)',
- 'usermerge-success' => 'La fusion de $1($2) a $3($4) es completada.',
- 'usermerge-success-log' => 'Contributor $2($3) fusionat amb $4($5)',
+ 'usermerge-success' => 'La fusion de $1($2) a $3($4) es completada.', # Fuzzy
+ 'usermerge-success-log' => 'Contributor $2($3) fusionat amb $4($5)', # Fuzzy
'usermerge-logpage' => 'Jornal de las fusions de contributors',
'usermerge-logpagetext' => 'Aquò es un jornal de las accions de fusions de \
contributors.', 'usermerge-noselfdelete' => 'Podètz pas, vos-meteis, vos suprimir \
ni vos fusionar !', @@ -1422,7 +1826,8 @@ Clicatz sus {{int:usermerge-submit}} \
per acceptar.", 'right-usermerge' => "Fusionar d'utilizaires",
);
-/** Polish (Polski)
+/** Polish (polski)
+ * @author BeginaFelicysym
* @author Derbeth
* @author Masti
* @author Sp5uhe
@@ -1434,7 +1839,7 @@ $messages['pl'] = array(
'usermerge-badolduser' => 'Nieprawidłowa nazwa dotychczasowego użytkownika',
'usermerge-badnewuser' => 'Nieprawidłowa nazwa nowego użytkownika',
'usermerge-nonewuser' => 'Pusta nazwa nowego użytkownika – integracja nastąpi z \
$1.<br />
-Kliknij „{{int:usermerge-submit}}", aby zaakceptować.',
+Kliknij „{{int:usermerge-submit}}", aby zaakceptować.', # Fuzzy
'usermerge-noolduser' => 'Pusta nazwa dotychczasowego użytkownika',
'usermerge-fieldset' => 'Nazwy kont użytkowników do integracji',
'usermerge-olduser' => 'Dotychczasowy użytkownik (do integracji)',
@@ -1445,17 +1850,25 @@ Kliknij „{{int:usermerge-submit}}", aby zaakceptować.',
'usermerge-userdeleted' => '$1 ($2) został usunięty.',
'usermerge-userdeleted-log' => 'usunął użytkownika „$2" ($3)',
'usermerge-updating' => 'Aktualizacja tablicy $1 ($2 do $3)',
- 'usermerge-success' => 'Integracja $1 ($2) z $3 ($4) zakończona.',
- 'usermerge-success-log' => 'zintegrował użytkownika „$2" ($3) do „$4" ($5)',
+ 'usermerge-success' => 'Integracja $1 ($2) z $3 ($4) zakończona.', # Fuzzy
+ 'usermerge-success-log' => 'zintegrował użytkownika „$2" ($3) do „$4" ($5)', \
# Fuzzy 'usermerge-logpage' => 'Rejestr integracji użytkowników',
'usermerge-logpagetext' => 'To jest rejestr operacji integracji użytkowników.',
'usermerge-noselfdelete' => 'Nie możesz usunąć lub zintegrować samego siebie!',
'usermerge-unmergable' => 'Nie można zintegrować użytkownika – identyfikator \
lub nazwa zostały zdefiniowane jako nieintegrowalne.', 'usermerge-protectedgroup' \
=> 'Nie można zintegrować użytkownika – jest członkiem zabezpieczonej grupy.', \
'right-usermerge' => 'Łączenie kont użytkowników', + 'usermerge-editcount' => \
'Dodać licznik edycji?', + 'usermerge-editcount-success' => 'Dodawanie licznika \
edycji ($1 i $2)', + 'usermerge-autopagedelete' => 'Automatycznie usuwane podczas \
scalania użytkowników', + 'usermerge-page-unmoved' => 'Strona $1 nie mogła zostać \
przeniesiona pod nazwę $2.', + 'usermerge-page-moved' => 'Strona $1 została \
przeniesiona do $2.', + 'usermerge-move-log' => 'Automatyczne przeniesiono stronę po \
zmianie nazwy konta z "[[User:$1|$1]]" na "[[User:$2|$2]]"', # Fuzzy \
+ 'usermerge-page-deleted' => 'Usunięto stronę $1', );
/** Piedmontese (Piemontèis)
+ * @author Borichèt
* @author Bèrto 'd Sèra
* @author Dragonòt
*/
@@ -1464,8 +1877,8 @@ $messages['pms'] = array(
'usermerge-desc' => "[[Special:UserMerge|A uniss j'arferiment da n'utent a n' utr \
utent]] ant ël database wiki - a scanseler ëdcò ij vej utent d'apress l'union. A \
veul ij pribilegi ''usermerge''", 'usermerge-badolduser' => 'Vej stranòm nen bon',
'usermerge-badnewuser' => 'Neuv stranòm nen bon',
- 'usermerge-nonewuser' => 'Neuv stranòm veujd - i të tnisoma bon për n\'union a \
"$1".<br />
-Sgnaca "{{int:usermerge-submit}}" për asseté.',
+ 'usermerge-nonewuser' => 'Neuv stranòm veujd. I chërdoma ch\'a veula gionz-se an \
{{GENDER:$1|$1}} .<br /> +Ch\'a sgnaca "{{int:usermerge-submit}}" për aceté.',
'usermerge-noolduser' => 'Vej stranòm veujd',
'usermerge-fieldset' => 'Nòm utent da unì',
'usermerge-olduser' => 'Vej utent (unì da):',
@@ -1476,14 +1889,22 @@ Sgnaca "{{int:usermerge-submit}}" për asseté.',
'usermerge-userdeleted' => "$1($2) a l'é st it scancel .",
'usermerge-userdeleted-log' => 'Utent scansel : $2 ($3)',
'usermerge-updating' => "Antramentr ch'i agiornoma la t ola $1 ($2 a $3)",
- 'usermerge-success' => 'Union da $1($2) a $3($4) complet .',
- 'usermerge-success-log' => 'Utent $2 ($3) unì a $4 ($5)',
+ 'usermerge-success' => 'Union da $1($2) a {{GENDER:$3}} ($4) complet .',
+ 'usermerge-success-log' => 'Utent $2 ($3) unì a {{GENDER:$4}} ($5)',
'usermerge-logpage' => 'Registr dle union utent',
'usermerge-logpagetext' => "Sto sì a l'é un registr ëd le assion d'union \
utent.", 'usermerge-noselfdelete' => 'It peule pa scanselé o unì ti midem!',
'usermerge-unmergable' => "As peul pa unì l'utent - l'ID o ël nòm a l'é st it \
definì pa unific bil.", 'usermerge-protectedgroup' => "As peul pa unì l'utent - \
l'utent a l'é ant na partìa protegiùa.", 'right-usermerge' => "Uniss j'utent",
+ 'action-usermerge' => "uniss j'utent",
+ 'usermerge-editcount' => 'Gionté un conteur ëd modìfiche?',
+ 'usermerge-editcount-success' => 'Gionté un conteur ëd modìfiche ëd ($1 e $2)',
+ 'usermerge-autopagedelete' => "Scancel automaticament an unificand j'utent",
+ 'usermerge-page-unmoved' => 'La p gina $1 a peul pa esse tramud a $2.',
+ 'usermerge-page-moved' => "La p gina $1 a l'ha f it San Martin a $2.",
+ 'usermerge-move-log' => 'P gina tramud n\'autom tich damëntrè ch\'as \
arbatiava "[[User:$1|$1]]" an "[[User:$2|{{GENDER:$2|$2}}]]"', \
+ 'usermerge-page-deleted' => 'Scancel la pagina $1', );
/** Pashto (پښتو)
@@ -1494,46 +1915,53 @@ $messages['ps'] = array(
'usermerge-deleteolduser' => 'زوړ کارن ړنګول',
);
-/** Portuguese (Português)
+/** Portuguese (português)
* @author Crazymadlover
* @author Hamilton Abreu
* @author Jorge Morais
* @author Lijealso
+ * @author Luckas
* @author Malafaya
* @author Sir Lestaty de Lioncourt
* @author Waldir
*/
$messages['pt'] = array(
'usermerge' => 'Fusão e eliminação de utilizadores',
- 'usermerge-desc' => "[[Special:UserMerge|Funde referências a um utilizador com as \
de outro utilizador]] na base de dados da wiki - também apaga o antigo utilizador \
após a fusão. Requer o privilégio ''usermerge''", + 'usermerge-desc' => \
"[[Special:UserMerge|Faz a fusão das referências a um utilizador com as de outro \
utilizador]] na base de dados da wiki - também apaga o utilizador antigo após a \
fusão. Requer o privilégio ''usermerge''", 'usermerge-badolduser' => 'Nome antigo \
inválido', 'usermerge-badnewuser' => 'Nome novo inválido',
- 'usermerge-nonewuser' => 'Novo nome de utilizador vazio - assumida fusão com \
$1.<br />
-Clique "{{int:usermerge-submit}}" para aceitar.',
- 'usermerge-noolduser' => 'Limpar nome antigo',
+ 'usermerge-nonewuser' => 'O nome de utilizador novo está vazio - será assumida a \
fusão com $1.<br /> +Clique "{{int:usermerge-submit}}" para aceitar.', # Fuzzy
+ 'usermerge-noolduser' => 'O nome de utilizador antigo está vazio',
'usermerge-fieldset' => 'Nomes de utilizadores a fundir',
'usermerge-olduser' => 'Utilizador antigo (fundir de):',
'usermerge-newuser' => 'Utilizador novo (fundir para):',
'usermerge-deleteolduser' => 'Apagar utilizador antigo',
'usermerge-submit' => 'Fundir utilizador',
- 'usermerge-badtoken' => 'Ficha de edição inválida',
+ 'usermerge-badtoken' => 'Chave de edição inválida',
'usermerge-userdeleted' => '$1 ($2) foi eliminado.',
- 'usermerge-userdeleted-log' => 'Utilizador eliminado: $2 ($3)',
- 'usermerge-updating' => 'Actualizando tabela $1 ($2 para $3)',
- 'usermerge-success' => 'Fusão de $1 ($2) para $3 ($4) está completa.',
- 'usermerge-success-log' => 'Utilizador $2 ($3) fundido com $4 ($5)',
+ 'usermerge-userdeleted-log' => 'Utilizador apagado: $2 ($3)',
+ 'usermerge-updating' => 'A atualizar a tabela $1 ($2 para $3)',
+ 'usermerge-success' => 'A fusão de $1 ($2) com $3 ($4) está completa.', # Fuzzy
+ 'usermerge-success-log' => 'Utilizador $2 ($3) fundido com $4 ($5)', # Fuzzy
'usermerge-logpage' => 'Registo de fusão de utilizadores',
- 'usermerge-logpagetext' => 'Este é um registo de acções de fusão de \
utilizadores.', + 'usermerge-logpagetext' => 'Este é um registro de ações de \
fusão de utilizadores.', 'usermerge-noselfdelete' => 'Não pode apagar ou fundir a \
partir de si próprio!',
- 'usermerge-unmergable' => 'Não foi possível fundir o utilizador - Nome ou ID foi \
definido para não ser fundido.',
- 'usermerge-protectedgroup' => 'Não é possível fundir este utilizador - \
Utilizador está em um grupo protegido', + 'usermerge-unmergable' => 'Não foi \
possível fundir o utilizador - o nome ou ID está definido como não podendo ser \
fundido.', + 'usermerge-protectedgroup' => 'Não é possível fundir este utilizador \
- o utilizador está num grupo protegido.', 'right-usermerge' => 'Fundir \
utilizadores', + 'usermerge-autopagedelete' => 'Eliminada automaticamente ao fundir \
utilizadores', + 'usermerge-page-unmoved' => 'Não foi possível mover a página $1 \
para $2.', + 'usermerge-page-moved' => 'A página $1 foi movida para $2.',
+ 'usermerge-move-log' => 'Página movida automaticamente ao fundir o utilizador \
"[[User:$1|$1]]" com "[[User:$2|$2]]"', # Fuzzy + 'usermerge-page-deleted' => 'A \
página $1 foi eliminada', );
-/** Brazilian Portuguese (Português do Brasil)
+/** Brazilian Portuguese (português do Brasil)
* @author Crazymadlover
* @author Eduardo.mps
* @author Jorge Morais
+ * @author Luckas
*/
$messages['pt-br'] = array(
'usermerge' => 'Fusão e eliminação de utilizadores',
@@ -1541,20 +1969,20 @@ $messages['pt-br'] = array(
'usermerge-badolduser' => 'Nome antigo inválido',
'usermerge-badnewuser' => 'Nome novo inválido',
'usermerge-nonewuser' => 'Novo nome de utilizador vazio - assumida fusão com \
"$1".<br />
-Clique "{{int:usermerge-submit}}" para aceitar.',
+Clique "{{int:usermerge-submit}}" para aceitar.', # Fuzzy
'usermerge-noolduser' => 'Limpar nome antigo',
'usermerge-fieldset' => 'Nomes de utilizador a unificar',
- 'usermerge-olduser' => 'Utilizador antigo (fundir de):',
- 'usermerge-newuser' => 'Utilizador novo (fundir para):',
+ 'usermerge-olduser' => 'Usuário antigo (fundir de):',
+ 'usermerge-newuser' => 'Usuário novo (fundir para):',
'usermerge-deleteolduser' => 'Apagar usuário antigo',
- 'usermerge-submit' => 'Fundir utilizador',
+ 'usermerge-submit' => 'Fundir usuário',
'usermerge-badtoken' => 'Token de edição inválida',
'usermerge-userdeleted' => '$1 ($2) foi eliminado.',
- 'usermerge-userdeleted-log' => 'Utilizador eliminado: $2 ($3)',
+ 'usermerge-userdeleted-log' => 'Usuário apagado: $2 ($3)',
'usermerge-updating' => 'Atualizando tabela $1 ($2 para $3)',
- 'usermerge-success' => 'Fusão de $1 ($2) para $3 ($4) está completa.',
- 'usermerge-success-log' => 'Utilizador $2 ($3) fundido com $4 ($5)',
- 'usermerge-logpage' => 'Registo de fusão de utilizadores',
+ 'usermerge-success' => 'Fusão de $1 ($2) para $3 ($4) está completa.', # Fuzzy
+ 'usermerge-success-log' => 'Utilizador $2 ($3) fundido com $4 ($5)', # Fuzzy
+ 'usermerge-logpage' => 'Registro de fusão de utilizadores',
'usermerge-logpagetext' => 'Este é um registro de ações de fusão de \
utilizadores.', 'usermerge-noselfdelete' => 'Você não pode apagar ou fundir a \
partir de si próprio!', 'usermerge-unmergable' => 'Não foi possível fundir o \
utilizador - Nome ou ID foi definido para não ser fundido.', @@ -1562,7 +1990,7 @@ \
Clique "{{int:usermerge-submit}}" para aceitar.', 'right-usermerge' => 'Fundir \
utilizadores', );
-/** Romanian (Română)
+/** Romanian (română)
* @author KlaudiuMihaila
* @author Mihai
*/
@@ -1572,7 +2000,7 @@ $messages['ro'] = array(
'usermerge-badolduser' => 'Nume de utilizator vechi incorect',
'usermerge-badnewuser' => 'Nume de utilizator nou incorect',
'usermerge-nonewuser' => 'Noul nume de utilizator nu este introdus - Este \
presupusă fuzionarea în "$1".<br />
-Apasă "{{int:usermerge-submit}}" pentru a accepta.',
+Apasă "{{int:usermerge-submit}}" pentru a accepta.', # Fuzzy
'usermerge-noolduser' => 'Nume de utilizator vechi gol',
'usermerge-fieldset' => 'Nume de utilizator de contopit',
'usermerge-olduser' => 'Utilizator vechi (redenumește din):',
@@ -1583,8 +2011,8 @@ Apasă "{{int:usermerge-submit}}" pentru a accepta.',
'usermerge-userdeleted' => '$1 ($2) a fost șters.',
'usermerge-userdeleted-log' => 'Şterge utilizator: $2 ($3)',
'usermerge-updating' => 'Actualizarea tabelului $1 ($2 în $3)',
- 'usermerge-success' => 'Contopirea din $1 ($2) în $3 ($4) este completă.',
- 'usermerge-success-log' => 'Utilizatorul $2 ($3) a fost contopit în $4 ($5)',
+ 'usermerge-success' => 'Contopirea din $1 ($2) în $3 ($4) este completă.', # \
Fuzzy + 'usermerge-success-log' => 'Utilizatorul $2 ($3) a fost contopit în $4 \
($5)', # Fuzzy 'usermerge-logpage' => 'Jurnal contopire utilizatori',
'usermerge-logpagetext' => 'Acesta este jurnalul acțiunilor de contopire a \
conturilor de utilizator.', 'usermerge-noselfdelete' => 'Nu poate fi șters sau \
contopit contul propriu!', @@ -1593,18 +2021,49 @@ Apasă "{{int:usermerge-submit}}" \
pentru a accepta.', 'right-usermerge' => 'Contopire conturi de utilizator',
);
-/** Tarandíne (Tarandíne)
+/** tarandíne (tarandíne)
* @author Joetaras
*/
$messages['roa-tara'] = array(
+ 'usermerge' => 'Scuagghie e scangille le utinde',
+ 'usermerge-desc' => "[[Special:UserMerge|Scuagghie le refereminde da 'n'utende a \
'n'otre utende]] jndr' 'u database de uicchi - avènene scangellate pure le vicchie \
utinde apprisse 'u scuagghiamende. A tenè le deritte de ''usermerge''", \
'usermerge-badolduser' => 'Nome utende vecchije invalide', 'usermerge-badnewuser' => \
'Nome utende nuève invalide',
-);
-
-/** Russian ( усский)
+ 'usermerge-nonewuser' => 'Nome utende nuève vacande. Se decide de scuagghiarle \
jndr\' "{{GENDER:$1|$1}}".<br /> +Cazze "{{int:usermerge-submit}}" pe accett .',
+ 'usermerge-noolduser' => "Vacande 'u nome utende vecchie.",
+ 'usermerge-fieldset' => 'Nome utinde da scuagghi .',
+ 'usermerge-olduser' => 'Utende vecchie (da scuagghi ):',
+ 'usermerge-newuser' => 'Utende nuève (da pigghi ):',
+ 'usermerge-deleteolduser' => 'Scangellate vecchie utende',
+ 'usermerge-submit' => "Scuagghie l'utende",
+ 'usermerge-badtoken' => 'Gettone de cangiamende invalide.',
+ 'usermerge-userdeleted' => '$1 ($2) ha state scangellate.',
+ 'usermerge-userdeleted-log' => 'Utende scangellate: $2 ($3)',
+ 'usermerge-updating' => 'Stoche aggiorne $1 tabbelle ($2 a $3)',
+ 'usermerge-success' => "'U scuagghiamende da $1 ($2) a {{GENDER:$3|$3}} ($4) ha \
state combletate.", + 'usermerge-success-log' => "Utende $2 ($3) scuagghiate jndr' \
{{GENDER:$4|$4}} ($5)", + 'usermerge-logpage' => 'Archivije de le scuagghiaminde de \
le utinde', + 'usermerge-logpagetext' => "Quiste jè 'n'archivie de le aziune de \
scuagghiamende de l'utende.", + 'usermerge-noselfdelete' => 'Non ge pu scangellarte \
o scuagghiarte da sule!', + 'usermerge-unmergable' => "Non ge pozze scuagghi \
l'utende: L'ID o 'u nome ha state definite cumme none scuagghiabbile.", \
+ 'usermerge-protectedgroup' => "Non ge pozze scuagghia cu l'utende: L'utende ste \
jndr' 'nu gruppe prutette.", + 'right-usermerge' => 'Scuagghie le utinde',
+ 'action-usermerge' => 'scuagghie le utinde',
+ 'usermerge-editcount-merge-success' => "Stoche aggiunge $1 {{PLURAL:$1|'u \
cangiamende|le cangiaminde}} de l'utende $2 jndr' $3 {{PLURAL:$3|'u cangiamende|le \
cangiaminde}} de l'utende $4 ($5 {{PLURAL:$5|'u cangiamende|le cangiaminde}} apprisse \
'u scuagghiamende)", + 'usermerge-autopagedelete' => 'Automaticamende scangellate \
quanne onne state scuagghiate le utinde', + 'usermerge-page-unmoved' => "'A p gene \
$1 non ge pò essere spustate sus a $2.", + 'usermerge-page-moved' => "'A p gene $1 \
ha state spustete sus a $2.", + 'usermerge-move-log' => 'Automaticamende spustate \'a \
p gene quanne ha state scuagghiate l\'utende "[[User:$1|$1]]" jndr\' \
"[[User:$2|{{GENDER:$2|$2}}]]"', + 'usermerge-page-deleted' => 'P gene scangellate \
$1', +);
+
+/** Russian (русский)
+ * @author Askarmuk
* @author Ferrer
* @author Illusion
* @author Innv
+ * @author Ole Yves
* @author Александр Сигачёв
*/
$messages['ru'] = array(
@@ -1613,7 +2072,7 @@ $messages['ru'] = array(
'usermerge-badolduser' => 'Неправильное старое имя \
участника', 'usermerge-badnewuser' => 'Неправильное новое \
имя участника', 'usermerge-nonewuser' => 'Пустое новое имя \
участника — при слиянии с $1 .<br />
-Нажмите {{int:usermerge-submit}} , чтобы подтвердить \
действие.', +Нажмите {{int:usermerge-submit}} , чтобы \
подтвердить действие.', # Fuzzy 'usermerge-noolduser' => \
'Пустое старое имя участника', 'usermerge-fieldset' => \
'Учётные записи для объединения', 'usermerge-olduser' => \
'Старая учётная запись (объединить с):', @@ -1624,17 \
+2083,24 @@ $messages['ru'] = array( 'usermerge-userdeleted' => '$1 ($2) был \
удалён.', 'usermerge-userdeleted-log' => 'Удалён участник $2 \
($3)', 'usermerge-updating' => 'Обновление таблицы $1 ($2 из \
$3)',
- 'usermerge-success' => 'Объединение $1 ($2) с $3 ($4) \
выполнено.',
- 'usermerge-success-log' => 'Участник $2 ($3) объединён в $4 \
($5)', + 'usermerge-success' => 'Объединение $1 ($2) с $3 ($4) \
выполнено.', # Fuzzy + 'usermerge-success-log' => 'Участник $2 ($3) \
объединён в $4 ($5)', # Fuzzy 'usermerge-logpage' => 'Журнал \
объединения участников', 'usermerge-logpagetext' => 'Это \
журнал объединения учётных записей.', \
'usermerge-noselfdelete' => 'Вы не можете удалять или \
объединять себя самого!', 'usermerge-unmergable' => \
'Невозможно объединить участников — \
идентификатор или имя было определено как \
необъединяемое.', 'usermerge-protectedgroup' => 'Невозможно \
объединить участников — участник относится к \
защищённой группе.', 'right-usermerge' => 'объединение \
участников', + 'usermerge-editcount' => 'Добавить счётчик \
правок?', + 'usermerge-editcount-success' => 'Добавление \
счётчика правок ($1 и $2)', + 'usermerge-autopagedelete' => \
'Автоматически удаляются при объединении \
пользователей', + 'usermerge-page-unmoved' => 'Страница $1 не \
может быть переименована в $2.', + 'usermerge-page-moved' => \
'Страница $1 была переименована в $2.', \
+ 'usermerge-move-log' => 'Автоматически переименовано во \
время объединения учетной записи "[[User:$1|$1]]" с \
"[[User:$2|$2]]"', # Fuzzy + 'usermerge-page-deleted' => 'Удалить \
страницу $1', );
-/** Rusyn ( усиньскый)
+/** Rusyn (русиньскый)
* @author Gazeb
*/
$messages['rue'] = array(
@@ -1647,6 +2113,7 @@ $messages['rue'] = array(
/** Sinhala (සිංහල)
* @author Calcey
+ * @author පසිඳු කාවින්ද
*/
$messages['si'] = array(
'usermerge' => 'පරිශීලකයින් මුසු කිරීම \
හා මැකීම', @@ -1654,7 +2121,7 @@ $messages['si'] = array(
'usermerge-badolduser' => 'වලංගු නොවන පැරණි \
පරිශීලක නාමය', 'usermerge-badnewuser' => 'වලංගු \
නොවන නව පරිශීලක නාමය', 'usermerge-nonewuser' => \
'හිස් නව පරිශීලක නාමය - "$1" ට මුසු \
කිරීමට උපකල්පනය කරමින්.<br />
-පිළිගැනීමට "{{int:usermerge-submit}}" ක්ලික් \
කරන්න.', +පිළිගැනීමට "{{int:usermerge-submit}}" \
ක්ලික් කරන්න.', # Fuzzy 'usermerge-noolduser' => 'හිස් \
පැරණි පරිශීලක නාමය', 'usermerge-fieldset' => \
'මුසු කිරීමට නියමිත පරිශීලක \
නාමයන්', 'usermerge-olduser' => 'පැරණි පරිශීලක \
(මුසු කරන්නේ):', @@ -1665,17 +2132,22 @@ $messages['si'] = array(
'usermerge-userdeleted' => '$1 ($2) මකනු ලැබ ඇත.',
'usermerge-userdeleted-log' => 'මකනු ලැබූ පරිශීලක: $2 \
($3)', 'usermerge-updating' => '$1 වගුව යාවත්කාලීන \
කිරීම ($2 ,$3ට )',
- 'usermerge-success' => '$1 ($2) සිට $3 ($4) දක්වා මුසු \
කිරීම සම්පූර්ණ විය.',
- 'usermerge-success-log' => '$2 ($3) පරිශීලකයා $4 ($5) ට \
මුසු කරන ලදී', + 'usermerge-success' => '$1 ($2) සිට $3 \
($4) දක්වා මුසු කිරීම සම්පූර්ණ \
විය.', # Fuzzy + 'usermerge-success-log' => '$2 ($3) \
පරිශීලකයා $4 ($5) ට මුසු කරන ලදී', # Fuzzy \
'usermerge-logpage' => 'පරිශීලක මුසු කිරීම් \
ලඝු සටහන', 'usermerge-logpagetext' => 'මෙය පරිශීලක \
මුසු කිරීම් කාර්යයන්වල ලඝු \
සටහනකි.', 'usermerge-noselfdelete' => 'ඔබ විසින්ම \
මැකීම හෝ මුසු කිරීම සිදු කරනු \
ලැබිය නොහැකිය!', 'usermerge-unmergable' => \
'පරිශීලකයා මඟින් මුසු කළ \
නොහැකියි - ID හෝ නම හඳුන්වා දී \
තිබෙන්නේ මුසු කළ නොහැකි ලෙසයි.', \
'usermerge-protectedgroup' => 'පරිශිලකයා මඟින් \
මුසු කළ නොහැකියි - පරිශීලකයා \
සිටින්නේ ආරක්ෂිත කණ්ඩායමකය.', \
'right-usermerge' => 'පරිශීලකයින් මුසු \
කිරීම', + 'usermerge-editcount' => 'සංස්කරණ ගණනය \
එක් කරනවද?', + 'usermerge-editcount-success' => '($1 සහ $2) \
න් සංස්කරණ ගණනය එක් කරමින්', \
+ 'usermerge-page-unmoved' => '$1 පිටුව $2 වෙත ගෙනයා \
නොහැක.', + 'usermerge-page-moved' => '$1 පිටුව $2 වෙත \
ගෙනයන ලදි.', + 'usermerge-page-deleted' => '$1 මකාදැමූ \
පිටුව', );
-/** Slovak (Slovenčina)
+/** Slovak (slovenčina)
* @author Helix84
*/
$messages['sk'] = array(
@@ -1684,7 +2156,7 @@ $messages['sk'] = array(
'usermerge-badolduser' => 'Neplatné staré používateľské meno',
'usermerge-badnewuser' => 'Neplatné nové používateľské meno',
'usermerge-nonewuser' => 'Prázdne nové používateľské meno - predpokladá sa \
zlúčenie do „$1".<br />
-Kliknutím na „{{int:usermerge-submit}}" prijmete.',
+Kliknutím na „{{int:usermerge-submit}}" prijmete.', # Fuzzy
'usermerge-noolduser' => 'Prázdne staré používateľské meno',
'usermerge-fieldset' => 'Zlúčiť používateľov',
'usermerge-olduser' => 'Starý používateľ (zlúčiť odtiaľto)',
@@ -1695,8 +2167,8 @@ Kliknutím na „{{int:usermerge-submit}}" prijmete.',
'usermerge-userdeleted' => '$1($2) bol zmazaný.',
'usermerge-userdeleted-log' => 'Zmazaný používateľ: $2($3)',
'usermerge-updating' => 'Aktualizuje sa tabuľka $1 ($2 na $3)',
- 'usermerge-success' => 'Zlúčenie z $1($2) do $3($4) je dokončené.',
- 'usermerge-success-log' => 'Používateľ $2($3) bol zlúčený do $4($5)',
+ 'usermerge-success' => 'Zlúčenie z $1($2) do $3($4) je dokončené.', # Fuzzy
+ 'usermerge-success-log' => 'Používateľ $2($3) bol zlúčený do $4($5)', # Fuzzy
'usermerge-logpage' => 'Záznam zlúčení používateľov',
'usermerge-logpagetext' => 'Toto je záznam zlúčení používateľov.',
'usermerge-noselfdelete' => 'Nemôžete zmazať alebo zlúčiť svoj účet!',
@@ -1705,14 +2177,15 @@ Kliknutím na „{{int:usermerge-submit}}" prijmete.',
'right-usermerge' => 'Zlučovať používateľov',
);
-/** Slovenian (Slovenščina)
+/** Slovenian (slovenščina)
* @author Dbc334
*/
$messages['sl'] = array(
'usermerge' => 'Spoji in izbriši uporabnike',
+ 'usermerge-desc' => "[[Special:UserMerge|Združi sklice iz enega uporabnika na \
drugega]] v zbirki podatkov wikija – prav tako po združitvi izbriše stare \
uporabnika. Potrebuje pravico ''usermerge''", 'usermerge-badolduser' => 'Neveljavno \
staro uporabniško ime', 'usermerge-badnewuser' => 'Neveljavno novo uporabniško \
ime',
- 'usermerge-nonewuser' => 'Prazno novo uporabniško ime – predpostavljam \
združitev z $1 .<br /> + 'usermerge-nonewuser' => 'Prazno novo uporabniško ime. \
Predpostavljam združitev z {{GENDER:$1|$1}} .<br /> Kliknite \
{{int:usermerge-submit}} za sprejetje.', 'usermerge-noolduser' => 'Prazno staro \
uporabniško ime', 'usermerge-fieldset' => 'Uporabniška imena za spajanje',
@@ -1720,17 +2193,30 @@ Kliknite {{int:usermerge-submit}} za sprejetje.',
'usermerge-newuser' => 'Novi uporabnik (spoji do):',
'usermerge-deleteolduser' => 'Izbriši starega uporabnika',
'usermerge-submit' => 'Spoji uporabnika',
+ 'usermerge-badtoken' => 'Neveljavni žeton urejanja',
'usermerge-userdeleted' => '$1 ($2) je bil izbrisan.',
'usermerge-userdeleted-log' => 'Izbrisal(-a) uporabnika: $2 ($3)',
'usermerge-updating' => 'Posodabljanje tabele $1 ($2 v $3)',
- 'usermerge-success' => 'Združitev iz $1 ($2) v $3 ($4) je končana.',
- 'usermerge-success-log' => 'Uporabnik $2 ($3) je spojen z $4 ($5)',
+ 'usermerge-success' => 'Združitev iz $1 ($2) v {{GENDER:$3|$3}} ($4) je \
končana.', + 'usermerge-success-log' => 'Uporabnik $2 ($3) je spojen z \
{{GENDER:$4|$4}} ($5)', 'usermerge-logpage' => 'Dnevnik spajanja uporabnikov',
'usermerge-logpagetext' => 'To je dnevnik dejanj spajanja uporabnikov.',
+ 'usermerge-noselfdelete' => 'Ne morete izbrisati ali združevati sebe!',
+ 'usermerge-unmergable' => 'Ne morem združiti uporabnika – ID ali ime je \
opredeljeno kot nezdružljivo.', + 'usermerge-protectedgroup' => 'Ne morem združiti \
uporabnika – uporabnik je v zaščiteni skupini.', 'right-usermerge' => 'Spajanje \
uporabnikov',
-);
-
-/** Serbian Cyrillic ekavian (Српски (ћирилица))
+ 'action-usermerge' => 'spajanje uporabnikov',
+ 'usermerge-editcount-merge-success' => 'Dodajanje $1 \
{{PLURAL:$1|urejanje|urejanji|urejanja|urejanj}} uporabnika $2 k $3 \
{{PLURAL:$3|urejanju|urejanjema|urejanjem}} uporabnika $4 ($5 \
{{PLURAL:$5|urejanje|urejanji|urejanja|urejanj}} po združitvi)', \
+ 'usermerge-autopagedelete' => 'Samodejno izbrisano med združevanjem uporabnikov', \
+ 'usermerge-page-unmoved' => 'Strani $1 ni bilo mogoče prestaviti na $2.', \
+ 'usermerge-page-moved' => 'Stran $1 je bila prestavljena na $2.', \
+ 'usermerge-move-log' => 'Samodejno prestavljena stran med združevanjem uporabnika \
[[User:$1|$1]] z [[User:$2|{{GENDER:$2|$2}}]] ', + 'usermerge-page-deleted' => \
'Izbrisana stran $1', +);
+
+/** Serbian (Cyrillic script) (српски (ћирилица))
+ * @author Rancher
+ * @author Жељко Тодоровић
* @author Михајло Анђелковић
*/
$messages['sr-ec'] = array(
@@ -1746,17 +2232,18 @@ $messages['sr-ec'] = array(
'usermerge-userdeleted' => '$1 ($2) је обрисан.',
'usermerge-userdeleted-log' => 'Обрисан корисник: $2 ($3)',
'usermerge-updating' => 'Ажурирање $1 табеле ($2 на $3)',
- 'usermerge-success' => 'Спајање $1 ($2) са $3 ($4) је \
завршено.',
- 'usermerge-success-log' => 'Корисник $2 ($3) је спојен са $4 \
($5)', + 'usermerge-success' => 'Спајање $1 ($2) са $3 ($4) је \
завршено.', # Fuzzy + 'usermerge-success-log' => 'Корисник $2 ($3) \
је спојен са $4 ($5)', # Fuzzy 'usermerge-logpage' => 'Историја \
спајања корисника', 'usermerge-logpagetext' => 'Ово је \
историја спајања корисника.', 'usermerge-noselfdelete' => \
'Не можете да се обришете или спојите са другим \
налогом!', 'usermerge-protectedgroup' => 'Није могуђе \
спојити овог корисника са другим — налази се у \
заштићеној групи.',
- 'right-usermerge' => 'Споји кориснике',
+ 'right-usermerge' => 'спајање корисника',
);
-/** Serbian Latin ekavian (Srpski (latinica))
+/** Serbian (Latin script) (srpski (latinica))
* @author Michaello
+ * @author Rancher
*/
$messages['sr-el'] = array(
'usermerge' => 'Spaja i briše korisnike',
@@ -1771,13 +2258,13 @@ $messages['sr-el'] = array(
'usermerge-userdeleted' => '$1 ($2) je obrisan.',
'usermerge-userdeleted-log' => 'Obrisan korisnik: $2 ($3)',
'usermerge-updating' => 'Ažuriranje $1 tabele ($2 na $3)',
- 'usermerge-success' => 'Spajanje $1 ($2) sa $3 ($4) je završeno.',
- 'usermerge-success-log' => 'Korisnik $2 ($3) je spojen sa $4 ($5)',
+ 'usermerge-success' => 'Spajanje $1 ($2) sa $3 ($4) je završeno.', # Fuzzy
+ 'usermerge-success-log' => 'Korisnik $2 ($3) je spojen sa $4 ($5)', # Fuzzy
'usermerge-logpage' => 'Istorija spajanja korisnika',
'usermerge-logpagetext' => 'Ovo je istorija spajanja korisnika.',
'usermerge-noselfdelete' => 'Ne možete da se obrišete ili spojite sa drugim \
nalogom!', 'usermerge-protectedgroup' => 'Nije moguđe spojiti ovog korisnika sa \
drugim — nalazi se u zaštićenoj grupi.',
- 'right-usermerge' => 'Spoji korisnike',
+ 'right-usermerge' => 'spajanje korisnika',
);
/** Seeltersk (Seeltersk)
@@ -1789,7 +2276,7 @@ $messages['stq'] = array(
'usermerge-badolduser' => 'Uungultigen oolden Benutsernoome',
'usermerge-badnewuser' => 'Uungultigen näien Benutsernoome',
'usermerge-nonewuser' => 'Loosen näien Benutsernoome - der is ne Touhoopefierenge \
mäd „$1" fermoudjen.<br />
-Klik ap „{{int:usermerge-submit}}" toun Uutfieren.',
+Klik ap „{{int:usermerge-submit}}" toun Uutfieren.', # Fuzzy
'usermerge-noolduser' => 'Loosen oolden Benutsernoome',
'usermerge-olduser' => 'Oolden Benutsernoome (touhoopefieren fon):',
'usermerge-newuser' => 'Näien Benutsernoome (touhoopefieren ätter):',
@@ -1799,13 +2286,13 @@ Klik ap „{{int:usermerge-submit}}" toun Uutfieren.',
'usermerge-userdeleted' => '„$1" ($2) wuud läsked.',
'usermerge-userdeleted-log' => 'Läskeden Benutsernoome: „$2" ($3)',
'usermerge-updating' => 'Aktualisierenge $1 Tabelle ($2 ätter $3)',
- 'usermerge-success' => 'Ju Touhoopefierenge fon „$1" ($2) ätter „$3" ($4) is \
fulboodich.',
- 'usermerge-success-log' => 'Benutsernoome „$2" ($3) touhoopefierd mäd „$4" \
($5)', + 'usermerge-success' => 'Ju Touhoopefierenge fon „$1" ($2) ätter „$3" \
($4) is fulboodich.', # Fuzzy + 'usermerge-success-log' => 'Benutsernoome „$2" ($3) \
touhoopefierd mäd „$4" ($5)', # Fuzzy 'usermerge-logpage' => \
'Benutserkonten-Touhoopefierenge-Logbouk', 'usermerge-logpagetext' => 'Dit is dät \
Logbouk fon do Benutserkonten-Touhoopefierengen.', 'usermerge-noselfdelete' => \
'Touhoopefierenge mäd aan sälwen is nit muugelk!', 'usermerge-unmergable' => \
'Touhoopefierenge nit muugelk - ID of Benutsernoome wuud as nit touhoopefierboar \
definierd.',
- 'usermerge-protectedgroup' => 'Touhoopefierenge nit muugelk - Benutsernoome is in \
ne schutsede Gruppe.', + 'usermerge-protectedgroup' => 'Touhoopefierenge nit muugelk \
- Benutsernoome is in ne skutsede Gruppe.', 'right-usermerge' => 'Benutserkonten \
fereenje', );
@@ -1816,17 +2303,21 @@ $messages['su'] = array(
'usermerge-desc' => "Ngagabungkeun Préférénsi ti hiji pamaké ka pamaké séjén \
dina pangkalan data wiki - ogé baris ngahapus pamaké lila sadeui Ngagabungkeun. \
diperlukeun hak aksés ''usermerge''", );
-/** Swedish (Svenska)
+/** Swedish (svenska)
* @author Lejonel
+ * @author Lokal Profil
+ * @author Martinwiss
* @author Micke
* @author Sannab
+ * @author WikiPhoenix
*/
$messages['sv'] = array(
'usermerge' => 'Slå ihop och radera användarkonton',
'usermerge-desc' => "Ger möjlighet att [[Special:UserMerge|slå samman \
användarkonton]] genom att alla referenser till en användare byts ut till en annan \
användare i databasen, samt att efter sammanslagning radera gamla konton. Kräver \
behörigheten ''usermerge''.", 'usermerge-badolduser' => 'Ogiltigt gammalt \
användarnamn', 'usermerge-badnewuser' => 'Ogiltigt nytt användarnamn',
- 'usermerge-nonewuser' => 'Nytt användarnamn tomt. Antar sammanslagning till $1.<br \
/>Klicka på "{{int:usermerge-submit}}" för att godkänna.', + 'usermerge-nonewuser' \
=> 'Tomt nytt användarnamn. Antar sammanslagning till "{{GENDER:$1|$1}}".<br /> \
+Klicka på "{{int:usermerge-submit}}" för att godkänna.', 'usermerge-noolduser' \
=> 'Gammalt användarnamn tomt', 'usermerge-fieldset' => 'Användarnamn att \
förena', 'usermerge-olduser' => 'Gammalt användarnamn (slå ihop från)',
@@ -1837,17 +2328,25 @@ $messages['sv'] = array(
'usermerge-userdeleted' => '$1 ($2) har raderats.',
'usermerge-userdeleted-log' => 'Raderad användare: $2 ($3)',
'usermerge-updating' => 'Uppdaterar $1-tabell ($2 till $3)',
- 'usermerge-success' => 'Sammanslagning från $1 ($2) till $3 ($4) är genomförd.',
- 'usermerge-success-log' => 'Användare $2 ($3) sammanslagen med $4 ($5)',
+ 'usermerge-success' => 'Sammanslagning från $1 ($2) till {{GENDER:$3|$3}} ($4) är \
slutfört.', + 'usermerge-success-log' => 'Användare $2 ($3) slogs samman med \
{{GENDER:$4|$4}} ($5)', 'usermerge-logpage' => 'Användarsammanslagningslogg',
'usermerge-logpagetext' => 'Det här är en logg över sammanslagningar av \
användarkonton.', 'usermerge-noselfdelete' => 'Du kan inte radera eller slå samman \
ditt eget konto!', 'usermerge-unmergable' => 'Kan inte sammanfoga det gamla kontot. \
ID:t eller namnet har angetts som icke-sammanslagningsbart.', \
'usermerge-protectedgroup' => 'Kan inte sammanfoga det gamla kontot. Användaren är \
medlem i en skyddad användargrupp.', 'right-usermerge' => 'Slå ihop \
användarkonton', + 'action-usermerge' => 'slå ihop användarkonton',
+ 'usermerge-editcount' => 'Lägg till antal redigeringar',
+ 'usermerge-editcount-success' => 'Lägger till antalet redigeringar för ($1 och \
$2)', + 'usermerge-autopagedelete' => 'Ta bort automatiskt när användare slås \
ihop', + 'usermerge-page-unmoved' => 'Sidan $1 kan inte tas bort till $2',
+ 'usermerge-page-moved' => 'Sidan $1 måste tas bort till $2',
+ 'usermerge-move-log' => 'Ta automatiskt bort sidan när du slår ihop användare \
"[[User:$1|$1]]" med "[[User:$2|{{GENDER:$2|$2}}]]"', + 'usermerge-page-deleted' => \
'Tog bort sidan $1', );
-/** Silesian (Ślůnski)
+/** Silesian (ślůnski)
* @author Lajsikonik
*/
$messages['szl'] = array(
@@ -1855,18 +2354,18 @@ $messages['szl'] = array(
'usermerge-desc' => "[[Special:UserMerge|Kupluje odwołańo lů jednygo \
użytkowńika do drugigo]] we baźe danych wiki – wyćepuje tyż starygo \
użytkowńika po skuplowańu. Wymogo uprowńyńo ''usermerge''", \
'usermerge-badolduser' => 'Felerne stare mjano użytkowńika', \
'usermerge-badnewuser' => 'Felerne nowe mjano użytkowńika',
- 'usermerge-nonewuser' => 'Puste mjano nowygo użytkowńika – przyjynto, aże \
nastůmpi integracyjo do $1. <br />Naciś <u>Kupluj użytkowńikůw</u>, coby \
zaakceptować.', + 'usermerge-nonewuser' => 'Puste mjano nowygo użytkowńika – \
przyjynto, aże nastůmpi integracyjo do $1. <br />Naciś "{{int:usermerge-submit}}", \
coby zaakceptować.', # Fuzzy 'usermerge-noolduser' => 'Puste stare mjano \
użytkowńika',
- 'usermerge-olduser' => 'Stary użytkowńik (kupluj uod)',
- 'usermerge-newuser' => 'Nowy użytkowńik (kupluj s)',
- 'usermerge-deleteolduser' => 'Wyćepać starygo użytkowńika?',
+ 'usermerge-olduser' => 'Stary użytkowńik (kupluj uod)', # Fuzzy
+ 'usermerge-newuser' => 'Nowy użytkowńik (kupluj s)', # Fuzzy
+ 'usermerge-deleteolduser' => 'Wyćepać starygo użytkowńika?', # Fuzzy
'usermerge-submit' => 'Kupluj użytkowńikůw',
'usermerge-badtoken' => 'Ńyprowidłowy żetůn sprowjyńo',
'usermerge-userdeleted' => '$1 ($2) zostoł wyćepany.',
'usermerge-userdeleted-log' => 'wyćepoł użytkowńika „$2" ($3)',
'usermerge-updating' => 'Uodśwjeżańy tabuli $1 ($2 do $3)',
- 'usermerge-success' => 'Kuplowańy $1 ($2) s $3 ($4) zakończůne.',
- 'usermerge-success-log' => 'skuplowoł użytkowńika „$2" ($3) do „$4" ($5)',
+ 'usermerge-success' => 'Kuplowańy $1 ($2) s $3 ($4) zakończůne.', # Fuzzy
+ 'usermerge-success-log' => 'skuplowoł użytkowńika „$2" ($3) do „$4" ($5)', # \
Fuzzy 'usermerge-logpage' => 'Rejer kuplowańo użytkowńików',
'usermerge-logpagetext' => 'To je rejer uoperacyji kuplowańo użytkowńikůw.',
'usermerge-noselfdelete' => 'Ńy idźe wyćepać abo kuplować samygo śebje!',
@@ -1875,6 +2374,15 @@ $messages['szl'] = array(
'right-usermerge' => 'Kuplowańy użytkowńikůw',
);
+/** Tamil (தமிழ்)
+ * @author மதனாஹரன்
+ */
+$messages['ta'] = array(
+ 'usermerge-noolduser' => 'பழம்பயனர் பெயரைக் \
காலியாக்கு', + 'usermerge-deleteolduser' => \
'பழம்பயனரை அழி', + 'right-usermerge' => \
'பயனர்களை ஒருங்கிணை', +);
+
/** Telugu (తెలుగు)
* @author Veeven
*/
@@ -1891,15 +2399,16 @@ $messages['te'] = array(
'usermerge-userdeleted' => '$1 ($2)ని తొలగించాం.',
'usermerge-userdeleted-log' => 'వాడుకరిని \
తొలగించాం: $2 ($3)', 'usermerge-updating' => '$1 \
పట్టిక ($2 నుండి $3 వరకు) ని \
తాజాకరిస్తున్నాం',
- 'usermerge-success' => '$1 ($2) నుండి $3 ($4) కి విలీనం \
పూర్తయ్యింది.',
- 'usermerge-success-log' => '$2 ($3) వాడుకరి $4 ($5)లో \
విలీనమయ్యారు', + 'usermerge-success' => '$1 ($2) \
నుండి $3 ($4) కి విలీనం \
పూర్తయ్యింది.', # Fuzzy + 'usermerge-success-log' => '$2 ($3) \
వాడుకరి $4 ($5)లో విలీనమయ్యారు', # Fuzzy \
'usermerge-logpage' => 'వాడుకరి విలీనాల \
చిట్టా', 'usermerge-logpagetext' => 'ఇది వాడుకరి \
విలీనాల చిట్టా.', 'usermerge-noselfdelete' => \
'మిమ్మల్ని మీరే తొలగించుకోలేరు \
లేదా మీలో విలీనం కాలేరు!', 'right-usermerge' \
=> 'వాడుకరులను విలీనం చేయగలగడం', \
+ 'usermerge-move-log' => '"[[User:$1|$1]]" పేరును "[[User:$2|$2]]"కు \
మార్చేప్పుడు పేజీని \
ఆటోమాటిగ్గా తరలించాం', # Fuzzy );
-/** Tajik (Cyrillic) (Тоҷикӣ (Cyrillic))
+/** Tajik (Cyrillic script) (тоҷикӣ)
* @author Ibrahim
*/
$messages['tg-cyrl'] = array(
@@ -1907,16 +2416,16 @@ $messages['tg-cyrl'] = array(
'usermerge-badolduser' => 'Номи корбарии кӯҳнаи \
номӯътабар', 'usermerge-badnewuser' => 'Номи корбарии \
ҷадидӣ номӯътабар', 'usermerge-noolduser' => 'Холӣ \
кардани номи корбарии кӯҳна',
- 'usermerge-olduser' => 'Корбари кӯҳна (идғом аз)',
- 'usermerge-newuser' => 'Корбари ҷадид (идғом ба)',
- 'usermerge-deleteolduser' => 'Корбари кӯҳна ҳазв шавад?',
+ 'usermerge-olduser' => 'Корбари кӯҳна (идғом аз)', # Fuzzy
+ 'usermerge-newuser' => 'Корбари ҷадид (идғом ба)', # Fuzzy
+ 'usermerge-deleteolduser' => 'Корбари кӯҳна ҳазв шавад?', # \
Fuzzy 'usermerge-submit' => 'Идғоми корбар',
'usermerge-userdeleted-log' => 'Корбари ҳазфшуда: $2 ($3)',
'usermerge-logpage' => 'Гузориши идғоми корбар',
'usermerge-logpagetext' => 'Ин гузориши амалҳои идғоми \
корбар аст.', );
-/** Tajik (Latin) (Тоҷикӣ (Latin))
+/** Tajik (Latin script) (tojikī)
* @author Liangent
*/
$messages['tg-latn'] = array(
@@ -1946,7 +2455,7 @@ $messages['tl'] = array(
'usermerge-badolduser' => 'Hindi tanggap na lumang pangalan ng tagagamit',
'usermerge-badnewuser' => 'Hindi tanggap na bagong pangalan ng tagagamit',
'usermerge-nonewuser' => 'Tanggalan ng laman ang bagong pangalan ng tagagamit - \
ipinapalagay na isasanib sa $1.<br />
-Pindutin ang "{{int:usermerge-submit}}" upang tanggapin.',
+Pindutin ang "{{int:usermerge-submit}}" upang tanggapin.', # Fuzzy
'usermerge-noolduser' => 'Tanggalan ng laman ang lumang pangalan ng tagagamit',
'usermerge-fieldset' => 'Mga pangalan ng tagagamit na pagsasanibin',
'usermerge-olduser' => 'Lumang tagagamit (isanib mula sa):',
@@ -1957,14 +2466,21 @@ Pindutin ang "{{int:usermerge-submit}}" upang tanggapin.',
'usermerge-userdeleted' => 'Nabura na ang $1 ($2).',
'usermerge-userdeleted-log' => 'Binurang tagagamit: $2 ($3)',
'usermerge-updating' => 'Isinasapanahon ang $1 na tabla ($2 hanggang $3)',
- 'usermerge-success' => 'Ganap na ang pagsanib mula sa $1 ($2) patungo sa $3 ($4).',
- 'usermerge-success-log' => 'Tagagamit na $2 ($3) isinanib sa $4 ($5)',
+ 'usermerge-success' => 'Ganap na ang pagsanib mula sa $1 ($2) patungo sa $3 ($4).', \
# Fuzzy + 'usermerge-success-log' => 'Tagagamit na $2 ($3) isinanib sa $4 ($5)', # \
Fuzzy 'usermerge-logpage' => 'Talaan ng pagsasanib ng tagagamit',
'usermerge-logpagetext' => 'Isa itong talaan ng mga galaw na pangpagsasanib ng \
tagagamit.', 'usermerge-noselfdelete' => 'Hindi ka maaaring magbura o sumanib mula \
sa sarili mo!', 'usermerge-unmergable' => 'Hindi naisanib mula sa tagagamit - \
nilarawan ang ID o pangalan bilang hindi mapagsasanib.', 'usermerge-protectedgroup' \
=> 'Hindi naisanib mula sa tagagamit - nasa loob ng isang nakasanggalang na pangkat \
ang tagagamit.', 'right-usermerge' => 'Pagsanibin ang mga tagagamit',
+ 'usermerge-editcount' => 'Idagdag ang bilang ng pagpatnugot?',
+ 'usermerge-editcount-success' => 'Idinaragdag ang bilang ng pagpatnugot ng ($1 at \
$2)', + 'usermerge-autopagedelete' => 'Kusang nabubura kapag pinagsasanib ang mga \
tagagamit', + 'usermerge-page-unmoved' => 'Hindi mailipat ang pahinang $1 papunta sa \
$2.', + 'usermerge-page-moved' => 'Ang pahinang $1 ay nailipat papunta sa $2.',
+ 'usermerge-move-log' => 'Kusang inilipat ang pahina habang pinagsasanib ang \
tagagamit na si "[[User:$1|$1]]" papunta sa "[[User:$2|$2]]"', # Fuzzy \
+ 'usermerge-page-deleted' => 'Binura ang pahinang $1', );
/** Turkish (Türkçe)
@@ -1978,7 +2494,7 @@ $messages['tr'] = array(
'usermerge-badolduser' => 'Geçersiz eski kullanıcı adı',
'usermerge-badnewuser' => 'Geçersiz yeni kullanıcı',
'usermerge-nonewuser' => 'Yeni boş kullanıcıadı - "$1" ile birleştirme \
varsayılıyor.<br />
-Kabul etmek için "{{int:usermerge-submit}}"e tıklayın.',
+Kabul etmek için "{{int:usermerge-submit}}"e tıklayın.', # Fuzzy
'usermerge-noolduser' => 'Boş eski kullanıcı adı',
'usermerge-fieldset' => 'Birleştirilecek kullanıcı adları',
'usermerge-olduser' => 'Eski kullanıcı (dan birleştir):',
@@ -1989,8 +2505,8 @@ Kabul etmek için "{{int:usermerge-submit}}"e tıklayın.',
'usermerge-userdeleted' => '$1 ($2) silindi.',
'usermerge-userdeleted-log' => 'Silinen kullanıcı: $2 ($3)',
'usermerge-updating' => '$1 tablosu ($2 den $3 e) güncelleniyor',
- 'usermerge-success' => '$1 ($2) kullanıcısından $3 ($4) kullanıcısına \
birleştirme tamamlandı.',
- 'usermerge-success-log' => '$2 ($3) kullanıcısı $4 ($5) kullanıcısına \
birleştirildi', + 'usermerge-success' => '$1 ($2) kullanıcısından $3 ($4) \
kullanıcısına birleştirme tamamlandı.', # Fuzzy + 'usermerge-success-log' => '$2 \
($3) kullanıcısı $4 ($5) kullanıcısına birleştirildi', # Fuzzy \
'usermerge-logpage' => 'Kullanıcı birleştirme günlüğü', \
'usermerge-logpagetext' => 'Bu bir kullanıcı birleştirme eylemleri \
günlüğüdür.', 'usermerge-noselfdelete' => 'Kendinizden birleştiremez ya da \
silemezsiniz!', @@ -1999,15 +2515,25 @@ Kabul etmek için "{{int:usermerge-submit}}"e \
tıklayın.', 'right-usermerge' => 'Kullanıcıları birleştir',
);
-/** Ukrainian (Українська)
+/** Uyghur (Arabic script) (ئۇيغۇرچە)
+ * @author Sahran
+ */
+$messages['ug-arab'] = array(
+ 'usermerge-page-unmoved' => '$1 بەتنى $2 گە يۆتكىيەلمىدى.',
+ 'usermerge-page-moved' => '$1 بەت $2 گە يۆتكەلدى.',
+);
+
+/** Ukrainian (українська)
* @author Ahonc
+ * @author Steve.rusyn
+ * @author Ата
*/
$messages['uk'] = array(
'usermerge' => "Об'єднання і вилучення облікових \
записів", 'usermerge-desc' => "[[Special:UserMerge|Переводить \
зв'язки з одного користувача на іншого]] у базі \
даних вікі, старі користувачі будуть \
вилучатися. Вимагає прав ''usermerge''", 'usermerge-badolduser' \
=> "Неправильне старе ім'я користувача", \
'usermerge-badnewuser' => "Неправильне нове ім'я \
користувача",
- 'usermerge-nonewuser' => "Порожнє ім'я користувача — при \
злитті з $1 .<br /> + 'usermerge-nonewuser' => "Порожнє ім'я \
користувача. Припускається злиття з {{GENDER:$1|$1}} \
.<br /> Натисніть {{int:usermerge-submit}} , щоб \
підтвердити дію.", 'usermerge-noolduser' => "Порожнє старе \
ім'я користувача", 'usermerge-fieldset' => "Облікові \
записи для об'єднання", @@ -2019,17 +2545,36 @@ $messages['uk'] = \
array( 'usermerge-userdeleted' => '$1 ($2) був вилучений.',
'usermerge-userdeleted-log' => 'Вилучений користувач: $2 ($3)',
'usermerge-updating' => 'Оновлення таблиці $1 ($2 з $3)',
- 'usermerge-success' => "Об'єднання $1 ($2) з $3 ($4) виконане.",
- 'usermerge-success-log' => 'Користувач $2 ($3) приєднаний до \
$4 ($5)', + 'usermerge-success' => "Об'єднання $1 ($2) з {{GENDER:$3|$3}} \
($4) виконане.", + 'usermerge-success-log' => 'Користувач $2 ($3) \
приєднаний до {{GENDER:$4|$4}} ($5)', 'usermerge-logpage' => \
"Журнал об'єднання користувачів", 'usermerge-logpagetext' \
=> "Це журнал об'єднання облікових записів.", \
'usermerge-noselfdelete' => 'Ви не можете вилучати або \
приєднувати самого себе!', 'usermerge-unmergable' => \
"Неможливо об'єднати користувачів — \
ідентифікатор або ім'я було визначене як \
необ'єднуване.", 'usermerge-protectedgroup' => "Неможливо \
об'єднати користувачів — користувач належить \
до захищеної групи.", 'right-usermerge' => "об'єднання \
користувачів", + 'action-usermerge' => "об'єднування \
користувачів", + 'usermerge-editcount' => 'Додати \
лічильник редагувань?', + 'usermerge-editcount-success' => \
'Додавання лічильника редагувань ($1 і $2)', \
+ 'usermerge-autopagedelete' => "Автоматично видаляються при \
об'єднанні користувачів", + 'usermerge-page-unmoved' => \
'Сторінка $1 не може бути перейменована на $2.', \
+ 'usermerge-page-moved' => 'Сторінка $1 була перейменована \
на $2.', + 'usermerge-move-log' => "Автоматичне \
перейменування сторінки при об'єднанні \
користувача [[User:$1|$1]] з [[User:$2|{{GENDER:$2|$2}}]] ", \
+ 'usermerge-page-deleted' => 'Сторінку $1 вилучено', +);
+
+/** Uzbek (oʻzbekcha)
+ * @author CoderSI
+ * @author Sociologist
+ */
+$messages['uz'] = array(
+ 'usermerge-userdeleted-log' => 'Foydalanuvchi $2 ($3) chetlatilgan',
+ 'usermerge-success-log' => 'Foydalanuvchi $2 ($3) {{GENDER:$4|$4}} ($5) bilan \
birlashtirilgan', + 'usermerge-logpage' => 'Ishtirokchilarni birlashtirish qaydlari',
+ 'usermerge-page-deleted' => '$1 sahifasini oʻchirish',
);
-/** Veps (Vepsan kel')
+/** Veps (vepsän kel')
* @author Игорь Бродский
*/
$messages['vep'] = array(
@@ -2040,14 +2585,15 @@ $messages['vep'] = array(
);
/** Vietnamese (Tiếng Việt)
+ * @author Minh Nguyen
* @author Vinhtantran
*/
$messages['vi'] = array(
'usermerge' => 'Trộn v xóa th nh viên',
- 'usermerge-desc' => "[[Special:UserMerge|Trộn các tham chiếu từ th nh viên \
n y sang một th nh viên khác]] trong cơ sở dữ liệu wiki - đồng thời \
xóa th nh viên cũ sau khi trộn. Cần phải có quyền ''usermerge''", \
+ 'usermerge-desc' => "[[Special:UserMerge|Trộn các tham chiếu từ th nh viên \
n y sang một th nh viên khác]] trong cơ sở dữ liệu wiki – đồng \
thời xóa th nh viên cũ sau khi trộn. Cần phải có quyền ''usermerge''", \
'usermerge-badolduser' => 'Tên th nh viên cũ không hợp lệ', \
'usermerge-badnewuser' => 'Tên th nh viên mới không hợp \
lệ',
- 'usermerge-nonewuser' => 'Tên th nh viên mới đã để trống - xem như \
trộn với "$1".<br /> + 'usermerge-nonewuser' => 'Tên th nh viên mới đã \
để trống. Có lẽ nên trộn với với "$1".<br /> Nhấn \
"{{int:usermerge-submit}}" để chấp nhận.', 'usermerge-noolduser' => 'Tên th \
nh viên cũ trống', 'usermerge-fieldset' => 'Các tên th nh viên sẽ trộn',
@@ -2064,9 +2610,16 @@ Nhấn "{{int:usermerge-submit}}" để chấp nhận.',
'usermerge-logpage' => 'Nhật trình trộn th nh viên',
'usermerge-logpagetext' => 'Đây l nhật trình ghi lại các tác vụ trộn \
th nh viên.', 'usermerge-noselfdelete' => 'Bạn không thể xóa hoặc trộn \
từ chính bạn!',
- 'usermerge-unmergable' => 'Không thể trộn từ th nh viên n y - mã số \
hoặc tên đã được định nghĩa l không thể trộn.',
- 'usermerge-protectedgroup' => 'Không thể trộn từ th nh viên n y - th nh \
viên n y thuộc nhóm được bảo vệ.', + 'usermerge-unmergable' => 'Không \
thể trộn từ th nh viên n y: mã số hoặc tên đã được định \
nghĩa l không thể trộn.', + 'usermerge-protectedgroup' => 'Không thể \
trộn từ th nh viên n y: th nh viên n y thuộc nhóm được bảo vệ.', \
'right-usermerge' => 'Trộn th nh viên', + 'action-usermerge' => 'trộn người \
dùng', + 'usermerge-editcount-merge-success' => 'Đang thêm $1 sửa đổi của \
người dùng $2 v o $3 sửa đổi của người dùng $4 (tổng cộng $5 \
sửa đổi sau khi trộn xong)', + 'usermerge-autopagedelete' => 'Được tự \
động xóa khi trộn người dùng', + 'usermerge-page-unmoved' => 'Trang $1 \
không thể di chuyển đến $2.', + 'usermerge-page-moved' => 'Trang $1 đã \
được di chuyển đến $2.', + 'usermerge-move-log' => 'Đã tự động di \
chuyển trang khi trộn th nh viên "[[User:$1|$1]]" v o "[[User:$2|$2]]"', \
+ 'usermerge-page-deleted' => 'Đã xóa trang $1', );
/** Volapük (Volapük)
@@ -2082,34 +2635,40 @@ $messages['vo'] = array(
'usermerge-userdeleted-log' => 'Moükön gebani: $2 ($3)',
);
-/** Cantonese (粵語) */
+/** Cantonese (粵語)
+ */
$messages['yue'] = array(
'usermerge' => '用戶合併同刪除',
'usermerge-badolduser' => '無效嘅舊用戶名',
'usermerge-badnewuser' => '無效嘅新用戶名',
- 'usermerge-nonewuser' => '清除新用戶名 - 假設合併到$1。<br \
/>撳<u>合併用戶</u>去接受。', + 'usermerge-nonewuser' => '清除新用戶名 \
- 假設合併到$1。<br />撳<em>{{int:usermerge-submit}}</em>去接受。', # \
Fuzzy 'usermerge-noolduser' => '清除舊用戶名',
- 'usermerge-olduser' => '舊用戶 (合併自)',
- 'usermerge-newuser' => '新用戶 (合併到)',
- 'usermerge-deleteolduser' => '刪舊用戶？',
+ 'usermerge-olduser' => '舊用戶 (合併自)', # Fuzzy
+ 'usermerge-newuser' => '新用戶 (合併到)', # Fuzzy
+ 'usermerge-deleteolduser' => '刪舊用戶？', # Fuzzy
'usermerge-submit' => '合併用戶',
'usermerge-badtoken' => '無效嘅編輯幣',
'usermerge-userdeleted' => '$1($2) 已經刪除咗。',
'usermerge-updating' => '更新緊 $1 表 ($2 到 $3)',
- 'usermerge-success' => '由 $1($2) 到 $3($4) 嘅合併已經完成。',
+ 'usermerge-success' => '由 $1($2) 到 $3($4) 嘅合併已經完成。', # Fuzzy
);
-/** Simplified Chinese (中文(简体))
+/** Simplified Chinese (中文（简体）)
+ * @author Dimension
* @author Gaoxuewei
* @author Gzdavidwong
* @author Liangent
+ * @author Yfdyh000
+ * @author 乌拉跨氪
*/
$messages['zh-hans'] = array(
'usermerge' => '用户合并和 除',
+ 'usermerge-desc' => \
"将在wiki数据库中[[Special:UserMerge|合并一个用户到另一个用户]] - \
合并后 除旧用户。需要''usermerge''权限", 'usermerge-badolduser' => ' \
效的旧用户名', 'usermerge-badnewuser' => ' 效的新用户名',
- 'usermerge-nonewuser' => '清除新用户名 - 假设合并到$1。<br \
/>点击<u>合并用户</u>以接受。', + 'usermerge-nonewuser' => \
'清除新用户名 - 假设合并到$1。<br \
/>点击<em>{{int:usermerge-submit}}</em>以接受。', # Fuzzy \
'usermerge-noolduser' => '清除旧用户名', + 'usermerge-fieldset' => \
'使用者名称合并', 'usermerge-olduser' => '旧用户（合并自）：',
'usermerge-newuser' => '新用户（合并到）：',
'usermerge-deleteolduser' => ' 除旧用户',
@@ -2118,26 +2677,36 @@ $messages['zh-hans'] = array(
'usermerge-userdeleted' => '$1（$2） 已 除。',
'usermerge-userdeleted-log' => '已 除的用户： $2 （$3）',
'usermerge-updating' => '正在更新 $1 表 （$2 到 $3）',
- 'usermerge-success' => '由 $1（$2） 到 $3（$4） 的合并已经完成。',
- 'usermerge-success-log' => '用户 $2 （$3） 合并到 $4 （$5）',
+ 'usermerge-success' => '由 $1（$2） 到 $3（$4） 的合并已经完成。', # \
Fuzzy + 'usermerge-success-log' => '用户 $2 （$3） 合并到 $4 （$5）', # \
Fuzzy 'usermerge-logpage' => '用户合并日志',
'usermerge-logpagetext' => '这是一份用户合并动作的记录。',
'usermerge-noselfdelete' => '您不能将自己 除或者合并！',
'usermerge-unmergable' => ' 法完成用户合并 - ID或者名称被 \
记为不可合并。', 'usermerge-protectedgroup' => ' 法完成用户合并 - \
用户位于受保护组中。', 'right-usermerge' => '合并用户',
+ 'action-usermerge' => '合并用户',
+ 'usermerge-editcount' => '添 编辑计数吗？',
+ 'usermerge-editcount-success' => '添 $1 和 $2 的编辑计数吗',
+ 'usermerge-autopagedelete' => '合并用户时自动 除',
+ 'usermerge-page-unmoved' => '页面$1 法被移动到$2。',
+ 'usermerge-page-moved' => '页面$1已被移动到$2。',
+ 'usermerge-move-log' => \
'合并用户"[[User:$1|$1]]"到"[[User:$2|{{GENDER:$2|$2}}]]"时自动移动页面', \
+ 'usermerge-page-deleted' => '页面$1已 除', );
-/** Traditional Chinese (中文(繁體))
+/** Traditional Chinese (中文（繁體）)
* @author Liangent
+ * @author Mark85296341
* @author Wrightbus
*/
$messages['zh-hant'] = array(
'usermerge' => '用戶合併和刪除',
'usermerge-badolduser' => '無效的舊用戶名',
'usermerge-badnewuser' => '無效的新用戶名',
- 'usermerge-nonewuser' => '清除新用戶名 - 假設合併到$1。<br \
/>點擊<u>合併用戶</u>以接受。', + 'usermerge-nonewuser' => \
'清除新用戶名 - 假設合併到$1。<br \
/>點擊<em>{{int:usermerge-submit}}</em>以接受。', # Fuzzy \
'usermerge-noolduser' => '清除舊用戶名', + 'usermerge-fieldset' => \
'使用者名稱合併', 'usermerge-olduser' => '舊用戶（合併自）：',
'usermerge-newuser' => '新用戶（合併到）：',
'usermerge-deleteolduser' => '刪除舊用戶',
@@ -2146,13 +2715,13 @@ $messages['zh-hant'] = array(
'usermerge-userdeleted' => '$1（$2） 已刪除。',
'usermerge-userdeleted-log' => '已刪除的用戶： $2 （$3）',
'usermerge-updating' => '正在更新 $1 表 （$2 到 $3）',
- 'usermerge-success' => '由 $1（$2） 到 $3（$4） 的合併已經完成。',
- 'usermerge-success-log' => '用戶 $2 （$3） 合併到 $4 （$5）',
+ 'usermerge-success' => '由 $1（$2） 到 $3（$4） 的合併已經完成。', # \
Fuzzy + 'usermerge-success-log' => '用戶 $2 （$3） 合併到 $4 （$5）', # \
Fuzzy 'usermerge-logpage' => '使用者合併記錄',
'usermerge-logpagetext' => '這是一份用戶合併動作的記錄。',
'usermerge-noselfdelete' => '您不能將自己刪除或者合併！',
- 'usermerge-unmergable' => '無法完成用戶合併 - \
ID或者名稱被標記為不可合併。',
- 'usermerge-protectedgroup' => '無法完成用戶合併 - \
用戶位於受保護組中。', + 'usermerge-unmergable' => \
'無法完成用戶合併 - ID 或者名稱被標記為不可合併。', \
+ 'usermerge-protectedgroup' => '無法完成用戶合併 - \
用戶位於受保護群組中。', 'right-usermerge' => '合併使用者',
);
@@ -2164,4 +2733,3 @@ $messages['zh-tw'] = array(
'usermerge-badolduser' => '無效的舊用戶名',
'usermerge-badnewuser' => '無效的新用戶名',
);
-
diff --git a/extensions/UserMerge/UserMerge.php b/extensions/UserMerge/UserMerge.php
old mode 100755
new mode 100644
index 6037d69..d0c20d2
--- a/extensions/UserMerge/UserMerge.php
+++ b/extensions/UserMerge/UserMerge.php
@@ -1,31 +1,53 @@
<?php
/** \file
-* \brief Contains setup code for the User Merge and Delete Extension.
-*/
+ * \brief Contains setup code for the User Merge and Delete Extension.
+ */
+
+/**
+ * UserMerge Extension for MediaWiki
+ *
+ * Copyright (C) Tim Laqua
+ * Copyright (C) Thomas Gries
+ * Copyright (C) Matthew April
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ */
# Not a valid entry point, skip unless MEDIAWIKI is defined
-if (!defined('MEDIAWIKI')) {
- echo "User Merge and Delete extension";
- exit(1);
+if ( !defined( 'MEDIAWIKI' ) ) {
+ die( 'This file is a MediaWiki extension, it is not a valid entry point' );
}
$wgExtensionCredits['specialpage'][] = array(
'path' => __FILE__,
'name' => 'User Merge and Delete',
- 'url' => \
'http://www.mediawiki.org/wiki/Extension:User_Merge_and_Delete',
- 'author' => 'Tim Laqua',
+ 'url' => \
'https://www.mediawiki.org/wiki/Extension:User_Merge_and_Delete', + 'author' \
=> array( 'Tim Laqua', 'Thomas Gries', 'Matthew April' ), 'descriptionmsg' => \
'usermerge-desc',
- 'version' => '1.6.1'
+ 'version' => '1.8.1'
);
$wgAvailableRights[] = 'usermerge';
# $wgGroupPermissions['bureaucrat']['usermerge'] = true;
-$dir = dirname(__FILE__) . '/';
+$dir = __DIR__ . '/';
$wgAutoloadClasses['UserMerge'] = $dir . 'UserMerge_body.php';
$wgExtensionMessagesFiles['UserMerge'] = $dir . 'UserMerge.i18n.php';
-$wgExtensionAliasesFiles['UserMerge'] = $dir . 'UserMerge.alias.php';
+$wgExtensionMessagesFiles['UserMergeAlias'] = $dir . 'UserMerge.alias.php';
$wgSpecialPages['UserMerge'] = 'UserMerge';
$wgSpecialPageGroups['UserMerge'] = 'users';
diff --git a/extensions/UserMerge/UserMerge_body.php \
b/extensions/UserMerge/UserMerge_body.php old mode 100755
new mode 100644
index 9d83c44..2f6a19d
--- a/extensions/UserMerge/UserMerge_body.php
+++ b/extensions/UserMerge/UserMerge_body.php
@@ -1,49 +1,53 @@
<?php
/** \file
-* \brief Contains code for the UserMerge Class (extends SpecialPage).
-*/
+ * \brief Contains code for the UserMerge Class (extends SpecialPage).
+ */
-///Special page class for the User Merge and Delete extension
/**
- * Special page that allows sysops to merge referances from one
- * user to another user - also supports deleting users following
- * merge.
+ * Special page class for the User Merge and Delete extension
+ * allows sysops to merge references from one user to another user.
+ * It also supports deleting users following merge.
*
* @ingroup Extensions
* @author Tim Laqua <t.laqua@gmail.com>
+ * @author Thomas Gries <mail@tgries.de>
+ * @author Matthew April <Matthew.April@tbs-sct.gc.ca>
+ *
*/
+
class UserMerge extends SpecialPage {
function __construct() {
parent::__construct( 'UserMerge', 'usermerge' );
}
function execute( $par ) {
- global $wgRequest, $wgOut, $wgUser;
-
- wfLoadExtensionMessages( 'UserMerge' );
-
$this->setHeaders();
- if ( !$wgUser->isAllowed( 'usermerge' ) ) {
- $wgOut->permissionRequired( 'usermerge' );
- return;
+ $user = $this->getUser();
+
+ if ( !$user->isAllowed( 'usermerge' ) ) {
+ throw new PermissionsError( 'usermerge' );
}
+ $out = $this->getOutput();
+ $request = $this->getRequest();
+
// init variables
$olduser_text = '';
$newuser_text = '';
$deleteUserCheck = false;
+ $validOldUser = false;
$validNewUser = false;
- if ( strlen( $wgRequest->getText( 'olduser' ).$wgRequest->getText( 'newuser' ) ) > \
0 || $wgRequest->getText( 'deleteuser' ) ) {
- //POST data found
- $olduser = Title::newFromText( $wgRequest->getText( 'olduser' ) );
+ if ( strlen( $request->getText( 'olduser' ) . $request->getText( 'newuser' ) ) > 0 \
|| $request->getText( 'deleteuser' ) ) { + // POST data found
+ $olduser = Title::newFromText( $request->getText( 'olduser' ) );
$olduser_text = is_object( $olduser ) ? $olduser->getText() : '';
- $newuser = Title::newFromText( $wgRequest->getText( 'newuser' ) );
+ $newuser = Title::newFromText( $request->getText( 'newuser' ) );
$newuser_text = is_object( $newuser ) ? $newuser->getText() : '';
- if ( $wgRequest->getText( 'deleteuser' ) ) {
+ if ( $request->getText( 'deleteuser' ) ) {
$deleteUserCheck = true;
}
@@ -51,14 +55,12 @@ class UserMerge extends SpecialPage {
$objOldUser = User::newFromName( $olduser_text );
$olduserID = $objOldUser->idForName();
- global $wgUser;
-
- if ( !is_object( $objOldUser ) ) {
+ if ( !is_object( $objOldUser ) || $objOldUser->getID() == 0 ) {
$validOldUser = false;
- $wgOut->wrapWikiMsg( "<div class='error'>\n$1</div>", 'usermerge-badolduser' );
- } elseif ( $olduserID == $wgUser->getID() ) {
+ $out->wrapWikiMsg( "<div class='error'>\n$1</div>", 'usermerge-badolduser' );
+ } elseif ( $olduserID == $user->getID() ) {
$validOldUser = false;
- $wgOut->wrapWikiMsg( "<div class='error'>\n$1</div>", 'usermerge-noselfdelete' \
); + $out->wrapWikiMsg( "<div class='error'>\n$1</div>", 'usermerge-noselfdelete' \
); } else {
global $wgUserMergeProtectedGroups;
@@ -71,182 +73,609 @@ class UserMerge extends SpecialPage {
if ( $boolProtected ) {
$validOldUser = false;
- $wgOut->wrapWikiMsg( "<div class='error'>\n$1</div>", \
'usermerge-protectedgroup' ); + $out->wrapWikiMsg( "<div \
class='error'>\n$1</div>", 'usermerge-protectedgroup' ); } else {
$validOldUser = true;
- if (strlen( $newuser_text ) > 0 ) {
-
+ if ( strlen( $newuser_text ) > 0 ) {
$objNewUser = User::newFromName( $newuser_text );
$newuserID = $objNewUser->idForName();
- if ( !is_object( $objNewUser ) || $newuserID == 0 ) {
- if ( $newuser_text == 'Anonymous' ) {
+ if ( !is_object( $objNewUser ) || $newuserID === 0 ) {
+ if ( $newuser_text === 'Anonymous' ) {
// Merge to anonymous
$validNewUser = true;
$newuserID = 0;
} else {
- //invalid newuser entered
+ // invalid newuser entered
$validNewUser = false;
- $wgOut->wrapWikiMsg( "<div class='error'>$1</div>", 'usermerge-badnewuser' \
); + $out->wrapWikiMsg( "<div class='error'>$1</div>", 'usermerge-badnewuser' \
); }
+ } elseif( $olduserID == $newuserID ) {
+ $validNewUser = false;
+ $out->wrapWikiMsg( "<div class='error'>$1</div>", array( \
'usermerge-same-old-and-new-user' ) ); } else {
- //newuser looks good
+ // newuser looks good
$validNewUser = true;
}
} else {
- //empty newuser string
+ // empty newuser string
$validNewUser = false;
$newuser_text = "Anonymous";
- $wgOut->wrapWikiMsg( "<div class='error'>$1</div>", array( \
'usermerge-nonewuser', $newuser_text ) ); + $out->wrapWikiMsg( "<div \
class='error'>$1</div>", array( 'usermerge-nonewuser', $newuser_text ) ); }
}
}
} else {
$validOldUser = false;
- $wgOut->addHTML( "<span style=\"color: red;\">" . wfMsg('usermerge-noolduser') . \
"</span><br />\n" ); + $out->addHTML(
+ Html::rawElement( 'span',
+ array( 'class' => 'warning' ),
+ $this->msg( 'usermerge-noolduser' )->escaped()
+ ) .
+ Html::element( 'br' ) .
+ "\n"
+ );
}
- } else {
- //NO POST data found
}
- $wgOut->addHTML(
- Xml::openElement( 'form', array( 'method' => 'post', 'action' => \
$this->getTitle()->getLocalUrl(), 'id' => 'usermergeform' ) ) .
- Xml::fieldset( wfMsg( 'usermerge-fieldset' ) ) .
- Xml::openElement( 'table', array( 'id' => 'mw-usermerge-table' ) ) .
- "<tr>
- <td class='mw-label'>" .
- Xml::label( wfMsg( 'usermerge-olduser' ), 'olduser' ) .
- "</td>
- <td class='mw-input'>" .
- Xml::input( 'olduser', 20, $olduser_text, array( 'type' => 'text', 'tabindex' \
=> '1', 'onFocus' => "document.getElementById('olduser').select;" ) ) \
. ' ' .
- "</td>
- </tr>
- <tr>
- <td class='mw-label'>" .
- Xml::label( wfMsg( 'usermerge-newuser' ), 'newuser' ) .
- "</td>
- <td class='mw-input'>" .
- Xml::input( 'newuser', 20, $newuser_text, array( 'type' => 'text', 'tabindex' \
=> '2', 'onFocus' => "document.getElementById('newuser').select;" ) ) \
.
- "</td>
- </tr>
- <tr>
- <td> " .
- "</td>
- <td class='mw-input'>" .
- Xml::checkLabel( wfMsg( 'usermerge-deleteolduser' ), 'deleteuser', \
'deleteuser', $deleteUserCheck, array( 'tabindex' => '3' ) ) .
- "</td>
- </tr>
- <tr>
- <td> 
- </td>
- <td class='mw-submit'>" .
- Xml::submitButton( wfMsg( 'usermerge-submit' ), array( 'tabindex' => '4' ) ) .
- "</td>
- </tr>" .
- Xml::closeElement( 'table' ) .
- Xml::closeElement( 'fieldset' ) .
- Html::hidden( 'token', $wgUser->editToken() ) .
- Xml::closeElement( 'form' ) . "\n"
+ $out->addHtml(
+
+ Html::rawElement( 'form',
+
+ array(
+ 'method' => 'post',
+ 'action' => $this->getTitle()->getLocalUrl(),
+ 'id' => 'usermergeform'
+ ),
+
+ Html::rawElement( 'fieldset',
+
+ array(),
+ Html::element( 'legend',
+ array(),
+ $this->msg( 'usermerge-fieldset' )->text()
+ ) .
+
+ Html::rawElement( 'table',
+
+ array( 'id' => 'mw-usermerge-table' ),
+ Html::rawElement( 'tr',
+
+ array(),
+ Html::rawElement( 'td',
+ array( 'class' => 'mw-label' ),
+ Html::element( 'label',
+ array( 'for' => 'olduser' ),
+ $this->msg( 'usermerge-olduser' )->text()
+ )
+ ) .
+
+ Html::rawElement( 'td',
+ array( 'class' => 'mw-input' ),
+ Html::input(
+ 'olduser',
+ $olduser_text,
+ 'text',
+ array(
+ 'tabindex' => '1',
+ 'size' => '20',
+ 'onFocus' => "document.getElementById( 'olduser' ).select;"
+ )
+ ),
+ ' '
+ )
+ ) .
+
+ Html::rawElement( 'tr',
+
+ array(),
+ Html::rawElement( 'td',
+ array( 'class' => 'mw-label' ),
+ Html::element( 'label',
+ array( 'for' => 'newuser' ),
+ $this->msg( 'usermerge-newuser' )->text()
+ )
+ ) .
+
+ Html::rawElement( 'td',
+ array( 'class' => 'mw-input' ),
+ Html::input(
+ 'newuser',
+ $newuser_text,
+ 'text',
+ array(
+ 'tabindex' => '2',
+ 'size' => '20',
+ 'onFocus' => "document.getElementById( 'newuser' ).select;"
+ )
+ )
+ )
+
+ ) .
+
+ Html::rawElement( 'tr',
+
+ array(),
+ Html::rawElement( 'td',
+ array(),
+ " "
+ ) .
+
+ Html::rawElement( 'td',
+ array( 'class' => 'mw-input' ),
+ Xml::checkLabel(
+ $this->msg( 'usermerge-deleteolduser' )->text(),
+ 'deleteuser',
+ 'deleteuser',
+ $deleteUserCheck,
+ array( 'tabindex' => '3' )
+ )
+ )
+
+ ) .
+
+ Html::rawElement( 'tr',
+
+ array(),
+ Html::rawElement( 'td',
+ array(),
+ " "
+ ) .
+
+ Html::rawElement( 'td',
+ array( 'class' => 'mw-submit' ),
+ Xml::submitButton(
+ $this->msg( 'usermerge-submit' )->text(),
+ array( 'tabindex' => '4' )
+ )
+ )
+
+ )
+
+ )
+
+ ) .
+
+ Html::Hidden( 'token', $user->getEditToken() )
+
+ ) . "\n"
+
);
if ( $validNewUser && $validOldUser ) {
- //go time, baby
- if ( !$wgUser->matchEditToken( $wgRequest->getVal( 'token' ) ) ) {
- //bad editToken
- $wgOut->addHTML( "<span style=\"color: red;\">" . wfMsg( 'usermerge-badtoken' ) \
. "</span><br />\n" ); + // go time, baby
+ if ( !$user->matchEditToken( $request->getVal( 'token' ) ) ) {
+ // bad editToken
+ $out->addHTML(
+ Html::rawElement( 'span',
+ array( 'class' => 'warning' ),
+ $this->msg( 'usermerge-badtoken' )->escaped()
+ ) .
+ Html::element( 'br' ) . "\n"
+ );
} else {
- //good editToken
- $this->mergeUser( $newuser_text, $newuserID, $olduser_text, $olduserID );
- if ( $wgRequest->getText( 'deleteuser' ) ) {
- $this->deleteUser($olduserID, $olduser_text);
+ // good editToken
+ $this->mergeEditcount( $newuserID, $olduserID );
+ $this->mergeUser( $objNewUser, $newuser_text, $newuserID, $objOldUser, \
$olduser_text, $olduserID ); + if ( $request->getText( 'deleteuser' ) ) {
+ $this->movePages( $newuser_text, $olduser_text );
+ $this->deleteUser( $objOldUser, $olduserID, $olduser_text );
}
}
}
}
- ///Function to delete users following a successful mergeUser call
/**
+ * Function to delete users following a successful mergeUser call
+ *
* Removes user entries from the user table and the user_groups table
*
+ * @param $objOldUser User
* @param $olduserID int ID of user to delete
* @param $olduser_text string Username of user to delete
*
- * @return Always returns true - throws exceptions on failure.
+ * @return bool Always returns true - throws exceptions on failure.
*/
- private function deleteUser( $olduserID, $olduser_text ) {
- global $wgOut,$wgUser;
-
+ private function deleteUser( $objOldUser, $olduserID, $olduser_text ) {
$dbw = wfGetDB( DB_MASTER );
- $dbw->delete( 'user_groups', array( 'ug_user' => $olduserID ) );
- $dbw->delete( 'user', array( 'user_id' => $olduserID ) );
- $wgOut->addHTML( wfMsg( 'usermerge-userdeleted', $olduser_text, $olduserID ) );
+ $dbw->delete(
+ 'user_groups',
+ array( 'ug_user' => $olduserID )
+ );
+ $dbw->delete(
+ 'user',
+ array( 'user_id' => $olduserID )
+ );
+ $this->getOutput()->addHTML(
+ $this->msg( 'usermerge-userdeleted', $olduser_text, $olduserID )->escaped() .
+ Html::element( 'br' ) . "\n"
+ );
$log = new LogPage( 'usermerge' );
- $log->addEntry( 'deleteuser', \
$wgUser->getUserPage(),'',array($olduser_text,$olduserID) ); + $log->addEntry( \
'deleteuser', $this->getUser()->getUserPage(), '', array( $olduser_text, $olduserID ) \
); +
+ wfRunHooks( 'DeleteAccount', array( &$objOldUser ) );
- $users = $dbw->selectField( 'user', 'COUNT(*)', array() );
- $admins = $dbw->selectField( 'user_groups', 'COUNT(*)', array( 'ug_group' => \
'sysop' ) ); + $users = $dbw->selectField(
+ 'user',
+ 'COUNT(*)',
+ array()
+ );
$dbw->update( 'site_stats',
- array( 'ss_users' => $users, 'ss_admins' => $admins ),
- array( 'ss_row_id' => 1 ) );
+ array( 'ss_users' => $users ),
+ array( 'ss_row_id' => 1 )
+ );
return true;
}
- ///Function to merge database referances from one user to another user
/**
+ * Deduplicate watchlist entries
+ * which old (merge-from) and new (merge-to) users are watching
+ *
+ * @param $oldUser User
+ * @param $newUser User
+ *
+ * @return bool
+ */
+ private function deduplicateWatchlistEntries( $oldUser, $newUser ) {
+
+ $dbw = wfGetDB( DB_MASTER );
+ $dbw->begin( __METHOD__ );
+
+ $res = $dbw->select(
+ array(
+ 'w1' => 'watchlist',
+ 'w2' => 'watchlist'
+ ),
+ array(
+ 'w2.wl_namespace',
+ 'w2.wl_title'
+ ),
+ array(
+ 'w1.wl_user' => $newUser->getID(),
+ 'w2.wl_user' => $oldUser->getID()
+ ),
+ __METHOD__,
+ array( 'FOR UPDATE' ),
+ array(
+ 'w2' => array(
+ 'INNER JOIN',
+ array(
+ 'w1.wl_namespace = w2.wl_namespace',
+ 'w1.wl_title = w2.wl_title'
+ ),
+ )
+ )
+ );
+
+ # Construct an array to delete all watched pages of the old user
+ # which the new user already watches
+ $conds = array();
+
+ foreach ( $res as $result ) {
+ $conds[] = $dbw->makeList(
+ array(
+ 'wl_user' => $oldUser->getID(),
+ 'wl_namespace' => $result->wl_namespace,
+ 'wl_title' => $result->wl_title
+ ),
+ LIST_AND
+ );
+ }
+
+ if ( empty( $conds ) ) {
+ $dbw->commit( __METHOD__ );
+ return true;
+ }
+
+ # Perform a multi-row delete
+
+ # requires
+ # MediaWiki database function with fixed https://bugzilla.wikimedia.org/50078
+ # i.e. MediaWiki core after 505dbb331e16a03d87cb4511ee86df12ea295c40 (20130625)
+ $dbw->delete(
+ 'watchlist',
+ $dbw->makeList( $conds, LIST_OR ),
+ __METHOD__
+ );
+
+ $dbw->commit( __METHOD__ );
+
+ return true;
+ }
+
+
+ /**
+ * Function to merge database references from one user to another user
+ *
* Merges database references from one user ID or username to another user ID or \
username
* to preserve referential integrity.
*
- * @param $newuser_text string Username to merge referances TO
- * @param $newuserID int ID of user to merge referances TO
- * @param $olduser_text string Username of user to remove referances FROM
- * @param $olduserID int ID of user to remove referances FROM
+ * @param $objNewUser User
+ * @param $newuser_text string Username to merge references TO
+ * @param $newuserID int ID of user to merge references TO
+ * @param $objOldUser User
+ * @param $olduser_text string Username of user to remove references FROM
+ * @param $olduserID int ID of user to remove references FROM
*
- * @return Always returns true - throws exceptions on failure.
+ * @return bool Always returns true - throws exceptions on failure.
*/
- private function mergeUser( $newuser_text, $newuserID, $olduser_text, $olduserID ) \
{
- global $wgOut, $wgUser;
-
- $textUpdateFields = array(
- array('archive','ar_user_text'),
- array('revision','rev_user_text'),
- array('filearchive','fa_user_text'),
- array('image','img_user_text'),
- array('oldimage','oi_user_text'),
- array('recentchanges','rc_user_text'),
- array('ipblocks','ipb_address')
+ private function mergeUser( $objNewUser, $newuser_text, $newuserID, $objOldUser, \
$olduser_text, $olduserID ) { + // Fields to update with the format:
+ // array( tableName, idField, textField )
+ $updateFields = array(
+ array( 'archive', 'ar_user', 'ar_user_text' ),
+ array( 'revision', 'rev_user', 'rev_user_text' ),
+ array( 'filearchive', 'fa_user', 'fa_user_text' ),
+ array( 'image', 'img_user', 'img_user_text' ),
+ array( 'oldimage', 'oi_user', 'oi_user_text' ),
+ array( 'recentchanges', 'rc_user', 'rc_user_text' ),
+ array( 'logging', 'log_user' ),
+ array( 'ipblocks', 'ipb_user', 'ipb_address' ),
+ array( 'ipblocks', 'ipb_by', 'ipb_by_text' ),
+ array( 'watchlist', 'wl_user' ),
+ );
+
+ $dbw = wfGetDB( DB_MASTER );
+ $out = $this->getOutput();
+
+ $this->deduplicateWatchlistEntries( $objOldUser, $objNewUser );
+
+ foreach ( $updateFields as $fieldInfo ) {
+ $tableName = array_shift( $fieldInfo );
+ $idField = array_shift( $fieldInfo );
+
+ $dbw->update(
+ $tableName,
+ array( $idField => $newuserID ) + array_fill_keys( $fieldInfo, $newuser_text ),
+ array( $idField => $olduserID ),
+ __METHOD__
+ );
+
+ $out->addHTML(
+ $this->msg(
+ 'usermerge-updating',
+ $tableName,
+ $olduserID,
+ $newuserID
+ )->escaped() .
+ Html::element( 'br' ) . "\n"
+ );
+
+ foreach ( $fieldInfo as $textField ) {
+ $out->addHTML(
+ $this->msg(
+ 'usermerge-updating',
+ $tableName,
+ $olduser_text,
+ $newuser_text
+ )->escaped() .
+ Html::element( 'br' ) . "\n"
+ );
+ }
+ }
+
+ $dbw->delete( 'user_newtalk', array( 'user_id' => $olduserID ) );
+
+ $out->addHTML(
+ Html::element( 'hr' ) . "\n" .
+ $this->msg( 'usermerge-success', $olduser_text, $olduserID, $newuser_text, \
$newuserID )->escaped() . + Html::element( 'br' ) . "\n"
);
- $idUpdateFields = array(
- array('archive','ar_user'),
- array('revision','rev_user'),
- array('filearchive','fa_user'),
- array('image','img_user'),
- array('oldimage','oi_user'),
- array('recentchanges','rc_user'),
- array('logging','log_user')
+ $log = new LogPage( 'usermerge' );
+ $log->addEntry(
+ 'mergeuser',
+ $this->getUser()->getUserPage(),
+ '',
+ array( $olduser_text, $olduserID, $newuser_text, $newuserID )
);
+ wfRunHooks( 'MergeAccountFromTo', array( &$objOldUser, &$objNewUser ) );
+
+ return true;
+ }
+
+
+ /**
+ * Function to add edit count
+ *
+ * Adds edit count of both users
+ *
+ * @param $newuserID int ID of user to merge references TO
+ * @param $olduserID int ID of user to remove references FROM
+ *
+ * @return bool Always returns true - throws exceptions on failure.
+ *
+ * @author Matthew April <Matthew.April@tbs-sct.gc.ca>
+ */
+ private function mergeEditcount( $newuserID, $olduserID ) {
$dbw = wfGetDB( DB_MASTER );
- foreach ( $idUpdateFields as $idUpdateField ) {
- $dbw->update( $idUpdateField[0], array( $idUpdateField[1] => $newuserID ), array( \
$idUpdateField[1] => $olduserID ) );
- $wgOut->addHTML( wfMsg('usermerge-updating', $idUpdateField[0], $olduserID, \
$newuserID ) . "<br />\n" ); + $olduserEdits = $dbw->selectField(
+ 'user',
+ 'user_editcount',
+ array( 'user_id' => $olduserID ),
+ __METHOD__
+ );
+ if ( $olduserEdits === false ) {
+ $olduserEdits = 0;
}
- foreach ( $textUpdateFields as $textUpdateField ) {
- $dbw->update( $textUpdateField[0], array( $textUpdateField[1] => $newuser_text ), \
array( $textUpdateField[1] => $olduser_text ) );
- $wgOut->addHTML( wfMsg( 'usermerge-updating', $textUpdateField[0], $olduser_text, \
$newuser_text ) . "<br />\n" ); + $newuserEdits = $dbw->selectField(
+ 'user',
+ 'user_editcount',
+ array( 'user_id' => $newuserID ),
+ __METHOD__
+ );
+ if ( $newuserEdits === false ) {
+ $newuserEdits = 0;
}
- $dbw->delete( 'user_newtalk', array( 'user_id' => $olduserID ));
+ $totalEdits = $olduserEdits + $newuserEdits;
+
+ # don't run querys if neither user has any edits
+ if ( $totalEdits > 0 ) {
+ # update new user with total edits
+ $dbw->update( 'user',
+ array( 'user_editcount' => $totalEdits ),
+ array( 'user_id' => $newuserID ),
+ __METHOD__
+ );
+
+ # clear old users edits
+ $dbw->update( 'user',
+ array( 'user_editcount' => 0 ),
+ array( 'user_id' => $olduserID ),
+ __METHOD__
+ );
+ }
- $wgOut->addHTML("<hr />\n" . \
wfMsg('usermerge-success',$olduser_text,$olduserID,$newuser_text,$newuserID) . "\n<br \
/>"); + $this->getOutput()->addHTML(
+ $this->msg(
+ 'usermerge-editcount-merge-success',
+ $olduserEdits, $olduserID, $newuserEdits, $newuserID, $totalEdits
+ )->escaped() .
+ Html::element( 'br' ) . "\n"
+ );
- $log = new LogPage( 'usermerge' );
- $log->addEntry( 'mergeuser', \
$wgUser->getUserPage(),'',array($olduser_text,$olduserID,$newuser_text,$newuserID) ); \
+ return true; + }
+
+ /**
+ * Function to merge user pages
+ *
+ * Deletes all pages when merging to Anon
+ * Moves user page when the target user page does not exist or is empty
+ * Deletes redirect if nothing links to old page
+ * Deletes the old user page when the target user page exists
+ *
+ * @param $newuser_text string Username to merge pages TO
+ * @param $olduser_text string Username of user to remove pages FROM
+ *
+ * @return bool True on completion
+ *
+ * @author Matthew April <Matthew.April@tbs-sct.gc.ca>
+ */
+ private function movePages( $newuser_text, $olduser_text ) {
+ global $wgContLang;
+
+ $oldusername = trim( str_replace( '_', ' ', $olduser_text ) );
+ $oldusername = Title::makeTitle( NS_USER, $oldusername );
+ $newusername = Title::makeTitleSafe( NS_USER, $wgContLang->ucfirst( $newuser_text \
) ); +
+ # select all user pages and sub-pages
+ $dbr = wfGetDB( DB_SLAVE );
+ $pages = $dbr->select( 'page',
+ array( 'page_namespace', 'page_title' ),
+ array(
+ 'page_namespace' => array( NS_USER, NS_USER_TALK ),
+ $dbr->makeList( array(
+ 'page_title' => $dbr->buildLike( $oldusername->getDBkey() . '/', \
$dbr->anyString() ), + 'page_title' => $oldusername->getDBkey()
+ ),
+ LIST_OR
+ )
+ )
+ );
+
+ $output = '';
+
+ foreach ( $pages as $row ) {
+
+ $oldPage = Title::makeTitleSafe( $row->page_namespace, $row->page_title );
+ $newPage = Title::makeTitleSafe( $row->page_namespace,
+ preg_replace( '!^[^/]+!', $newusername->getDBkey(), $row->page_title ) );
+
+ if ( $newuser_text === "Anonymous" ) { # delete ALL old pages
+ if ( $oldPage->exists() ) {
+ $oldPageArticle = new Article( $oldPage, 0 );
+ $oldPageArticle->doDeleteArticle( $this->msg( 'usermerge-autopagedelete' \
)->inContentLanguage()->text() ); +
+ $oldLink = Linker::linkKnown( $oldPage );
+ $output .= Html::rawElement( 'li',
+ array( 'class' => 'mw-renameuser-pe' ),
+ $this->msg( 'usermerge-page-deleted' )->rawParams( $oldLink )->escaped()
+ );
+
+ }
+ } elseif ( $newPage->exists()
+ && !$oldPage->isValidMoveTarget( $newPage )
+ && $newPage->getLength() > 0 ) { # delete old pages that can't be moved
+
+ $oldPageArticle = new Article( $oldPage, 0 );
+ $oldPageArticle->doDeleteArticle( $this->msg( 'usermerge-autopagedelete' \
)->text() ); +
+ $link = Linker::linkKnown( $oldPage );
+ $output .= Html::rawElement( 'li',
+ array( 'class' => 'mw-renameuser-pe' ),
+ $this->msg( 'usermerge-page-deleted' )->rawParams( $link )->escaped()
+ );
+
+ } else { # move content to new page
+ # delete target page if it exists and is blank
+ if ( $newPage->exists() ) {
+ $newPageArticle = new Article( $newPage, 0 );
+ $newPageArticle->doDeleteArticle( $this->msg( 'usermerge-autopagedelete' \
)->inContentLanguage()->text() ); + }
+
+ # move to target location
+ $success = $oldPage->moveTo(
+ $newPage,
+ false,
+ $this->msg(
+ 'usermerge-move-log',
+ $oldusername->getText(),
+ $newusername->getText() )->inContentLanguage()->text()
+ );
+
+ if ( $success === true ) {
+ $oldLink = Linker::linkKnown(
+ $oldPage,
+ null,
+ array(),
+ array( 'redirect' => 'no' )
+ );
+ $newLink = Linker::linkKnown( $newPage );
+ $output .= Html::rawElement( 'li',
+ array( 'class' => 'mw-renameuser-pm' ),
+ $this->msg( 'usermerge-page-moved' )->rawParams( $oldLink, $newLink \
)->escaped() + );
+ } else {
+ $oldLink = Linker::linkKnown( $oldPage );
+ $newLink = Linker::linkKnown( $newPage );
+ $output .= Html::rawElement( 'li',
+ array( 'class' => 'mw-renameuser-pu' ),
+ $this->msg( 'usermerge-page-unmoved' )->rawParams( $oldLink, $newLink \
)->escaped() + );
+ }
+
+ # check if any pages link here
+ $res = $dbr->selectField( 'pagelinks',
+ 'pl_title',
+ array( 'pl_title' => $olduser_text ),
+ __METHOD__
+ );
+ if ( !$dbr->numRows( $res ) ) {
+ # nothing links here, so delete unmoved page/redirect
+ $oldPageArticle = new Article( $oldPage, 0 );
+ $oldPageArticle->doDeleteArticle( $this->msg( 'usermerge-autopagedelete' \
)->inContentLanguage()->text() ); + }
+ }
+
+ }
+
+ if ( $output ) {
+ $this->getOutput()->addHTML(
+ Html::rawElement( 'ul',
+ array(),
+ $output
+ )
+ );
+ }
return true;
}
+
}
diff --git a/extensions/UserMerge/install.settings \
b/extensions/UserMerge/install.settings old mode 100755
new mode 100644
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic