* src/frontends/qt4/ui/QTabularUi.ui:

	* src/frontends/qt4/QTabular.C: change "Block" to "Justified"
	to avoid translation clash and to align with paragraph settings

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17694 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/QTabular.C b/src/frontends/qt4/QTabular.C
index 25aec250f48ef29f37249872ab430b4329b6cd9f..0a18307aa56b7443478a7c9c7c9205c334074f15 100644 (file)
--- a/src/frontends/qt4/QTabular.C
+++ b/src/frontends/qt4/QTabular.C
@@ -261,7 +261,7 @@ void QTabular::update_contents()
        dialog_->hAlignCB->addItem(qt_("Center"));
        dialog_->hAlignCB->addItem(qt_("Right"));
        if (!multicol && !pwidth.zero())
-               dialog_->hAlignCB->addItem(qt_("Block"));
+               dialog_->hAlignCB->addItem(qt_("Justified"));
 
        int align = 0;
        switch (tabular.getAlignment(cell)) {

diff --git a/src/frontends/qt4/ui/QTabularUi.ui b/src/frontends/qt4/ui/QTabularUi.ui
index 3b8cbcf1ba150bb711ba02be611d91d33b9edbeb..b07c8fd4fa062ace994bbc31de9312bba2476866 100644 (file)
--- a/src/frontends/qt4/ui/QTabularUi.ui
+++ b/src/frontends/qt4/ui/QTabularUi.ui
@@ -137,7 +137,7 @@
          </property>
          <item>
           <property name="text" >
-           <string>Block</string>
+           <string>Justified</string>
           </property>
          </item>
          <item>