Merge "watchlist: make getLatestNotificationTimestamp() method use the correct user"

diff --git a/includes/import/WikiRevision.php b/includes/import/WikiRevision.php
index 96b43d6..c006874 100644 (file)
--- a/includes/import/WikiRevision.php
+++ b/includes/import/WikiRevision.php
@@ -54,14 +54,6 @@ class WikiRevision implements ImportableUploadRevision, ImportableOldRevision {
         */
        public $timestamp = "20010115000000";
 
-       /**
-        * @since 1.2
-        * @var int
-        * @deprecated in 1.29. Unused.
-        * @note Introduced in 436a028086fb3f01c4605c5ad2964d56f9306aca, unused there, unused now.
-        */
-       public $user = 0;
-
        /**
         * @since 1.2
         * @var string

diff --git a/languages/data/Names.php b/languages/data/Names.php
index e44d766..d7d5eec 100644 (file)
--- a/languages/data/Names.php
+++ b/languages/data/Names.php
@@ -361,7 +361,7 @@ class Names {
                'rgn' => 'Rumagnôl', # Romagnol
                'rif' => 'Tarifit', # Tarifit
                'rm' => 'rumantsch', # Raeto-Romance
-               'rmy' => 'Romani', # Vlax Romany
+               'rmy' => 'romani čhib', # Vlax Romany
                'rn' => 'Kirundi', # Rundi/Kirundi/Urundi
                'ro' => 'română', # Romanian
                'roa-rup' => 'armãneashti', # Aromanian (deprecated code, 'rup' exists in ISO 639-3)