Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/189116
Change subject: Merge branch 'REL1_22' of
ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook into REL1_22
......................................................................
Merge branch 'REL1_22' of
ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook into REL1_22
Conflicts:
Metrolook.i18n.php
Metrolook.php
Change-Id: I07bb63ca653903ad550a624afdf0b3919a5b288b
---
M Metrolook.i18n.php
M Metrolook.php
2 files changed, 0 insertions(+), 123 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook
refs/changes/16/189116/1
diff --git a/Metrolook.i18n.php b/Metrolook.i18n.php
index 7f29057..b0310d9 100644
--- a/Metrolook.i18n.php
+++ b/Metrolook.i18n.php
@@ -10,7 +10,6 @@
$messages = array();
/**
-<<<<<<< HEAD (094085 Update Metrolook and bump version)
* @author Khaled
*/
$messages['ar'] = array(
@@ -73,29 +72,6 @@
$messages['en'] = array(
'metrolook-desc' => 'Vzhled Metrolook pro MediaWiki',
'metrolook-guest' => 'Host',
-=======
- * @author Red Winged Duck
- */
-$messages['be-tarask'] = array(
- 'metrolook-desc' => 'Тэма афармленьня Metrolook для MediaWiki',
- 'metrolook-guest' => 'Госьць',
-);
-
-/**
- * @author Metalhead64
- * @author Purodha
- */
-$messages['de'] = array(
- 'metrolook-desc' => 'Fügt die Benutzeroberfläche „Metrolook“ zu
MediaWiki hinzu',
- 'metrolook-guest' => 'Gast',
-);
-
-/**
- * @author Mirzali
- */
-$messages['diq'] = array(
- 'metrolook-guest' => 'Meyman',
->>>>>>> BRANCH (884212 Update Metrolook)
);
/** English
@@ -131,7 +107,6 @@
);
/**
-<<<<<<< HEAD (094085 Update Metrolook and bump version)
* @author Linedwell
*/
$messages['fr'] = array(
@@ -249,82 +224,6 @@
*/
$messages['pt'] = array(
'metrolook-guest' => 'Visitante',
-=======
- * @author Elisardojm
- */
-$messages['gl'] = array(
- 'metrolook-desc' => 'Aparencia Metrolook para MediaWiki',
- 'metrolook-guest' => 'Invitado',
-);
-
-/**
- * @author Yona b
- */
-$messages['he'] = array(
- 'metrolook-desc' => 'עיצוב מטרולוק למדיה־ויקי',
- 'metrolook-guest' => 'אורח',
-);
-
-/**
- * @author McDutchie
- */
-$messages['ia'] = array(
- 'metrolook-desc' => 'Apparentia Metrolook pro MediaWiki',
- 'metrolook-guest' => 'Hospite',
-);
-
-/**
- * @author MIKHEIL
- */
-$messages['ka'] = array(
- 'metrolook-guest' => 'სტუმარი',
-);
-
-/**
- * @author Purodha
- */
-$messages['ksh'] = array(
- 'metrolook-desc' => 'De Bovverfläsch „Metrolook“ för et MehdijaWikki.',
- 'metrolook-guest' => 'Jaß',
-);
-
-/**
- * @author Robby
- */
-$messages['lb'] = array(
- 'metrolook-guest' => 'Gaascht',
-);
-
-/**
- * @author Bjankuloski06
- */
-$messages['mk'] = array(
- 'metrolook-desc' => 'Руво „Метроизглед“ за МедијаВики',
- 'metrolook-guest' => 'Гостин',
-);
-
-/**
- * @author C.R.
- */
-$messages['nap'] = array(
- 'metrolook-desc' => "Skin Metrolook pe' MediaWiki",
- 'metrolook-guest' => 'Mmitato',
-);
-
-/**
- * @author Sjoerddebruin
- */
-$messages['nl'] = array(
- 'metrolook-guest' => 'Gast',
-);
-
-/**
- * @author Chrumps
- */
-$messages['pl'] = array(
- 'metrolook-desc' => 'Skórka Metrolook dla MediaWiki',
- 'metrolook-guest' => 'Gość',
->>>>>>> BRANCH (884212 Update Metrolook)
);
/**
@@ -343,7 +242,6 @@
'metrolook-guest' => 'Used for descbribing you as a guest editing the
wiki.\n{{Identical|Guest}}',
);
-<<<<<<< HEAD (094085 Update Metrolook and bump version)
/**
* @author Joetaras
*/
@@ -392,23 +290,6 @@
'metrolook-guest' => 'Khách'
);
-=======
-/**
- * @author Okras
- */
-$messages['ru'] = array(
- 'metrolook-desc' => 'Тема оформления MediaWiki Metrolook',
- 'metrolook-guest' => 'Гость',
-);
-
-/**
- * @author Okras
- */
-$messages['ta'] = array(
- 'metrolook-desc' => 'Тема оформления MediaWiki Metrolook',
- 'metrolook-guest' => 'விருந்தினர்'
-);
->>>>>>> BRANCH (884212 Update Metrolook)
/**
* @author Liuxinyu970226
diff --git a/Metrolook.php b/Metrolook.php
index 3c5de90..63849ef 100644
--- a/Metrolook.php
+++ b/Metrolook.php
@@ -26,11 +26,7 @@
'name' => 'Metrolook',
'namemsg' => 'skinname-metrolook',
'descriptionmsg' => 'metrolook-desc',
-<<<<<<< HEAD (094085 Update Metrolook and bump version)
'version' => '0.3.9',
-=======
- 'version' => '0.3.7',
->>>>>>> BRANCH (884212 Update Metrolook)
'url' => 'https://www.mediawiki.org/wiki/Skin:Metrolook',
'author' => array( 'immewnity', 'paladox2015', 'Craig Davison',
'lagleki' ),
'license-name' => 'GPLv2+',
--
To view, visit https://gerrit.wikimedia.org/r/189116
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I07bb63ca653903ad550a624afdf0b3919a5b288b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: REL1_22
Gerrit-Owner: Paladox <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
