#!/bin/bash # Do not warn if there were no real merge git rev-parse -q --verify HEAD^2 >/dev/null || exit echo echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" echo "! You probably used 'git pull' instead of 'git pull -r' !" echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" echo echo "You can still fix it - please do 'git pull -r' now." echo Git repository'/>
aboutsummaryrefslogtreecommitdiff
path: root/source/es/reportdesign
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2014-11-10 12:03:54 +0100
committerAndras Timar <andras.timar@collabora.com>2014-11-23 14:21:26 +0100
commit5da7698be5086a0317777dceb18dbccb89a2fa69 (patch)
tree0f63b6c9055ba5fd795e9cbc2493f99ff9ca0859 /source/es/reportdesign
parentf0108b522877624aaad39920a2f1a7a7e321c5a5 (diff)
update translatios for 4.3.4 rc1
and force-fix errors using pocheck Change-Id: I09744b64bf850a942a22bfd94405d7e1a01017ca
Diffstat (limited to 'source/es/reportdesign')
-rw-r--r--source/es/reportdesign/source/ui/dlg.po6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/es/reportdesign/source/ui/dlg.po b/source/es/reportdesign/source/ui/dlg.po
index bfe6d9a6848..780b241c970 100644
--- a/source/es/reportdesign/source/ui/dlg.po
+++ b/source/es/reportdesign/source/ui/dlg.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
"POT-Creation-Date: 2014-05-30 13:08+0200\n"
-"PO-Revision-Date: 2014-09-27 18:33+0000\n"
+"PO-Revision-Date: 2014-11-01 20:44+0000\n"
"Last-Translator: Adolfo <fito@libreoffice.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: es\n"
@@ -14,7 +14,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.5.1\n"
"X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1411842793.000000\n"
+"X-POOTLE-MTIME: 1414874641.000000\n"
#: CondFormat.src
msgctxt ""
@@ -566,7 +566,7 @@ msgctxt ""
"STR_RPT_HELP_GROUPON\n"
"string.text"
msgid "Select the value or range of values that starts a new group."
-msgstr "Seleccione el valor o el rango de valores que comienzan un nuevo grupo."
+msgstr "Seleccione el valor o el intervalo de valores que comienzan un grupo nuevo."
#: GroupsSorting.src
msgctxt ""