Hello L10n-bot,

I'd like you to do a code review.  Please visit

    https://gerrit.wikimedia.org/r/354401

to review the following change.


Change subject: Revert "Localisation updates from https://translatewiki.net.";
......................................................................

Revert "Localisation updates from https://translatewiki.net.";

Mistaken addition of English strings as Hindi messages.
https://translatewiki.net/wiki/Thread:User_talk:Sfic/Import_of_English_strings_to_Hindi

This reverts commit f630967b97dcacea3d8290aeeb85b126cf91c746.

Change-Id: Ia0f178865f6cc9a183775e2c36830cdfb2cb8fea
---
M i18n/en-gb.json
M i18n/es.json
M i18n/gl.json
M i18n/hi.json
D i18n/ja.json
M i18n/pt.json
M i18n/ru.json
M i18n/sr-ec.json
8 files changed, 9 insertions(+), 82 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwoColConflict 
refs/changes/01/354401/1

diff --git a/i18n/en-gb.json b/i18n/en-gb.json
index 57b39bc..f2c3417 100644
--- a/i18n/en-gb.json
+++ b/i18n/en-gb.json
@@ -1,44 +1,9 @@
 {
        "@metadata": {
                "authors": [
-                       "Dr. Shikha Jaggi",
-                       "Dejavu"
+                       "Dr. Shikha Jaggi"
                ]
        },
-       "twoColConflict": "TwoColConflict",
-       "twoColConflict-desc": "Showing a side-by-side edit merge screen for 
edit conflict resolution",
-       "twoColConflict-beta-feature-message": "Two column edit conflict",
-       "twoColConflict-beta-feature-description": "Show the edit conflict view 
using a more advanced two column view.",
-       "twoColConflict-explainconflict": "<strong>Warning:</strong> Another 
user just edited and saved this page. There is a conflict between your version 
and the current version. You will have to merge your changes into the current 
text version. Only the text in the editor field will be saved when you click on 
\"$1\".",
-       "twoColConflict-changes-col-title": "Conflicting changes",
-       "twoColConflict-changes-col-desc-1": "Differences between",
-       "twoColConflict-changes-col-desc-2": "the currently published version",
-       "twoColConflict-changes-col-desc-3": "changed $1 {{PLURAL:$1|times}} 
($2)",
-       "twoColConflict-changes-col-desc-4": "your text.",
-       "twoColConflict-history-link": "revision history",
-       "twoColConflict-editor-col-title": "Editor with version to be 
published",
-       "twoColConflict-editor-col-desc-1": "Initially, the editor's content is 
the currently published version.",
-       "twoColConflict-editor-col-desc-2": "Add your changes to the text in 
the editor and click on \"Publish changes\".",
-       "twoColConflict-base-selection-desc-1": "1) Choose the base version in 
the popup below.",
-       "twoColConflict-base-selection-desc-2": "2) Adjust the text to combine 
both versions.",
-       "twoColConflict-base-selection-desc-3": "3) Click on \"publish 
changes\". Only what is in the editor will be published.",
-       "twoColConflict-base-selection-dialog-text": "What should initially be 
in the editor and serve as a basis for combining the conflict versions?",
-       "twoColConflict-base-selection-own-label": "My text",
-       "twoColConflict-base-selection-foreign-label": "The currently published 
version",
-       "twoColConflict-base-selection-submit-label": "OK",
-       "twoColConflict-diffchange-own-title": "in your version",
-       "twoColConflict-diffchange-foreign-title": "in $1's version",
-       "twoColConflict-label-show": "show",
-       "twoColConflict-label-hide": "hide",
-       "twoColConflict-label-unchanged": "unchanged text",
-       "twoColConflict-show-help-tooltip": "Show help text",
-       "twoColConflict-help-dialog-slide1": "This page helps you to resolve an 
edit conflict. There are two columns: The first shows the conflicting changes 
and the second is a text editor, whose content will be published.\n\nFeedback 
is very much appreciated 
[//www.mediawiki.org/wiki/Help_talk:Two_Column_Edit_Conflict_View here].",
-       "twoColConflict-help-dialog-slide2": "The first column shows the 
changes in your version and the changes in the currently saved version. The 
differences between both versions are highlighted.",
-       "twoColConflict-help-dialog-slide3": "At the top of the first column 
you can click on “show” to see unchanged text. This might help to understand 
the context of changes. By default, unchanged text is grayed out and 
collapsed.",
-       "twoColConflict-help-dialog-slide4": "The second column is an editor. 
When the page is opened, there is a selection box on top of the editor. It lets 
you decide which version should be in the editor. This is often the version 
where more changes were made.",
-       "twoColConflict-help-dialog-slide5": "Copy and paste the desired parts 
of the other version into the text in the editor. Only what is in the editor 
will be published, when you click the \"Publish changes\" button.",
-       "twoColConflict-tutorial": "Edit conflict solving tutorial",
-       "twoColConflict-previous-dialog": "Previous",
-       "twoColConflict-next-dialog": "Next",
-       "twoColConflict-close-dialog": "Close"
+       "twoColConflict-label-mine": "मेरी/ \nमेरा",
+       "twoColConflict-label-both": "दोनों"
 }
diff --git a/i18n/es.json b/i18n/es.json
index 2223740..551b1fa 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -22,7 +22,7 @@
        "twoColConflict-editor-col-desc-2": "Realiza tus cambios al texto en el 
editor y pulsa en «Publicar cambios».",
        "twoColConflict-base-selection-desc-1": "1) Elige la versión base en la 
ventana de abajo.",
        "twoColConflict-base-selection-desc-2": "2) Ajustar el texto para 
combinar ambas versiones.",
-       "twoColConflict-base-selection-desc-3": "3) Haz clic en «Publicar 
cambios». Solo se publicará lo que aparezca en el editor.",
+       "twoColConflict-base-selection-desc-3": "3) Haz clic en \"Publicar 
cambios\". Solo lo que aparezca en el editor se publicará.",
        "twoColConflict-base-selection-dialog-text": "¿Qué debería haber en el 
editor inicialmente y servir como base para combinar las versiones en 
conflicto?",
        "twoColConflict-base-selection-own-label": "Mi texto",
        "twoColConflict-base-selection-foreign-label": "La versión actualmente 
publicada",
@@ -33,11 +33,7 @@
        "twoColConflict-label-hide": "ocultar",
        "twoColConflict-label-unchanged": "texto sin cambios",
        "twoColConflict-show-help-tooltip": "Mostrar el texto de ayuda",
-       "twoColConflict-help-dialog-slide1": "Esta página te ayuda a resolver 
un conflicto de ediciones. Hay dos columnas. La primera muestra las 
modificaciones que se encuentran en conflicto y la segunda es un editor de 
texto cuyo contenido será publicado.\n\nTus comentarios son bienvenidos 
[//www.mediawiki.org/wiki/Help_talk:Two_Column_Edit_Conflict_View aquí].",
-       "twoColConflict-help-dialog-slide2": "La primera columna muestra los 
cambios en tu versión y los cambios en la versión que está guardada. Las 
diferencias entre las dos versiones están resaltadas.",
-       "twoColConflict-help-dialog-slide3": "En la parte superior de la 
primera columna, puedes pinchar en «mostrar» para ver el texto sin cambios. 
Esto puede ayudar a captar mejor el contexto donde se producen los cambios. Por 
defecto, el texto sin cambios está difuminado y plegado.",
-       "twoColConflict-help-dialog-slide4": "La segunda columna es un editor. 
Al abrir la página, hay una caja de selección en la parte superior del editor 
que te permite decidir qué versión quieres que aparezca en el editor. 
Normalmente será la versión donde se hayan hecho más cambios.",
-       "twoColConflict-help-dialog-slide5": "Copia y pega las partes deseadas 
de la otra versión en el texto del editor. Solo se publicará lo que aparezca en 
el editor cuando hayas pulsado el botón «Publicar cambios».",
+       "twoColConflict-help-dialog-slide5": "Copia y pega las partes deseadas 
de la otra versión dentro del texto en el editor. Solo lo que aparezca en el 
editor se publicará, cuando hagas clic en el botón \"Publicar cambios\".",
        "twoColConflict-tutorial": "Tutorial para resolver conflictos de 
edición",
        "twoColConflict-previous-dialog": "Anterior",
        "twoColConflict-next-dialog": "Siguiente",
diff --git a/i18n/gl.json b/i18n/gl.json
index 0e130fb..2373870 100644
--- a/i18n/gl.json
+++ b/i18n/gl.json
@@ -32,10 +32,10 @@
        "twoColConflict-label-hide": "agochar",
        "twoColConflict-label-unchanged": "texto sen cambios",
        "twoColConflict-show-help-tooltip": "Mostrar o texto de axuda",
-       "twoColConflict-help-dialog-slide1": "Esta páxina axúdao a resolver un 
conflito de edición. Hai dúas columnasː a primeira mostra os cambios 
conflitivos e a segunda é un editor de texto, cuxo contido será o que se 
publique.\n\nPode facer comentarios 
\n[//www.mediawiki.org/wiki/Help_talk:Two_Column_Edit_Conflict_View aquí].",
+       "twoColConflict-help-dialog-slide1": "Despois de activala, en canto 
aparece un conflito de edición, a nova vista aparecerá en forma de dúas 
columnas. Verá unha caixa cos cambios conflitivos nunha columna e un editor coa 
versión gardada do texto noutra columna. Os seus comentarios son benvidos 
[//www.mediawiki.org/wiki/Help_talk:Two_Column_Edit_Conflict_Viewaquí].",
        "twoColConflict-help-dialog-slide2": "A primeira columna mostra os 
cambios na súa versión e os cambios na versión actual gardada. As diferenzas 
entre as dúas versións están resaltadas.",
-       "twoColConflict-help-dialog-slide3": "Na parte superior da primeira 
columna, pode premer en «mostrar» para ver o texto sen cambios. Isto pode 
axudar a captar mellor o contexto onde se producen os cambios. Por defecto, o 
texto sen cambios está difuminado e pregado.",
-       "twoColConflict-help-dialog-slide4": "A segunda columna é un editor. Ó 
abrir a páxina, hai unha caixa de selección na parte superior do editor que lle 
permite decidir qué versión quere que apareza no editor. Normalmente será a 
versión onde se teñan feito máis cambios.",
+       "twoColConflict-help-dialog-slide3": "Hai botóns sobre a caixa que lle 
permiten ocultar as partes do texto sen cambios, para que sexa máis doado 
concentrarse nas áreas en conflito. Tamén ten a posibilidade de mostrar só a 
súa versión do texto.",
+       "twoColConflict-help-dialog-slide4": "Despois pode copiar e pegar as 
partes de texto que desexe ó editor, para axustar a versión que deberá 
gardarse. Así que prema no botón de \"Gardar cambios\", a versión contida no 
editor será gardada.",
        "twoColConflict-help-dialog-slide5": "Copie e pegue as partes desexadas 
da outra versión dentro do texto no editor. Cando prema no botón \"Publicar 
cambios\", só se publicará o que conteña o editor.",
        "twoColConflict-tutorial": "Titorial para resolver conflitos de 
edición",
        "twoColConflict-previous-dialog": "Anterior",
diff --git a/i18n/hi.json b/i18n/hi.json
index 7f5efaf..03fad0c 100644
--- a/i18n/hi.json
+++ b/i18n/hi.json
@@ -5,24 +5,10 @@
                        "Sfic"
                ]
        },
-       "twoColConflict": "TwoColConflict",
-       "twoColConflict-desc": "Showing a side-by-side edit merge screen for 
edit conflict resolution",
-       "twoColConflict-beta-feature-message": "Two column edit conflict",
-       "twoColConflict-beta-feature-description": "Show the edit conflict view 
using a more advanced two column view.",
-       "twoColConflict-explainconflict": "<strong>Warning:</strong> Another 
user just edited and saved this page. There is a conflict between your version 
and the current version. You will have to merge your changes into the current 
text version. Only the text in the editor field will be saved when you click on 
\"$1\".",
-       "twoColConflict-changes-col-title": "Conflicting changes",
-       "twoColConflict-changes-col-desc-1": "Differences between",
        "twoColConflict-changes-col-desc-2": "वर्तमान प्रकाशित संस्करण",
        "twoColConflict-changes-col-desc-3": "$1 {{PLURAL:$1|बार}} बदला गया 
($2)",
        "twoColConflict-changes-col-desc-4": "आपका पाठ।",
        "twoColConflict-history-link": "अवतरण का इतिहास",
-       "twoColConflict-editor-col-title": "Editor with version to be 
published",
-       "twoColConflict-editor-col-desc-1": "Initially, the editor's content is 
the currently published version.",
-       "twoColConflict-editor-col-desc-2": "Add your changes to the text in 
the editor and click on \"Publish changes\".",
-       "twoColConflict-base-selection-desc-1": "1) Choose the base version in 
the popup below.",
-       "twoColConflict-base-selection-desc-2": "2) Adjust the text to combine 
both versions.",
-       "twoColConflict-base-selection-desc-3": "3) Click on \"publish 
changes\". Only what is in the editor will be published.",
-       "twoColConflict-base-selection-dialog-text": "What should initially be 
in the editor and serve as a basis for combining the conflict versions?",
        "twoColConflict-base-selection-own-label": "मेरा पाठ",
        "twoColConflict-base-selection-foreign-label": "वर्तमान प्रकाशित 
संस्करण",
        "twoColConflict-base-selection-submit-label": "ठीक है",
@@ -30,14 +16,6 @@
        "twoColConflict-diffchange-foreign-title": "$1 जी के संस्करण में",
        "twoColConflict-label-show": "दिखाएँ",
        "twoColConflict-label-hide": "छुपाएँ",
-       "twoColConflict-label-unchanged": "unchanged text",
-       "twoColConflict-show-help-tooltip": "Show help text",
-       "twoColConflict-help-dialog-slide1": "This page helps you to resolve an 
edit conflict. There are two columns: The first shows the conflicting changes 
and the second is a text editor, whose content will be published.\n\nFeedback 
is very much appreciated 
[//www.mediawiki.org/wiki/Help_talk:Two_Column_Edit_Conflict_View here].",
-       "twoColConflict-help-dialog-slide2": "The first column shows the 
changes in your version and the changes in the currently saved version. The 
differences between both versions are highlighted.",
-       "twoColConflict-help-dialog-slide3": "At the top of the first column 
you can click on “show” to see unchanged text. This might help to understand 
the context of changes. By default, unchanged text is greyed out and 
collapsed.",
-       "twoColConflict-help-dialog-slide4": "The second column is an editor. 
When the page is opened, there is a selection box on top of the editor. It lets 
you decide which version should be in the editor. This is often the version 
where more changes were made.",
-       "twoColConflict-help-dialog-slide5": "Copy and paste the desired parts 
of the other version into the text in the editor. Only what is in the editor 
will be published, when you click the \"Publish changes\" button.",
-       "twoColConflict-tutorial": "Edit conflict solving tutorial",
        "twoColConflict-previous-dialog": "पिछला",
        "twoColConflict-next-dialog": "अगला",
        "twoColConflict-close-dialog": "बंद करें"
diff --git a/i18n/ja.json b/i18n/ja.json
deleted file mode 100644
index 5243326..0000000
--- a/i18n/ja.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-       "@metadata": {
-               "authors": [
-                       "Mirinano"
-               ]
-       },
-       "twoColConflict-beta-feature-message": "2列で編集の競合を表示",
-       "twoColConflict-beta-feature-description": "2列の編集画面を使用して、編集競合を表示します。"
-}
diff --git a/i18n/pt.json b/i18n/pt.json
index 3dcdb55..11dce50 100644
--- a/i18n/pt.json
+++ b/i18n/pt.json
@@ -25,7 +25,7 @@
        "twoColConflict-base-selection-desc-3": "3) Clique em \"Publicar 
alterações\". Somente o que está no editor será publicado.",
        "twoColConflict-base-selection-dialog-text": "O que deveria estar 
inicialmente no editor e servir como base para combinar as versões em 
conflito?",
        "twoColConflict-base-selection-own-label": "Meu texto",
-       "twoColConflict-base-selection-foreign-label": "A versão publicada 
actualmente",
+       "twoColConflict-base-selection-foreign-label": "A versão publicado 
actualmente",
        "twoColConflict-base-selection-submit-label": "OK",
        "twoColConflict-diffchange-own-title": "em sua versão",
        "twoColConflict-diffchange-foreign-title": "na versão de $1",
diff --git a/i18n/ru.json b/i18n/ru.json
index d04c9c6..2fbf940 100644
--- a/i18n/ru.json
+++ b/i18n/ru.json
@@ -12,7 +12,6 @@
        "twoColConflict-desc": "Показывает экран слияния правок для разрешения 
конфликтов редактирований в две колонки",
        "twoColConflict-changes-col-desc-1": "Разница между",
        "twoColConflict-base-selection-own-label": "Мой текст",
-       "twoColConflict-base-selection-submit-label": "OK",
        "twoColConflict-diffchange-own-title": "в вашей версии",
        "twoColConflict-label-show": "показать",
        "twoColConflict-label-hide": "скрыть",
diff --git a/i18n/sr-ec.json b/i18n/sr-ec.json
index cf89937..0963297 100644
--- a/i18n/sr-ec.json
+++ b/i18n/sr-ec.json
@@ -5,8 +5,6 @@
                        "Obsuser"
                ]
        },
-       "twoColConflict-beta-feature-message": "Сукобљене измене у две колоне",
-       "twoColConflict-beta-feature-description": "Напреднији приказ 
сукобљених измена, у две колоне.",
        "twoColConflict-editor-col-desc-1": "У почетку, садржај уређивача је 
тренутно објављена верзија.",
        "twoColConflict-editor-col-desc-2": "Унесите своје измене текста у 
уређивач и кликните на „Објави измене”.",
        "twoColConflict-label-show": "прикажи",

-- 
To view, visit https://gerrit.wikimedia.org/r/354401
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia0f178865f6cc9a183775e2c36830cdfb2cb8fea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: Nemo bis <federicol...@tiscali.it>
Gerrit-Reviewer: L10n-bot <l10n-...@translatewiki.net>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to