Bene has uploaded a new change for review.
https://gerrit.wikimedia.org/r/67879
Change subject: Merge branch 'master' of
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase into fixitemview
......................................................................
Merge branch 'master' of
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase into fixitemview
Conflicts:
repo/Wikibase.i18n.php
Change-Id: I991f5bf2e33e98c5116e7811abbab266aeb6760d
---
M repo/Wikibase.i18n.php
1 file changed, 2 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/79/67879/1
diff --git a/repo/Wikibase.i18n.php b/repo/Wikibase.i18n.php
index 7ad2929..3f00112 100644
--- a/repo/Wikibase.i18n.php
+++ b/repo/Wikibase.i18n.php
@@ -778,12 +778,6 @@
'wikibase-setsitelink-site' => 'Label for the input field to type the
site id to set the site link to.',
'wikibase-setsitelink-label' => 'Label for the input field to type the
site link to set the entity to.',
'wikibase-setsitelink-submit' => 'Label for the button that activates
the action.',
-<<<<<<< HEAD (76f5c9 hotfix: Special:SetSiteLink not set already used
sitelinks ()
- 'wikibase-setsitelink-warning-remove' => 'A warning message to ask the
user if he wants to remove the site link. $1 is the id that links to the
entity.',
- 'wikibase-setsitelink-invalid-site' => 'Response informing that the
site id is not valid. Could give an example of a valid site id. $1 is the
invalid id.',
- 'wikibase-setsitelink-add-failed' => 'Error message when the site link
could not be saved.',
- 'wikibase-setsitelink-remove-failed' => 'Error message when the site
link could not be removed.',
-=======
'wikibase-setsitelink-warning-remove' => 'A warning message to ask the
user if he wants to remove the site link.
Parameters:
@@ -792,7 +786,8 @@
Parameters:
* $1 - the invalid id',
->>>>>>> BRANCH (765c05 Merge "Removed unused import")
+ 'wikibase-setsitelink-add-failed' => 'Error message when the site link
could not be saved.',
+ 'wikibase-setsitelink-remove-failed' => 'Error message when the site
link could not be removed.',
'wikibase-setentity-id' => 'Label for the input field to select the ID
of the entity.
{{Identical|ID}}',
'wikibase-setentity-language' => 'Label for the input field to select
the language the label should be set in.
--
To view, visit https://gerrit.wikimedia.org/r/67879
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I991f5bf2e33e98c5116e7811abbab266aeb6760d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Bene <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
