diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000000000000000000000000000000000..143f0739505f027693fb693778bd63f409367f27
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,21 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+# Unix-style newlines with a newline ending every file
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+[*.php]
+indent_style = space
+indent_size = 4
+[*.js]
+indent_style = space
+indent_size = 2
+[*.css]
+indent_style = space
+indent_size = 2
+[*.xml]
+indent_style = space
+indent_size = 4
diff --git a/.travis.yml b/.travis.yml
index dc2c543b07e0d95fbda743b1c14e1de0af8efe15..f4be5d2e118dd397413d72f252d7b4e92006864e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -99,6 +99,8 @@ script:
- php upgrade.php 3.6.0 3.7.0 >> upgrade.log
# - cat upgrade360370.log
- php upgrade2.php 3.6.0 3.7.0 >> upgrade2.log
+ - php upgrade.php 3.7.0 3.8.0 >> upgrade.log
+ - php upgrade2.php 3.7.0 3.8.0 >> upgrade2.log
# - cat upgrade2.log
- cd ../..
- date
diff --git a/.tx/config b/.tx/config
index d6e339462e3f0fdcb342a92e4f4b316bec49d5f4..e4d1fc65732c7338a1672b6270523d8c6129d953 100644
--- a/.tx/config
+++ b/.tx/config
@@ -218,12 +218,6 @@ source_file = htdocs/langs/en_US/orders.lang
source_lang = en_US
type = MOZILLAPROPERTIES
-[dolibarr.oscommerce]
-file_filter = htdocs/langs/<lang>/oscommerce.lang
-source_file = htdocs/langs/en_US/oscommerce.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
[dolibarr.other]
file_filter = htdocs/langs/<lang>/other.lang
source_file = htdocs/langs/en_US/other.lang
@@ -242,6 +236,18 @@ source_file = htdocs/langs/en_US/paypal.lang
source_lang = en_US
type = MOZILLAPROPERTIES
+[dolibarr.printipp]
+file_filter = htdocs/langs/<lang>/printipp.lang
+source_file = htdocs/langs/en_US/printipp.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
+[dolibarr.productbatch]
+file_filter = htdocs/langs/<lang>/productbatch.lang
+source_file = htdocs/langs/en_US/productbatch.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
[dolibarr.products]
file_filter = htdocs/langs/<lang>/products.lang
source_file = htdocs/langs/en_US/products.lang
@@ -319,4 +325,3 @@ file_filter = htdocs/langs/<lang>/workflow.lang
source_file = htdocs/langs/en_US/workflow.lang
source_lang = en_US
type = MOZILLAPROPERTIES
-
diff --git a/build/debian/README.howto b/build/debian/README.howto
index f9bb31c6fcf4cf0a4006d8d162f610f011e8d970..d44e2b692a624d57dfdfddfe40b97f5468cd2635 100644
--- a/build/debian/README.howto
+++ b/build/debian/README.howto
@@ -101,6 +101,12 @@ http://packages.qa.debian.org/package.html
http://bugs.debian.org/package
+##### Modify severity of a bug ticket
+
+- Send this email to control@bugs.debian.org and wait 10 minutes
+
+severity 123 xxx
+
##### Testing a package into unstable env
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index 370c04591a99cb1482bba5946bd421af2119c7bf..7d34993c5fe8f320052de7075d72eacbef2db0d1 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -365,6 +365,7 @@ if ($nboftargetok) {
print "Clean $BUILDROOT\n";
$ret=`rm -f $BUILDROOT/$PROJECT/.buildpath`;
$ret=`rm -fr $BUILDROOT/$PROJECT/.cache`;
+ $ret=`rm -fr $BUILDROOT/$PROJECT/.editorconfig`;
$ret=`rm -fr $BUILDROOT/$PROJECT/.externalToolBuilders`;
$ret=`rm -fr $BUILDROOT/$PROJECT/.git*`;
$ret=`rm -fr $BUILDROOT/$PROJECT/.project`;
@@ -373,7 +374,6 @@ if ($nboftargetok) {
$ret=`rm -fr $BUILDROOT/$PROJECT/.travis.yml`;
$ret=`rm -fr $BUILDROOT/$PROJECT/.tx`;
$ret=`rm -f $BUILDROOT/$PROJECT/build.xml`;
- $ret=`rm -f $BUILDROOT/$PROJECT/quickbuild.xml`;
$ret=`rm -f $BUILDROOT/$PROJECT/pom.xml`;
$ret=`rm -fr $BUILDROOT/$PROJECT/build/html`;
diff --git a/dev/translation/strip_language_file.php b/dev/translation/strip_language_file.php
index fc778770bb94ebc08ef99a7cafbf11e7ec3ff398..d6c45d9f249e33481e35b73709917c0855e73aef 100755
--- a/dev/translation/strip_language_file.php
+++ b/dev/translation/strip_language_file.php
@@ -1,9 +1,22 @@
#!/usr/bin/php
<?php
-/*
- * strip_language_file.php
+/* Copyright (C) 2014 by FromDual GmbH, licensed under GPL v2
+ * Copyright (C) 2014 Laurent Destailleur <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
- * (c) 2014 by FromDual GmbH, licensed under GPL v2
+ * -----
*
* Compares a secondary language translation file with its primary
* language file and strips redundant translations.
@@ -12,11 +25,10 @@
*
* Usage:
* cd htdocs/langs
- * ../../dev/translation/strip_language_file.php <primary_lang_dir> <secondary_lang_dir> <languagefile.lang>
+ * ../../dev/translation/strip_language_file.php <primary_lang_dir> <secondary_lang_dir> [file.lang|all]
*
- * Parameters:
- * 1 - Primary Language
- * 2 - Secondary Language
+ * To rename all .delta files, you can do
+ * for fic in `ls *.delta`; do f=`echo $fic | sed -e 's/\.delta//'`; echo $f; mv $f.delta $f; done
*
* Rules:
* secondary string == primary string -> strip
@@ -24,9 +36,6 @@
* secondary string not in primary -> strip and warning
* secondary string has no value -> strip and warning
* secondary string != primary string -> secondary.lang.delta
- *
- * To rename all .delta fils, you can do
- * for fic in `ls *.delta`; do f=`echo $fic | sed -e 's/\.delta//'`; echo $f; mv $f.delta $f; done
*/
/**
@@ -260,6 +269,9 @@ foreach($filesToProcess as $fileToProcess)
}
print "Output can be found at $output.\n";
+
+ print "To rename all .delta files, you can do\n";
+ print 'for fic in `ls *.delta`; do f=`echo $fic | sed -e \'s/\.delta//\'`; echo $f; mv $f.delta $f; done'."\n";
}
diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php
index 670260f12876dd13c92af584afeb4b6d4d9d16ba..f86e19050e465273efd2978382c09351c934f860 100644
--- a/htdocs/adherents/admin/adherent.php
+++ b/htdocs/adherents/admin/adherent.php
@@ -53,7 +53,7 @@ if ($action == 'update' || $action == 'add')
$constname=GETPOST('constname','alpha');
$constvalue=(GETPOST('constvalue_'.$constname) ? GETPOST('constvalue_'.$constname) : GETPOST('constvalue'));
- if (($constname=='ADHERENT_CARD_TYPE' || $constname=='ADHERENT_ETIQUETTE_TYPE') && $constvalue == -1) $constvalue='';
+ if (($constname=='ADHERENT_CARD_TYPE' || $constname=='ADHERENT_ETIQUETTE_TYPE' || $constname=='ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS') && $constvalue == -1) $constvalue='';
if ($constname=='ADHERENT_LOGIN_NOT_REQUIRED') // Invert choice
{
if ($constvalue) $constvalue=0;
@@ -209,6 +209,23 @@ if ($conf->facture->enabled)
}
print "</tr>\n";
print '</form>';
+
+ if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
+ {
+ $var=!$var;
+ print '<form action="adherent.php" method="POST">';
+ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+ print '<input type="hidden" name="action" value="update">';
+ print '<input type="hidden" name="constname" value="ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS">';
+ print '<tr '.$bc[$var].'><td>'.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").'</td>';
+ print '<td>';
+ print $form->select_produits($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS, 'constvalue_ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS');
+ print '</td><td align="center" width="80">';
+ print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
+ print '</td>';
+ }
+ print "</tr>\n";
+ print '</form>';
}
print '</table>';
diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php
index eade4bf7373012fd3adc771cf887f0cf1bba70d2..c01d3b5bc6be99e9fcf6228cb3b1eab849c8d2cc 100644
--- a/htdocs/adherents/card_subscriptions.php
+++ b/htdocs/adherents/card_subscriptions.php
@@ -30,6 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/cotisation.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
@@ -315,13 +316,13 @@ if ($user->rights->adherent->cotisation->creer && $action == 'cotisation' && ! $
}
}
else
- {
+ {
$error++;
$errmsg=$acct->error;
}
}
else
- {
+ {
$error++;
$errmsg=$acct->error;
}
@@ -385,6 +386,8 @@ if ($user->rights->adherent->cotisation->creer && $action == 'cotisation' && ! $
{
// Add line to draft invoice
$idprodsubscription=0;
+ if (! empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (! empty($conf->product->enabled) || ! empty($conf->service->enabled))) $idprodsubscription = $conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS;
+
$vattouse=0;
if (isset($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) && $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS == 'defaultforfoundationcountry')
{
@@ -947,9 +950,10 @@ if ($rowid)
print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="cotisation" size="6" value="'.GETPOST('cotisation').'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
// Label
- print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td>';
- print '<td><input name="label" type="text" size="32" value="'.$langs->trans("Subscription").' ';
- print dol_print_date(($datefrom?$datefrom:time()),"%Y").'" ></td></tr>';
+ print '<tr><td>'.$langs->trans("Label").'</td>';
+ print '<td><input name="label" type="text" size="32" value="';
+ if (empty($conf->global->MEMBER_NO_DEFAULT_LABEL)) print $langs->trans("Subscription").' '.dol_print_date(($datefrom?$datefrom:time()),"%Y");
+ print '"></td></tr>';
// Complementary action
if (! empty($conf->banque->enabled) || ! empty($conf->facture->enabled))
@@ -990,7 +994,13 @@ if ($rowid)
print $langs->trans("CreateDolibarrThirdParty");
print '</a>)';
}
- if (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') print '. '.$langs->trans("NoVatOnSubscription",0).'.';
+ if (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') print '. '.$langs->trans("NoVatOnSubscription",0);
+ if (! empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (! empty($conf->product->enabled) || ! empty($conf->service->enabled)))
+ {
+ $prodtmp=new Product($db);
+ $prodtmp->fetch($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS);
+ print '. '.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS", $prodtmp->getNomUrl(0));
+ }
print '<br>';
}
// Add invoice with payments
@@ -1009,7 +1019,13 @@ if ($rowid)
print $langs->trans("CreateDolibarrThirdParty");
print '</a>)';
}
- if (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') print '. '.$langs->trans("NoVatOnSubscription",0).'.';
+ if (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') print '. '.$langs->trans("NoVatOnSubscription",0);
+ if (! empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (! empty($conf->product->enabled) || ! empty($conf->service->enabled)))
+ {
+ $prodtmp=new Product($db);
+ $prodtmp->fetch($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS);
+ print '. '.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS", $prodtmp->getNomUrl(0));
+ }
print '<br>';
}
print '</td></tr>';
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 714fd2af3cab37690adb5cf54955ce1e998bc1a4..6c61c51f1f1c754488675bcc35c0a071acab0c7b 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1306,7 +1306,7 @@ class Adherent extends CommonObject
return $rowid;
}
else
- {
+ {
$this->db->rollback();
return -2;
}
diff --git a/htdocs/adherents/fiche_subscription.php b/htdocs/adherents/fiche_subscription.php
index 01a3ccc83fc728ccaecbcf10ab3ad2a148144878..6f0177d4b6f03c8c497dce5f8a305b6e09a830af 100644
--- a/htdocs/adherents/fiche_subscription.php
+++ b/htdocs/adherents/fiche_subscription.php
@@ -180,7 +180,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'edit')
$head[$h][2] = 'info';
$h++;
- dol_fiche_head($head, 'general', $langs->trans("Subscription"));
+ dol_fiche_head($head, 'general', $langs->trans("Subscription"), 0, 'payment');
print "\n";
print '<form name="update" action="'.$_SERVER["PHP_SELF"].'" method="post">';
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index c12e913e9c1d075dfe0e2936ca6ad007e3a434cb..8b6d833778ed7064747441894ff213a13759bd40 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -46,93 +46,97 @@ $boxes = array();
*/
if ($action == 'addconst')
-
{
dolibarr_set_const($db, "MAIN_BOXES_MAXLINES",$_POST["MAIN_BOXES_MAXLINES"],'',0,'',$conf->entity);
}
-if ($action == 'add')
-{
+if ($action == 'add') {
$error=0;
-
$db->begin();
-
- // Initialize distinct fkuser with all already existing values of fk_user (user that use a personalized view of boxes for page "pos")
- $distinctfkuser=array();
- if (! $error)
- {
- $sql = "SELECT fk_user";
- $sql.= " FROM ".MAIN_DB_PREFIX."user_param";
- $sql.= " WHERE param = 'MAIN_BOXES_".$db->escape(GETPOST("pos","alpha"))."' AND value = '1'";
- $sql.= " AND entity = ".$conf->entity;
-
- dol_syslog("boxes.php search fk_user to activate box for", LOG_DEBUG);
- $resql = $db->query($sql);
- if ($resql)
- {
- $num = $db->num_rows($resql);
- $i=0;
- while ($i < $num)
- {
- $obj=$db->fetch_object($resql);
- $distinctfkuser[$obj->fk_user]=$obj->fk_user;
- $i++;
- }
- }
- else
- {
- setEventMessage($db->lasterror(), 'errors');
- $error++;
- }
- }
-
- $distinctfkuser['0']='0'; // Add entry for fk_user = 0. We must use string as key and val
-
- foreach($distinctfkuser as $fk_user)
- {
- if (! $error && $fk_user != '')
- {
- $nbboxonleft=$nbboxonright=0;
- $sql = "SELECT box_order FROM ".MAIN_DB_PREFIX."boxes WHERE position = ".GETPOST("pos","alpha")." AND fk_user = ".$fk_user." AND entity = ".$conf->entity;
- dol_syslog("boxes.php activate box", LOG_DEBUG);
- $resql = $db->query($sql);
- if ($resql)
- {
- while($obj = $db->fetch_object($resql))
- {
- $boxorder=$obj->box_order;
- if (preg_match('/A/',$boxorder)) $nbboxonleft++;
- if (preg_match('/B/',$boxorder)) $nbboxonright++;
- }
- }
- else dol_print_error($db);
-
- $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes (";
- $sql.= "box_id, position, box_order, fk_user, entity";
- $sql.= ") values (";
- $sql.= GETPOST("boxid","int").", ".GETPOST("pos","alpha").", '".(($nbboxonleft > $nbboxonright) ? 'B01' : 'A01')."', ".$fk_user.", ".$conf->entity;
- $sql.= ")";
-
- dol_syslog("boxes.php activate box", LOG_DEBUG);
- $resql = $db->query($sql);
- if (! $resql)
- {
- setEventMessage($db->lasterror(), 'errors');
- $error++;
- }
- }
- }
-
- if (! $error)
- {
- header("Location: boxes.php");
- $db->commit();
- exit;
- }
- else
- {
- $db->rollback();
- }
+ if (isset($_POST['boxid']) && is_array($_POST['boxid']))
+ {
+ foreach($_POST['boxid'] as $boxid)
+ {
+ if (is_numeric($boxid['pos']) && $boxid['pos'] >= 0) // 0=Home, 1=...
+ {
+ $pos = $boxid['pos'];
+
+ // Initialize distinct fkuser with all already existing values of fk_user (user that use a personalized view of boxes for page "pos")
+ $distinctfkuser=array();
+ if (! $error)
+ {
+ $sql = "SELECT fk_user";
+ $sql.= " FROM ".MAIN_DB_PREFIX."user_param";
+ $sql.= " WHERE param = 'MAIN_BOXES_".$db->escape($pos)."' AND value = '1'";
+ $sql.= " AND entity = ".$conf->entity;
+ dol_syslog("boxes.php search fk_user to activate box for", LOG_DEBUG);
+ $resql = $db->query($sql);
+ if ($resql)
+ {
+ $num = $db->num_rows($resql);
+ $i=0;
+ while ($i < $num)
+ {
+ $obj=$db->fetch_object($resql);
+ $distinctfkuser[$obj->fk_user]=$obj->fk_user;
+ $i++;
+ }
+ }
+ else
+ {
+ setEventMessage($db->lasterror(), 'errors');
+ $error++;
+ }
+ }
+
+ $distinctfkuser['0']='0'; // Add entry for fk_user = 0. We must use string as key and val
+
+ foreach($distinctfkuser as $fk_user)
+ {
+ if (! $error && $fk_user != '')
+ {
+ $nbboxonleft=$nbboxonright=0;
+ $sql = "SELECT box_order FROM ".MAIN_DB_PREFIX."boxes WHERE position = ".$pos." AND fk_user = ".$fk_user." AND entity = ".$conf->entity;
+ dol_syslog("boxes.php activate box", LOG_DEBUG);
+ $resql = $db->query($sql);
+ if ($resql)
+ {
+ while($obj = $db->fetch_object($resql))
+ {
+ $boxorder=$obj->box_order;
+ if (preg_match('/A/',$boxorder)) $nbboxonleft++;
+ if (preg_match('/B/',$boxorder)) $nbboxonright++;
+ }
+ }
+ else dol_print_error($db);
+
+ $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes (";
+ $sql.= "box_id, position, box_order, fk_user, entity";
+ $sql.= ") values (";
+ $sql.= $boxid['value'].", ".$pos.", '".(($nbboxonleft > $nbboxonright) ? 'B01' : 'A01')."', ".$fk_user.", ".$conf->entity;
+ $sql.= ")";
+
+ dol_syslog("boxes.php activate box", LOG_DEBUG);
+ $resql = $db->query($sql);
+ if (! $resql)
+ {
+ setEventMessage($db->lasterror(), 'errors');
+ $error++;
+ }
+ }
+ }
+ }
+ }
+ }
+ if (! $error)
+ {
+ $db->commit();
+ $action='';
+ }
+ else
+ {
+ $db->rollback();
+ }
}
if ($action == 'delete')
@@ -317,14 +321,18 @@ if ($resql)
$boxtoadd=InfoBox::listBoxes($db,'available',-1,null,$actives);
print "<br>\n";
+print "\n\n".'<!-- Boxes Available -->'."\n";
print_titre($langs->trans("BoxesAvailable"));
-print '<table class="noborder" width="100%">';
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
+print '<input type="hidden" name="action" value="add">'."\n";
+print '<table class="noborder" width="100%">'."\n";
print '<tr class="liste_titre">';
print '<td width="300">'.$langs->trans("Box").'</td>';
print '<td>'.$langs->trans("Note").'/'.$langs->trans("Parameters").'</td>';
print '<td>'.$langs->trans("SourceFile").'</td>';
-print '<td width="160">'.$langs->trans("ActivateOn").'</td>';
+print '<td width="160" align="center">'.$langs->trans("ActivateOn").'</td>';
print "</tr>\n";
$var=true;
foreach($boxtoadd as $box)
@@ -341,12 +349,10 @@ foreach($boxtoadd as $box)
}
print "\n".'<!-- Box '.$box->boxcode.' -->'."\n";
- print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
- print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
- print '<tr '.$bc[$var].'>';
+ print '<tr '.$bc[$var].'>'."\n";
print '<td>'.img_object("",$logo).' '.$langs->transnoentitiesnoconv($box->boxlabel);
if (! empty($box->class) && preg_match('/graph_/',$box->class)) print ' ('.$langs->trans("Graph").')';
- print '</td>';
+ print '</td>'."\n";
print '<td>';
if ($box->note == '(WarningUsingThisBoxSlowDown)')
{
@@ -354,22 +360,24 @@ foreach($boxtoadd as $box)
print $langs->trans("WarningUsingThisBoxSlowDown");
}
else print ($box->note?$box->note:' ');
- print '</td>';
- print '<td>' . $box->sourcefile . '</td>';
+ print '</td>'."\n";
+ print '<td>' . $box->sourcefile . '</td>'."\n";
// Pour chaque position possible, on affiche un lien d'activation si boite non deja active pour cette position
- print '<td>';
- print $form->selectarray("pos",$pos_name,0,0,0,0,'',1);
- print '<input type="hidden" name="action" value="add">';
- print '<input type="hidden" name="boxid" value="'.$box->box_id.'">';
- print ' <input type="submit" class="button" name="button" value="'.$langs->trans("Activate").'">';
+ print '<td class="center">';
+ print $form->selectarray("boxid[".$box->box_id."][pos]", $pos_name, 0, 1, 0, 0, '', 1)."\n";
+ print '<input type="hidden" name="boxid['.$box->box_id.'][value]" value="'.$box->box_id.'">'."\n";
print '</td>';
- print '</tr>';
- print '</form>';
+ print '</tr>'."\n";
}
-print '</table>';
+print '</table>'."\n";
+print '<div class="right">';
+print '<input type="submit" class="button"'.(count($boxtoadd)?'':' disabled="disabled"').' value="'.$langs->trans("Activate").'">';
+print '</div>'."\n";
+print '</form>';
+print "\n".'<!-- End Boxes Available -->'."\n";
// Activated boxes
@@ -421,8 +429,8 @@ foreach($boxactivated as $key => $box)
$hasprevious=($key != 0);
print '<td align="center">'.($key+1).'</td>';
print '<td align="center">';
- print ($hasnext?'<a href="boxes.php?action=switch&switchfrom='.$box->rowid.'&switchto='.$boxactivated[$key+1]->rowid.'">'.img_down().'</a> ':'');
- print ($hasprevious?'<a href="boxes.php?action=switch&switchfrom='.$box->rowid.'&switchto='.$boxactivated[$key-1]->rowid.'">'.img_up().'</a>':'');
+ print ($hasnext?'<a href="boxes.php?action=switch&switchfrom='.$box->rowid.'&switchto='.$boxactivated[$key+1]->rowid.'">'.img_down().'</a> ':'');
+ print ($hasprevious?'<a href="boxes.php?action=switch&switchfrom='.$box->rowid.'&switchto='.$boxactivated[$key-1]->rowid.'">'.img_up().'</a>':'');
print '</td>';
print '<td align="center">';
print '<a href="boxes.php?rowid='.$box->rowid.'&action=delete">'.img_delete().'</a>';
@@ -436,13 +444,14 @@ print '</table><br>';
// Other parameters
+print "\n\n".'<!-- Other Const -->'."\n";
print_titre($langs->trans("Other"));
-print '<table class="noborder" width="100%">';
-
-$var=false;
print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="addconst">';
+print '<table class="noborder" width="100%">';
+
+$var=false;
print '<tr class="liste_titre">';
print '<td class="liste_titre">'.$langs->trans("Parameter").'</td>';
print '<td class="liste_titre">'.$langs->trans("Value").'</td>';
@@ -459,9 +468,10 @@ print '<td align="right">';
print '<input type="submit" class="button" value="'.$langs->trans("Save").'" name="Button">';
print '</td>'."\n";
print '</tr>';
-print '</form>';
print '</table>';
+print '</form>';
+print "\n".'<!-- End Other Const -->'."\n";
llxFooter();
diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index 48e637fb8a3db3c570c8bff81de3be9627bd38b9..a64e3856dbc80340a64e26bc73e9974627da5b33 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -260,7 +260,7 @@ if ($result)
// Note
print '<td>';
- print '<input type="text" id="note_'.$i.'"class="flat inputforupdate" size="40" name="const['.$i.'][note]" value="'.htmlspecialchars($obj->note,1).'">';
+ print '<input type="text" id="note_'.$i.'" class="flat inputforupdate" size="40" name="const['.$i.'][note]" value="'.htmlspecialchars($obj->note,1).'">';
print '</td>';
// Entity limit to superadmin
diff --git a/htdocs/admin/supplierinvoice_extrafields.php b/htdocs/admin/supplierinvoice_extrafields.php
index ba584bdae8cb97522dc58302f220acc95e08f4b7..40494f9c286f89a18926b691d2f6dbc5aa3df7fb 100644
--- a/htdocs/admin/supplierinvoice_extrafields.php
+++ b/htdocs/admin/supplierinvoice_extrafields.php
@@ -38,6 +38,7 @@ if (!$user->admin)
$langs->load("admin");
$langs->load("other");
$langs->load("bills");
+$langs->load("orders");
$langs->load("suppliers");
$extrafields = new ExtraFields($db);
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 596ce207f9b79609ba1465012d7015610943ab88..9d98823289c268d634c340586f45352215c1b5dd 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1248,34 +1248,6 @@ if ($id > 0)
if ($action != 'edit')
{
-
- if (empty($conf->global->SOCIETE_DISABLE_BUILDDOC)) {
- print '<div class="fichecenter"><div class="fichehalfleft">';
- print '<a name="builddoc"></a>'; // ancre
-
- /*
- * Documents generes
- */
-
- $filedir=$conf->agenda->multidir_output[$conf->entity].'/'.$object->id;
- $urlsource=$_SERVER["PHP_SELF"]."?socid=".$object->id;
-
- $genallowed=$user->rights->agenda->myactions->create;
- $delallowed=$user->rights->agenda->myactions->delete;
-
- $var=true;
-
- $somethingshown=$formfile->show_documents('agenda',$object->id,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,0,0,'','','',$object->default_lang);
-
- print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-
-
- print '</div></div></div>';
-
- print '<div style="clear:both;"> </div>';
- }
-
-
// Link to agenda views
print '<div id="agendaviewbutton">';
print '<form name="listactionsfiltermonth" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST" style="float: left; padding-right: 10px;">';
@@ -1315,6 +1287,33 @@ if ($id > 0)
print img_picto($langs->trans("ViewCal"),'object_calendarperuser','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewperuser" value="'.$langs->trans("ViewPerUser").'">';
print '</form>'."\n";
print '</div>';
+
+ if (empty($conf->global->AGENDA_DISABLE_BUILDDOC))
+ {
+ print '<div style="clear:both;"> </div><div class="fichecenter"><div class="fichehalfleft">';
+ print '<a name="builddoc"></a>'; // ancre
+
+ /*
+ * Documents generes
+ */
+
+ $filedir=$conf->agenda->multidir_output[$conf->entity].'/'.$object->id;
+ $urlsource=$_SERVER["PHP_SELF"]."?socid=".$object->id;
+
+ $genallowed=$user->rights->agenda->myactions->create;
+ $delallowed=$user->rights->agenda->myactions->delete;
+
+ $var=true;
+
+ $somethingshown=$formfile->show_documents('agenda',$object->id,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,0,0,'','','',$object->default_lang);
+
+ print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+
+
+ print '</div></div></div>';
+
+ print '<div style="clear:both;"> </div>';
+ }
}
}
diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php
index 127e428162c258e5d458e4a1e9f343a497c1ec1f..eba7ea9d67b1f3c1e3f93a3f7de39b028b94a776 100644
--- a/htdocs/compta/bank/search.php
+++ b/htdocs/compta/bank/search.php
@@ -175,7 +175,8 @@ if ($resql)
print_barre_liste($langs->trans("BankTransactions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num);
}
- print '<form method="post" action="search.php" name="search_form">';
+ print '<form method="post" action="search.php" name="search_form">'."\n";
+ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
$moreforfilter .= $langs->trans('Period') . ' ' . $langs->trans('StartDate') . ': ';
$moreforfilter .= $form->select_date($search_dt_start, 'search_start_dt', 0, 0, 1, "search_form", 1, 1, 1);
@@ -185,10 +186,10 @@ if ($resql)
if ($moreforfilter) {
print '<div class="liste_titre">';
print $moreforfilter;
- print '</div>';
+ print '</div>'."\n";
}
- print '<table class="liste" width="100%">';
+ print '<table class="liste" width="100%">'."\n";
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans('Ref'),$_SERVER['PHP_SELF'],'b.rowid','',$param,'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans('DateOperationShort'),$_SERVER['PHP_SELF'],'b.dateo','',$param,'align="center"',$sortfield,$sortorder);
@@ -202,7 +203,6 @@ if ($resql)
print '<td class="liste_titre" align="left"> '.$langs->trans("Account").'</td>';
print "</tr>\n";
- print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<tr class="liste_titre">';
print '<td class="liste_titre"> </td>';
print '<td class="liste_titre"> </td>';
@@ -330,7 +330,7 @@ if ($resql)
}
print "</table>";
-
+ print '</form>';
$db->free($resql);
}
else
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 1b0438bdea17b38dc391ee552c4384910b717d2f..f4634c91e5c2f6ffb4497462a64a2339d7cd97f1 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3603,7 +3603,7 @@ abstract class CommonObject
break;
}
- $out .= '</td>'."\n";
+ $out .= '</td>';
if (! empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) $out .= '</tr>';
else $out .= '</tr>';
@@ -3611,7 +3611,6 @@ abstract class CommonObject
}
}
$out .= "\n";
- $out .= '<!-- /showOptionalsInput --> ';
$out .= '
<script type="text/javascript">
jQuery(document).ready(function() {
@@ -3640,7 +3639,8 @@ abstract class CommonObject
setListDependencies();
});
- </script>';
+ </script>'."\n";
+ $out .= '<!-- /showOptionalsInput --> '."\n";
}
return $out;
}
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
old mode 100644
new mode 100755
index b70820463b067d3adb6b7e28e32f8fef82d89b07..14b7c78cc7d0ce421baa1cf35050640dda3465ce
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1906,7 +1906,7 @@ class Form
$sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration,";
$sql.= " pfp.ref_fourn, pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.quantity, pfp.remise_percent, pfp.remise, pfp.unitprice,";
- $sql.= " s.nom as name";
+ $sql.= " pfp.fk_price_expression, pfp.fk_product, pfp.tva_tx, s.nom as name";
$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
if ($socid) $sql.= " AND pfp.fk_soc = ".$socid;
@@ -1943,6 +1943,7 @@ class Form
$result=$this->db->query($sql);
if ($result)
{
+ require_once DOL_DOCUMENT_ROOT.'/product/class/priceparser.class.php';
$num = $this->db->num_rows($result);
@@ -1987,6 +1988,17 @@ class Form
{
$outqty=$objp->quantity;
$outdiscount=$objp->remise_percent;
+ if (!empty($objp->fk_price_expression)) {
+ $priceparser = new PriceParser($this->db);
+ $price_result = $priceparser->parseProductSupplier($objp->fk_product, $objp->fk_price_expression, $objp->quantity, $objp->tva_tx);
+ if ($price_result >= 0) {
+ $objp->fprice = $price_result;
+ if ($objp->quantity >= 1)
+ {
+ $objp->unitprice = $objp->fprice / $objp->quantity;
+ }
+ }
+ }
if ($objp->quantity == 1)
{
$opt.= price($objp->fprice,1,$langs,0,0,-1,$conf->currency)."/";
@@ -2075,7 +2087,7 @@ class Form
$sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration,";
$sql.= " pfp.ref_fourn, pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.quantity, pfp.unitprice,";
- $sql.= " s.nom as name";
+ $sql.= " pfp.fk_price_expression, pfp.fk_product, pfp.tva_tx, s.nom as name";
$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON pfp.fk_soc = s.rowid";
@@ -2100,6 +2112,7 @@ class Form
}
else
{
+ require_once DOL_DOCUMENT_ROOT.'/product/class/priceparser.class.php';
$form.= '<option value="0"> </option>';
$i = 0;
@@ -2114,6 +2127,17 @@ class Form
}
$opt.= '>'.$objp->name.' - '.$objp->ref_fourn.' - ';
+ if (!empty($objp->fk_price_expression)) {
+ $priceparser = new PriceParser($this->db);
+ $price_result = $priceparser->parseProductSupplier($objp->fk_product, $objp->fk_price_expression, $objp->quantity, $objp->tva_tx);
+ if ($price_result >= 0) {
+ $objp->fprice = $price_result;
+ if ($objp->quantity >= 1)
+ {
+ $objp->unitprice = $objp->fprice / $objp->quantity;
+ }
+ }
+ }
if ($objp->quantity == 1)
{
$opt.= price($objp->fprice,1,$langs,0,0,-1,$conf->currency)."/";
@@ -2978,12 +3002,13 @@ class Form
// Show JQuery confirm box. Note that global var $useglobalvars is used inside this template
$formconfirm.= '<div id="'.$dialogconfirm.'" title="'.dol_escape_htmltag($title).'" style="display: none;">';
if (! empty($more)) {
- $formconfirm.= '<p>'.$more.'</p>';
+ $formconfirm.= '<div>'.$more.'</div>';
}
$formconfirm.= img_help('','').' '.$question;
- $formconfirm.= '</div>';
+ $formconfirm.= '</div>'."\n";
- $formconfirm.= '<script type="text/javascript">';
+ $formconfirm.= "\n<!-- begin ajax form_confirm page=".$page." -->\n";
+ $formconfirm.= '<script type="text/javascript">'."\n";
$formconfirm.='
$(function() {
$( "#'.$dialogconfirm.'" ).dialog({
@@ -3050,13 +3075,14 @@ class Form
}
});
</script>';
+ $formconfirm.= "<!-- end ajax form_confirm -->\n";
}
else
{
$formconfirm.= "\n<!-- begin form_confirm page=".$page." -->\n";
$formconfirm.= '<form method="POST" action="'.$page.'" class="notoptoleftroright">'."\n";
- $formconfirm.= '<input type="hidden" name="action" value="'.$action.'">';
+ $formconfirm.= '<input type="hidden" name="action" value="'.$action.'">'."\n";
$formconfirm.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
$formconfirm.= '<table width="100%" class="valid">'."\n";
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 2e3168416963994d27ae98c71bdae56284a353ca..8f5a441967e0bf4dc61ae00f0b5df81026ed529f 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -301,12 +301,10 @@ class FormFile
$modellist=ModeleThirdPartyDoc::liste_modeles($this->db);
}
}
-
else if ($modulepart == 'agenda')
{
null;
}
-
else if ($modulepart == 'propal')
{
if (is_array($genallowed)) $modellist=$genallowed;
@@ -439,7 +437,7 @@ class FormFile
}
else
{
-
+
// For normalized standard modules
$file=dol_buildpath('/core/modules/'.$modulepart.'/modules_'.$modulepart.'.php',0);
if (file_exists($file))
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 44e962de3ea6249ff34b97623f290f2b5efc7265..236f418dd8629c9a91e341df6bf90756bfd52d68 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -446,7 +446,7 @@ function actions_prepare_head($object)
$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
$head[$h][0] = DOL_URL_ROOT.'/comm/action/document.php?id='.$object->id;
$head[$h][1] = $langs->trans("Documents");
- if($nbFiles > 0) $head[$h][1].= ' ('.$nbFiles.')';
+ if ($nbFiles > 0) $head[$h][1].= ' <span class="badge">'.$nbFiles.'</span>';
$head[$h][2] = 'documents';
$h++;
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index d640519594e02691f2681992705c5ac3f5e8272c..06a187fd7dee5924007fcbb62f0d0ddf1c390a0e 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -196,8 +196,6 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2406__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '/compta/export/', 'Export', 1, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 3, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2407__+MAX_llx_menu__, 'accountancy', '', 2406__+MAX_llx_menu__, '/compta/export/index.php', 'New', 2, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 0, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION', __HANDLER__, 'left', 2408__+MAX_llx_menu__, 'accountancy', '', 2406__+MAX_llx_menu__, '/compta/export/list.php', 'List', 2, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 1, __ENTITY__);
--- Fiscal year
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled"', __HANDLER__, 'left', 114__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/fiscalyear.php?leftmenu=setup', 'Fiscalyear', 1, 'admin', '', '', 2, 5, __ENTITY__);
-- Rapports
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2700__+MAX_llx_menu__, 'accountancy', 'ca', 6__+MAX_llx_menu__, '/compta/resultat/index.php?leftmenu=ca&mainmenu=accountancy', 'Reportings', 0, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 11, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2701__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/resultat/index.php?leftmenu=ca', 'ReportInOut', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 0, __ENTITY__);
@@ -208,6 +206,9 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2708__+MAX_llx_menu__, 'accountancy', '', 2703__+MAX_llx_menu__, '/compta/stats/cabyprodserv.php?leftmenu=ca', 'ByProductsAndServices', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2706__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/journal/sellsjournal.php?leftmenu=ca', 'SellsJournal', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2707__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/journal/purchasesjournal.php?leftmenu=ca', 'PurchasesJournal', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
+-- Fiscal year
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled"', __HANDLER__, 'left', 2750__+MAX_llx_menu__, 'home', '', 6__+MAX_llx_menu__, '/accountancy/admin/fiscalyear.php?leftmenu=setup', 'Fiscalyear', 1, 'main', '$user->rights->accounting->fiscalyear', '', 2, 20, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled"', __HANDLER__, 'left', 2751__+MAX_llx_menu__, 'home', '', 6__+MAX_llx_menu__, '/accountancy/admin/account.php?mainmenu=accountancy', 'Chartofaccounts', 1, 'main', '$user->rights->accounting->chartofaccount', '', 2, 21, __ENTITY__);
-- Check deposit
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1711__+MAX_llx_menu__, 'accountancy', 'checks', 14__+MAX_llx_menu__, '/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=bank', 'MenuChequeDeposits', 0, 'bills', '$user->rights->banque->lire', '', 2, 9, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1712__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/card.php?leftmenu=checks&action=new', 'NewCheckDeposit', 1, 'compta', '$user->rights->banque->lire', '', 2, 0, __ENTITY__);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index aaf24d5b07ed9b47082235835d7b7a6cf7fad01c..a2c28280984f7a479670689448ec7ca264a8a566 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -702,7 +702,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
{
$langs->load("contracts");
$newmenu->add("/contrat/index.php?leftmenu=contracts", $langs->trans("Contracts"), 0, $user->rights->contrat->lire, '', $mainmenu, 'contracts');
- $newmenu->add("/contrat/card.php?&action=create&leftmenu=contracts", $langs->trans("NewContract"), 1, $user->rights->contrat->creer);
+ $newmenu->add("/contrat/card.php?action=create&leftmenu=contracts", $langs->trans("NewContract"), 1, $user->rights->contrat->creer);
$newmenu->add("/contrat/list.php?leftmenu=contracts", $langs->trans("List"), 1, $user->rights->contrat->lire);
$newmenu->add("/contrat/services.php?leftmenu=contracts", $langs->trans("MenuServices"), 1, $user->rights->contrat->lire);
if (empty($leftmenu) || $leftmenu=="contracts") $newmenu->add("/contrat/services.php?leftmenu=contracts&mode=0", $langs->trans("MenuInactiveServices"), 2, $user->rights->contrat->lire);
@@ -1360,7 +1360,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
{
for ($j=0; $j < $tabul; $j++)
{
- $tabstring.=' ';
+ $tabstring.=' ';
}
}
diff --git a/htdocs/core/modules/modDynamicPrices.class.php b/htdocs/core/modules/modDynamicPrices.class.php
new file mode 100755
index 0000000000000000000000000000000000000000..c1450bc3b27695e6912e9c211c227717c4386654
--- /dev/null
+++ b/htdocs/core/modules/modDynamicPrices.class.php
@@ -0,0 +1,122 @@
+<?php
+/* Copyright (C) 2014 Ion Agorria <ion@agorria.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \defgroup produit Module dynamic prices
+ * \brief Module to manage dynamic prices in products
+ * \file htdocs/core/modules/modDynamicPrices.class.php
+ * \ingroup produit
+ * \brief File to describe module to manage dynamic prices in products
+ */
+include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+
+
+/**
+ * Class descriptor of DynamicPrices module
+ */
+class modDynamicPrices extends DolibarrModules
+{
+
+ /**
+ * Constructor. Define names, constants, directories, boxes, permissions
+ *
+ * @param DoliDB $db Database handler
+ */
+ function __construct($db)
+ {
+ $this->db = $db;
+ $this->numero = 2200;
+
+ $this->family = "products";
+ // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+ $this->name = preg_replace('/^mod/i','',get_class($this));
+ $this->description = "Enable the usage of math expressions for prices";
+ $this->version = 'experimental'; // 'experimental' or 'dolibarr' or version
+ // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+ $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+ // Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
+ $this->special = 0;
+ // Name of image file used for this module.
+ $this->picto='technic';
+
+ // Data directories to create when module is enabled
+ $this->dirs = array();
+
+ // Config pages
+ //-------------
+ //$this->config_page_url = array("dynamicprices.php@dynamicprices");
+
+ // Dependancies
+ //-------------
+ $this->depends = array();
+ $this->requiredby = array();
+ $this->langfiles = array("other");
+
+ // Constantes
+ //-----------
+ $this->const = array();
+
+ // New pages on tabs
+ // -----------------
+ $this->tabs = array();
+
+ // Boxes
+ //------
+ $this->boxes = array();
+
+ // Permissions
+ //------------
+ $this->rights = array();
+ $this->rights_class = 'dynamicprices';
+ $r=0;
+ }
+
+
+ /**
+ * Function called when module is enabled.
+ * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+ * It also creates data directories
+ *
+ * @param string $options Options when enabling module ('', 'noboxes')
+ * @return int 1 if OK, 0 if KO
+ */
+ function init($options='')
+ {
+ // Prevent pb of modules not correctly disabled
+ //$this->remove($options);
+
+ $sql = array();
+
+ return $this->_init($sql,$options);
+ }
+
+ /**
+ * Function called when module is disabled.
+ * Remove from database constants, boxes and permissions from Dolibarr database.
+ * Data directories are not deleted
+ *
+ * @param string $options Options when enabling module ('', 'noboxes')
+ * @return int 1 if OK, 0 if KO
+ */
+ function remove($options='')
+ {
+ $sql = array();
+
+ return $this->_remove($sql,$options);
+ }
+
+}
diff --git a/htdocs/core/modules/modMargin.class.php b/htdocs/core/modules/modMargin.class.php
index b17d82d051d9d5348ce2729e75af197f0ca9bd5f..19100576a836beeb3a6744ea1cbae84f43168b17 100644
--- a/htdocs/core/modules/modMargin.class.php
+++ b/htdocs/core/modules/modMargin.class.php
@@ -106,8 +106,8 @@ class modMargin extends DolibarrModules
'url'=>'/margin/index.php',
'langs'=>'margins', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
'position'=>100,
- 'enabled'=>'$user->rights->margins->liretous', // Define condition to show or hide menu entry. Use '$conf->monmodule->enabled' if entry must be visible if module is enabled.
- 'perms'=>'1', // Use 'perms'=>'$user->rights->monmodule->level1->level2' if you want your menu with a permission rules
+ 'enabled'=>'$conf->margin->enabled', // Define condition to show or hide menu entry. Use '$conf->monmodule->enabled' if entry must be visible if module is enabled.
+ 'perms'=>'$user->rights->margins->liretous', // Use 'perms'=>'$user->rights->monmodule->level1->level2' if you want your menu with a permission rules
'target'=>'',
'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
$r++;
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 61c262446922b0be6d8503aef59d768e8b7d5a61..8b7e5e0883060e72600f82eb01cffbe977a5d6c4 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -49,7 +49,6 @@ $(document).ready(function () {
<div align="center">
<div class="login_vertical_align">
-
<form id="login" name="login" method="post" action="<?php echo $php_self; ?>">
<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
<input type="hidden" name="loginfunction" value="loginfunction" />
@@ -110,7 +109,7 @@ if (! empty($hookmanager->resArray['options'])) {
if ($captcha) {
// TODO: provide accessible captha variants
?>
- <!-- Captcha -->
+<!-- Captcha -->
<tr><td valign="middle" class="loginfield nowrap"><label for="securitycode"><b><?php echo $langs->trans('SecurityCode'); ?></b></label></td>
<td valign="top" class="nowrap none" align="left">
@@ -191,18 +190,14 @@ if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file
echo '</div>';
}
-
?>
</div>
-
+</div>
</div>
</form>
-
-
-
<?php if (! empty($_SESSION['dol_loginmesg']))
{
?>
@@ -216,21 +211,17 @@ if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file
<?php if ($main_home)
{
?>
- <div class="login_main_home center" style="max-width: 80%">
- <?php echo $main_home; ?>
- </div><br>
+<!-- main_home message -->
+<div class="login_main_home center" style="max-width: 80%"><?php echo $main_home; ?></div>
+<br>
<?php
}
?>
-
<!-- authentication mode = <?php echo $main_authentication ?> -->
<!-- cookie name used for this session = <?php echo $session_name ?> -->
<!-- urlfrom in this session = <?php echo isset($_SESSION["urlfrom"])?$_SESSION["urlfrom"]:''; ?> -->
-
<!-- Common footer is not used for login page, this is same than footer but inside login tpl -->
-
<?php if (! empty($conf->global->MAIN_HTML_FOOTER)) print $conf->global->MAIN_HTML_FOOTER; ?>
-
<?php
// Google Analytics (need Google module)
if (! empty($conf->google->enabled) && ! empty($conf->global->MAIN_GOOGLE_AN_ID))
@@ -276,10 +267,8 @@ if (! empty($conf->google->enabled) && ! empty($conf->global->MAIN_GOOGLE_AD_CLI
}
}
?>
-
-
</div>
-
+</div>
</body>
</html>
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index 1c8bb07f56056eb3fb2790b1c2ad15c4f3a21a2d..3d2ea127b8506947c2c17f31e53b8a88b2bcbc12 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -45,7 +45,7 @@ if (empty($inputalsopricewithtax)) $inputalsopricewithtax=0;
<?php if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { ?>
<td align="center"><?php $coldisplay++; ?><?php echo ($i+1); ?></td>
<?php } ?>
- <td><?php $coldisplay++; ?><div id="<?php echo $line->rowid; ?>"></div>
+ <td><?php $coldisplay++; ?><div id="row-<?php echo $line->id; ?>"></div>
<?php if (($line->info_bits & 2) == 2) { ?>
<a href="<?php echo DOL_URL_ROOT.'/comm/remx.php?id='.$this->socid; ?>">
<?php
diff --git a/htdocs/externalsite/frames.php b/htdocs/externalsite/frames.php
index 3832408818090ba28744676dc07727da1bc10efc..c0b5cf92e7e53b75daa6b5f5fce91afb41e22b27 100644
--- a/htdocs/externalsite/frames.php
+++ b/htdocs/externalsite/frames.php
@@ -58,7 +58,7 @@ print "
<noframes>
<body>
- <br><div class="center">
+ <br><div class=\"center\">
Sorry, your browser is too old or not correctly configured to view this area.<br>
Your browser must support frames.<br>
</div>
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index d69de2f1fae7ec061c687af5f70d4db8d6a96291..ee269646c84b6e2e9d40f5c5ae8b43464c0d0b76 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -29,7 +29,7 @@
* \brief File that include conf.php file and commons lib like functions.lib.php
*/
-if (! defined('DOL_VERSION')) define('DOL_VERSION','3.7.0-beta');
+if (! defined('DOL_VERSION')) define('DOL_VERSION','3.8.0-alpha');
if (! defined('EURO')) define('EURO',chr(128));
// Define syslog constants
diff --git a/htdocs/fourn/ajax/getSupplierPrices.php b/htdocs/fourn/ajax/getSupplierPrices.php
old mode 100644
new mode 100755
index a6695dc694df84ed4efd3df97bd1ade173df57f2..cdff85ccde079d88f9e8f00762fdd4b02250038e
--- a/htdocs/fourn/ajax/getSupplierPrices.php
+++ b/htdocs/fourn/ajax/getSupplierPrices.php
@@ -48,7 +48,7 @@ if (! empty($idprod))
$sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration,";
$sql.= " pfp.ref_fourn,";
$sql.= " pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.remise_percent, pfp.quantity, pfp.unitprice, pfp.charges, pfp.unitcharges,";
- $sql.= " s.nom as name";
+ $sql.= " pfp.fk_price_expression, pfp.tva_tx, s.nom as name";
$sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = pfp.fk_product";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = pfp.fk_soc";
@@ -66,11 +66,24 @@ if (! empty($idprod))
if ($num)
{
+ require_once DOL_DOCUMENT_ROOT.'/product/class/priceparser.class.php';
$i = 0;
while ($i < $num)
{
$objp = $db->fetch_object($result);
+ if (!empty($objp->fk_price_expression)) {
+ $priceparser = new PriceParser($db);
+ $price_result = $priceparser->parseProductSupplier($idprod, $objp->fk_price_expression, $objp->quantity, $objp->tva_tx);
+ if ($price_result >= 0) {
+ $objp->fprice = $price_result;
+ if ($objp->quantity >= 1)
+ {
+ $objp->unitprice = $objp->fprice / $objp->quantity;
+ }
+ }
+ }
+
$price = $objp->fprice * (1 - $objp->remise_percent / 100);
$unitprice = $objp->unitprice * (1 - $objp->remise_percent / 100);
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
old mode 100644
new mode 100755
index 75ac674e877b6f9775234b7ed0da6829f2316b2c..52b9fc80c21f04960ab059ee1cca7ef27b09a08a
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -27,6 +27,7 @@
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/priceparser.class.php';
/**
@@ -55,6 +56,8 @@ class ProductFournisseur extends Product
var $fourn_unitprice;
var $fourn_tva_npr;
+ var $fk_price_expression;
+
/**
* Constructor
@@ -320,13 +323,14 @@ class ProductFournisseur extends Product
/**
* Loads the price information of a provider
*
- * @param int $rowid Line id
- * @return int < 0 if KO, 0 if OK but not found, > 0 if OK
+ * @param int $rowid Line id
+ * @param int $ignore_expression Ignores the math expression for calculating price and uses the db value instead
+ * @return int < 0 if KO, 0 if OK but not found, > 0 if OK
*/
- function fetch_product_fournisseur_price($rowid)
+ function fetch_product_fournisseur_price($rowid, $ignore_expression = 0)
{
$sql = "SELECT pfp.rowid, pfp.price, pfp.quantity, pfp.unitprice, pfp.remise_percent, pfp.remise, pfp.tva_tx, pfp.fk_availability,";
- $sql.= " pfp.fk_soc, pfp.ref_fourn, pfp.fk_product, pfp.charges, pfp.unitcharges"; // , pfp.recuperableonly as fourn_tva_npr"; FIXME this field not exist in llx_product_fournisseur_price
+ $sql.= " pfp.fk_soc, pfp.ref_fourn, pfp.fk_product, pfp.charges, pfp.unitcharges, pfp.fk_price_expression"; // , pfp.recuperableonly as fourn_tva_npr"; FIXME this field not exist in llx_product_fournisseur_price
$sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
$sql.= " WHERE pfp.rowid = ".$rowid;
@@ -351,6 +355,25 @@ class ProductFournisseur extends Product
$this->fk_product = $obj->fk_product;
$this->fk_availability = $obj->fk_availability;
//$this->fourn_tva_npr = $obj->fourn_tva_npr; // FIXME this field not exist in llx_product_fournisseur_price
+ $this->fk_price_expression = $obj->fk_price_expression;
+
+ if (empty($ignore_expression) && !empty($this->fk_price_expression)) {
+ $priceparser = new PriceParser($this->db);
+ $price_result = $priceparser->parseProductSupplier($this->fk_product, $this->fk_price_expression, $this->fourn_qty, $this->fourn_tva_tx);
+ if ($price_result >= 0) {
+ $this->fourn_price = $price_result;
+ //recalculation of unitprice, as probably the price changed...
+ if ($this->fourn_qty!=0)
+ {
+ $this->fourn_unitprice = price2num($this->fourn_price/$this->fourn_qty,'MU');
+ }
+ else
+ {
+ $this->fourn_unitprice="";
+ }
+ }
+ }
+
return 1;
}
else
@@ -379,7 +402,7 @@ class ProductFournisseur extends Product
global $conf;
$sql = "SELECT s.nom as supplier_name, s.rowid as fourn_id,";
- $sql.= " pfp.rowid as product_fourn_pri_id, pfp.ref_fourn, pfp.fk_product as product_fourn_id,";
+ $sql.= " pfp.rowid as product_fourn_pri_id, pfp.ref_fourn, pfp.fk_product as product_fourn_id, pfp.fk_price_expression,";
$sql.= " pfp.price, pfp.quantity, pfp.unitprice, pfp.remise_percent, pfp.remise, pfp.tva_tx, pfp.fk_availability, pfp.charges, pfp.unitcharges, pfp.info_bits";
$sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
$sql.= ", ".MAIN_DB_PREFIX."societe as s";
@@ -416,6 +439,16 @@ class ProductFournisseur extends Product
$prodfourn->fk_availability = $record["fk_availability"];
$prodfourn->id = $prodid;
$prodfourn->fourn_tva_npr = $record["info_bits"];
+ $prodfourn->fk_price_expression = $record["fk_price_expression"];
+
+ if (!empty($prodfourn->fk_price_expression)) {
+ $priceparser = new PriceParser($this->db);
+ $price_result = $priceparser->parseProductSupplier($prodid, $prodfourn->fk_price_expression, $prodfourn->fourn_qty, $prodfourn->fourn_tva_tx);
+ if ($price_result >= 0) {
+ $prodfourn->fourn_price = $price_result;
+ $prodfourn->fourn_unitprice = null; //force recalculation of unitprice, as probably the price changed...
+ }
+ }
if (!isset($prodfourn->fourn_unitprice))
{
@@ -468,7 +501,7 @@ class ProductFournisseur extends Product
$sql = "SELECT s.nom as supplier_name, s.rowid as fourn_id,";
$sql.= " pfp.rowid as product_fourn_price_id, pfp.ref_fourn,";
$sql.= " pfp.price, pfp.quantity, pfp.unitprice, pfp.tva_tx, pfp.charges, pfp.unitcharges, ";
- $sql.= " pfp.remise, pfp.remise_percent";
+ $sql.= " pfp.remise, pfp.remise_percent, pfp.fk_price_expression";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
$sql.= " WHERE s.entity IN (".getEntity('societe', 1).")";
$sql.= " AND pfp.fk_product = ".$prodid;
@@ -495,6 +528,7 @@ class ProductFournisseur extends Product
$this->fourn_tva_tx = $record["tva_tx"];
$this->fourn_id = $record["fourn_id"];
$this->fourn_name = $record["supplier_name"];
+ $this->fk_price_expression = $record["fk_price_expression"];
$this->id = $prodid;
$this->db->free($resql);
return 1;
@@ -506,6 +540,39 @@ class ProductFournisseur extends Product
}
}
+ /**
+ * Sets the price expression
+ *
+ * @param string $expression_id Expression
+ * @return int <0 if KO, >0 if OK
+ */
+ function setPriceExpression($expression_id)
+ {
+ global $conf;
+
+ // Clean parameters
+ $this->db->begin();
+
+ $sql = "UPDATE ".MAIN_DB_PREFIX."product_fournisseur_price";
+ $sql.= " SET fk_price_expression = ".$expression_id;
+ $sql.= " WHERE rowid = ".$this->product_fourn_price_id;
+
+ dol_syslog(get_class($this)."::setPriceExpression", LOG_DEBUG);
+
+ $resql = $this->db->query($sql);
+ if ($resql)
+ {
+ $this->db->commit();
+ return 1;
+ }
+ else
+ {
+ $this->error=$this->db->error()." sql=".$sql;
+ $this->db->rollback();
+ return -1;
+ }
+ }
+
/**
* Display supplier of product
*
diff --git a/htdocs/includes/evalmath/README.md b/htdocs/includes/evalmath/README.md
new file mode 100755
index 0000000000000000000000000000000000000000..6011e3fb6765b83f7a195e29d20c95b708ead93b
--- /dev/null
+++ b/htdocs/includes/evalmath/README.md
@@ -0,0 +1,11 @@
+evalmath.class.php
+==================
+
+Version 1.0
+
+Taken from http://www.phpclasses.org/browse/file/11680.html, cred to Miles Kaufmann
+
+This repository is cloned for two reasons:
+
+1. To allow downloading the code without signing in to phpclasses.org.
+2. To add very small improvements to the code.
diff --git a/htdocs/includes/evalmath/evalmath.class.php b/htdocs/includes/evalmath/evalmath.class.php
new file mode 100755
index 0000000000000000000000000000000000000000..bd1755b0a20e80e25368230bbf8d4398e8147469
--- /dev/null
+++ b/htdocs/includes/evalmath/evalmath.class.php
@@ -0,0 +1,393 @@
+<?php
+
+/*
+================================================================================
+
+EvalMath - PHP Class to safely evaluate math expressions
+Copyright (C) 2005 Miles Kaufmann <http://www.twmagic.com/>
+
+================================================================================
+
+NAME
+ EvalMath - safely evaluate math expressions
+
+SYNOPSIS
+ include('evalmath.class.php');
+ $m = new EvalMath;
+ // basic evaluation:
+ $result = $m->evaluate('2+2');
+ // supports: order of operation; parentheses; negation; built-in functions
+ $result = $m->evaluate('-8(5/2)^2*(1-sqrt(4))-8');
+ // create your own variables
+ $m->evaluate('a = e^(ln(pi))');
+ // or functions
+ $m->evaluate('f(x,y) = x^2 + y^2 - 2x*y + 1');
+ // and then use them
+ $result = $m->evaluate('3*f(42,a)');
+
+DESCRIPTION
+ Use the EvalMath class when you want to evaluate mathematical expressions
+ from untrusted sources. You can define your own variables and functions,
+ which are stored in the object. Try it, it's fun!
+
+METHODS
+ $m->evalute($expr)
+ Evaluates the expression and returns the result. If an error occurs,
+ prints a warning and returns false. If $expr is a function assignment,
+ returns true on success.
+
+ $m->e($expr)
+ A synonym for $m->evaluate().
+
+ $m->vars()
+ Returns an associative array of all user-defined variables and values.
+
+ $m->funcs()
+ Returns an array of all user-defined functions.
+
+PARAMETERS
+ $m->suppress_errors
+ Set to true to turn off warnings when evaluating expressions
+
+ $m->last_error
+ If the last evaluation failed, contains a string describing the error.
+ (Useful when suppress_errors is on).
+
+ $m->last_error_code
+ If the last evaluation failed, 2 element array with numeric code and extra info
+
+AUTHOR INFORMATION
+ Copyright 2005, Miles Kaufmann.
+
+LICENSE
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+
+ 1 Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote
+ products derived from this software without specific prior written
+ permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+*/
+
+class EvalMath {
+
+ var $suppress_errors = false;
+ var $last_error = null;
+ var $last_error_code = null;
+
+ var $v = array('e'=>2.71,'pi'=>3.14); // variables (and constants)
+ var $f = array(); // user-defined functions
+ var $vb = array('e', 'pi'); // constants
+ var $fb = array( // built-in functions
+ 'sin','sinh','arcsin','asin','arcsinh','asinh',
+ 'cos','cosh','arccos','acos','arccosh','acosh',
+ 'tan','tanh','arctan','atan','arctanh','atanh',
+ 'sqrt','abs','ln','log');
+
+ function EvalMath() {
+ // make the variables a little more accurate
+ $this->v['pi'] = pi();
+ $this->v['e'] = exp(1);
+ }
+
+ function e($expr) {
+ return $this->evaluate($expr);
+ }
+
+ function evaluate($expr) {
+ $this->last_error = null;
+ $this->last_error_code = null;
+ $expr = trim($expr);
+ if (substr($expr, -1, 1) == ';') $expr = substr($expr, 0, strlen($expr)-1); // strip semicolons at the end
+ //===============
+ // is it a variable assignment?
+ if (preg_match('/^\s*([a-z]\w*)\s*=\s*(.+)$/', $expr, $matches)) {
+ if (in_array($matches[1], $this->vb)) { // make sure we're not assigning to a constant
+ return $this->trigger(1, "cannot assign to constant '$matches[1]'", $matches[1]);
+ }
+ if (($tmp = $this->pfx($this->nfx($matches[2]))) === false) return false; // get the result and make sure it's good
+ $this->v[$matches[1]] = $tmp; // if so, stick it in the variable array
+ return $this->v[$matches[1]]; // and return the resulting value
+ //===============
+ // is it a function assignment?
+ } elseif (preg_match('/^\s*([a-z]\w*)\s*\(\s*([a-z]\w*(?:\s*,\s*[a-z]\w*)*)\s*\)\s*=\s*(.+)$/', $expr, $matches)) {
+ $fnn = $matches[1]; // get the function name
+ if (in_array($matches[1], $this->fb)) { // make sure it isn't built in
+ return $this->trigger(2, "cannot redefine built-in function '$matches[1]()'", $matches[1]);
+ }
+ $args = explode(",", preg_replace("/\s+/", "", $matches[2])); // get the arguments
+ if (($stack = $this->nfx($matches[3])) === false) return false; // see if it can be converted to postfix
+ for ($i = 0; $i<count($stack); $i++) { // freeze the state of the non-argument variables
+ $token = $stack[$i];
+ if (preg_match('/^[a-z]\w*$/', $token) and !in_array($token, $args)) {
+ if (array_key_exists($token, $this->v)) {
+ $stack[$i] = $this->v[$token];
+ } else {
+ return $this->trigger(3, "undefined variable '$token' in function definition", $token);
+ }
+ }
+ }
+ $this->f[$fnn] = array('args'=>$args, 'func'=>$stack);
+ return true;
+ //===============
+ } else {
+ return $this->pfx($this->nfx($expr)); // straight up evaluation, woo
+ }
+ }
+
+ function vars() {
+ $output = $this->v;
+ unset($output['pi']);
+ unset($output['e']);
+ return $output;
+ }
+
+ function funcs() {
+ $output = array();
+ foreach ($this->f as $fnn=>$dat)
+ $output[] = $fnn . '(' . implode(',', $dat['args']) . ')';
+ return $output;
+ }
+
+ //===================== HERE BE INTERNAL METHODS ====================\\
+
+ // Convert infix to postfix notation
+ function nfx($expr) {
+
+ $index = 0;
+ $stack = new EvalMathStack;
+ $output = array(); // postfix form of expression, to be passed to pfx()
+ $expr = trim(strtolower($expr));
+
+ $ops = array('+', '-', '*', '/', '^', '_');
+ $ops_r = array('+'=>0,'-'=>0,'*'=>0,'/'=>0,'^'=>1); // right-associative operator?
+ $ops_p = array('+'=>0,'-'=>0,'*'=>1,'/'=>1,'_'=>1,'^'=>2); // operator precedence
+
+ $expecting_op = false; // we use this in syntax-checking the expression
+ // and determining when a - is a negation
+
+ if (preg_match("/[^\w\s+*^\/()\.,-]/", $expr, $matches)) { // make sure the characters are all good
+ return $this->trigger(4, "illegal character '{$matches[0]}'", $matches[0]);
+ }
+
+ while(1) { // 1 Infinite Loop ;)
+ $op = substr($expr, $index, 1); // get the first character at the current index
+ // find out if we're currently at the beginning of a number/variable/function/parenthesis/operand
+ $ex = preg_match('/^([a-z]\w*\(?|\d+(?:\.\d*)?|\.\d+|\()/', substr($expr, $index), $match);
+ //===============
+ if ($op == '-' and !$expecting_op) { // is it a negation instead of a minus?
+ $stack->push('_'); // put a negation on the stack
+ $index++;
+ } elseif ($op == '_') { // we have to explicitly deny this, because it's legal on the stack
+ return $this->trigger(4, "illegal character '_'", "_"); // but not in the input expression
+ //===============
+ } elseif ((in_array($op, $ops) or $ex) and $expecting_op) { // are we putting an operator on the stack?
+ if ($ex) { // are we expecting an operator but have a number/variable/function/opening parethesis?
+ $op = '*'; $index--; // it's an implicit multiplication
+ }
+ // heart of the algorithm:
+ while($stack->count > 0 and ($o2 = $stack->last()) and in_array($o2, $ops) and ($ops_r[$op] ? $ops_p[$op] < $ops_p[$o2] : $ops_p[$op] <= $ops_p[$o2])) {
+ $output[] = $stack->pop(); // pop stuff off the stack into the output
+ }
+ // many thanks: http://en.wikipedia.org/wiki/Reverse_Polish_notation#The_algorithm_in_detail
+ $stack->push($op); // finally put OUR operator onto the stack
+ $index++;
+ $expecting_op = false;
+ //===============
+ } elseif ($op == ')' and $expecting_op) { // ready to close a parenthesis?
+ while (($o2 = $stack->pop()) != '(') { // pop off the stack back to the last (
+ if (is_null($o2)) return $this->trigger(5, "unexpected ')'", ")");
+ else $output[] = $o2;
+ }
+ if (preg_match("/^([a-z]\w*)\($/", $stack->last(2), $matches)) { // did we just close a function?
+ $fnn = $matches[1]; // get the function name
+ $arg_count = $stack->pop(); // see how many arguments there were (cleverly stored on the stack, thank you)
+ $output[] = $stack->pop(); // pop the function and push onto the output
+ if (in_array($fnn, $this->fb)) { // check the argument count
+ if($arg_count > 1)
+ return $this->trigger(6, "wrong number of arguments ($arg_count given, 1 expected)", array($arg_count, 1));
+ } elseif (array_key_exists($fnn, $this->f)) {
+ if ($arg_count != count($this->f[$fnn]['args']))
+ return $this->trigger(6, "wrong number of arguments ($arg_count given, " . count($this->f[$fnn]['args']) . " expected)", array($arg_count, count($this->f[$fnn]['args'])));
+ } else { // did we somehow push a non-function on the stack? this should never happen
+ return $this->trigger(7, "internal error");
+ }
+ }
+ $index++;
+ //===============
+ } elseif ($op == ',' and $expecting_op) { // did we just finish a function argument?
+ while (($o2 = $stack->pop()) != '(') {
+ if (is_null($o2)) return $this->trigger(5, "unexpected ','", ","); // oops, never had a (
+ else $output[] = $o2; // pop the argument expression stuff and push onto the output
+ }
+ // make sure there was a function
+ if (!preg_match("/^([a-z]\w*)\($/", $stack->last(2), $matches))
+ return $this->trigger(5, "unexpected ','", ",");
+ $stack->push($stack->pop()+1); // increment the argument count
+ $stack->push('('); // put the ( back on, we'll need to pop back to it again
+ $index++;
+ $expecting_op = false;
+ //===============
+ } elseif ($op == '(' and !$expecting_op) {
+ $stack->push('('); // that was easy
+ $index++;
+ $allow_neg = true;
+ //===============
+ } elseif ($ex and !$expecting_op) { // do we now have a function/variable/number?
+ $expecting_op = true;
+ $val = $match[1];
+ if (preg_match("/^([a-z]\w*)\($/", $val, $matches)) { // may be func, or variable w/ implicit multiplication against parentheses...
+ if (in_array($matches[1], $this->fb) or array_key_exists($matches[1], $this->f)) { // it's a func
+ $stack->push($val);
+ $stack->push(1);
+ $stack->push('(');
+ $expecting_op = false;
+ } else { // it's a var w/ implicit multiplication
+ $val = $matches[1];
+ $output[] = $val;
+ }
+ } else { // it's a plain old var or num
+ $output[] = $val;
+ }
+ $index += strlen($val);
+ //===============
+ } elseif ($op == ')') { // miscellaneous error checking
+ return $this->trigger(5, "unexpected ')'", ")");
+ } elseif (in_array($op, $ops) and !$expecting_op) {
+ return $this->trigger(8, "unexpected operator '$op'", $op);
+ } else { // I don't even want to know what you did to get here
+ return $this->trigger(9, "an unexpected error occured");
+ }
+ if ($index == strlen($expr)) {
+ if (in_array($op, $ops)) { // did we end with an operator? bad.
+ return $this->trigger(10, "operator '$op' lacks operand", $op);
+ } else {
+ break;
+ }
+ }
+ while (substr($expr, $index, 1) == ' ') { // step the index past whitespace (pretty much turns whitespace
+ $index++; // into implicit multiplication if no operator is there)
+ }
+
+ }
+ while (!is_null($op = $stack->pop())) { // pop everything off the stack and push onto output
+ if ($op == '(') return $this->trigger(11, "expecting ')'", ")"); // if there are (s on the stack, ()s were unbalanced
+ $output[] = $op;
+ }
+ return $output;
+ }
+
+ // evaluate postfix notation
+ function pfx($tokens, $vars = array()) {
+
+ if ($tokens == false) return false;
+
+ $stack = new EvalMathStack;
+
+ foreach ($tokens as $token) { // nice and easy
+ // if the token is a binary operator, pop two values off the stack, do the operation, and push the result back on
+ if (in_array($token, array('+', '-', '*', '/', '^'))) {
+ if (is_null($op2 = $stack->pop())) return $this->trigger(12, "internal error");
+ if (is_null($op1 = $stack->pop())) return $this->trigger(13, "internal error");
+ switch ($token) {
+ case '+':
+ $stack->push($op1+$op2); break;
+ case '-':
+ $stack->push($op1-$op2); break;
+ case '*':
+ $stack->push($op1*$op2); break;
+ case '/':
+ if ($op2 == 0) return $this->trigger(14, "division by zero");
+ $stack->push($op1/$op2); break;
+ case '^':
+ $stack->push(pow($op1, $op2)); break;
+ }
+ // if the token is a unary operator, pop one value off the stack, do the operation, and push it back on
+ } elseif ($token == "_") {
+ $stack->push(-1*$stack->pop());
+ // if the token is a function, pop arguments off the stack, hand them to the function, and push the result back on
+ } elseif (preg_match("/^([a-z]\w*)\($/", $token, $matches)) { // it's a function!
+ $fnn = $matches[1];
+ if (in_array($fnn, $this->fb)) { // built-in function:
+ if (is_null($op1 = $stack->pop())) return $this->trigger(15, "internal error");
+ $fnn = preg_replace("/^arc/", "a", $fnn); // for the 'arc' trig synonyms
+ if ($fnn == 'ln') $fnn = 'log';
+ eval('$stack->push(' . $fnn . '($op1));'); // perfectly safe eval()
+ } elseif (array_key_exists($fnn, $this->f)) { // user function
+ // get args
+ $args = array();
+ for ($i = count($this->f[$fnn]['args'])-1; $i >= 0; $i--) {
+ if (is_null($args[$this->f[$fnn]['args'][$i]] = $stack->pop())) return $this->trigger(16, "internal error");
+ }
+ $stack->push($this->pfx($this->f[$fnn]['func'], $args)); // yay... recursion!!!!
+ }
+ // if the token is a number or variable, push it on the stack
+ } else {
+ if (is_numeric($token)) {
+ $stack->push($token);
+ } elseif (array_key_exists($token, $this->v)) {
+ $stack->push($this->v[$token]);
+ } elseif (array_key_exists($token, $vars)) {
+ $stack->push($vars[$token]);
+ } else {
+ return $this->trigger(17, "undefined variable '$token'", $token);
+ }
+ }
+ }
+ // when we're out of tokens, the stack should have a single element, the final result
+ if ($stack->count != 1) return $this->trigger(18, "internal error");
+ return $stack->pop();
+ }
+
+ // trigger an error, but nicely, if need be
+ function trigger($code, $msg, $info = null) {
+ $this->last_error = $msg;
+ $this->last_error_code = array($code, $info);
+ if (!$this->suppress_errors) trigger_error($msg, E_USER_WARNING);
+ return false;
+ }
+}
+
+// for internal use
+class EvalMathStack {
+
+ var $stack = array();
+ var $count = 0;
+
+ function push($val) {
+ $this->stack[$this->count] = $val;
+ $this->count++;
+ }
+
+ function pop() {
+ if ($this->count > 0) {
+ $this->count--;
+ return $this->stack[$this->count];
+ }
+ return null;
+ }
+
+ function last($n=1) {
+ if (isset($this->stack[$this->count-$n])) {
+ return $this->stack[$this->count-$n];
+ }
+ return;
+ }
+}
diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index dc4bcd0e55731c965316347da0243c6c571105e2..2d3c3b6ec668382034fc32e217b7f57eba5f0ef5 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2013 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2013-2014 Juanjo Menent <jmenent@2byte.es>
@@ -380,22 +380,14 @@ else
$allowupgrade=false;
}
if (defined("MAIN_NOT_INSTALLED")) $allowupgrade=false;
- $migrationscript=array( //array('from'=>'2.0.0', 'to'=>'2.1.0'),
- //array('from'=>'2.1.0', 'to'=>'2.2.0'),
- //array('from'=>'2.2.0', 'to'=>'2.4.0'),
- //array('from'=>'2.4.0', 'to'=>'2.5.0'),
- //array('from'=>'2.5.0', 'to'=>'2.6.0'),
- array('from'=>'2.6.0', 'to'=>'2.7.0'),
- array('from'=>'2.7.0', 'to'=>'2.8.0'),
- array('from'=>'2.8.0', 'to'=>'2.9.0'),
- array('from'=>'2.9.0', 'to'=>'3.0.0'),
- array('from'=>'3.0.0', 'to'=>'3.1.0'),
+ $migrationscript=array( array('from'=>'3.0.0', 'to'=>'3.1.0'),
array('from'=>'3.1.0', 'to'=>'3.2.0'),
array('from'=>'3.2.0', 'to'=>'3.3.0'),
array('from'=>'3.3.0', 'to'=>'3.4.0'),
array('from'=>'3.4.0', 'to'=>'3.5.0'),
array('from'=>'3.5.0', 'to'=>'3.6.0'),
- array('from'=>'3.6.0', 'to'=>'3.7.0')
+ array('from'=>'3.6.0', 'to'=>'3.7.0'),
+ array('from'=>'3.7.0', 'to'=>'3.8.0')
);
$count=0;
diff --git a/htdocs/install/default.css b/htdocs/install/default.css
index c3feead7a8fc68a67bbb488d93039c6856d6968f..c3d97cdaa7462f400e4a246525e60632f4df81e9 100644
--- a/htdocs/install/default.css
+++ b/htdocs/install/default.css
@@ -296,3 +296,7 @@ background-color: #dfd;
background-repeat: repeat-x;
background-position: top left;
}
+
+.center {
+ text-align: center;
+}
diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php
index ba51b41aa3404f855ae82cdd193e21b3db881cff..d6a5d086b31fee434ea09042b652c13620c83289 100644
--- a/htdocs/install/etape5.php
+++ b/htdocs/install/etape5.php
@@ -115,7 +115,6 @@ if (empty($versionfrom) && empty($versionto) && ! is_writable($conffile))
if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
{
- print '<table cellspacing="0" cellpadding="2" width="100%">';
$error=0;
// If password is encoded, we decode it
@@ -298,12 +297,9 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
$resql=$db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) VALUES (".$db->encrypt('MAIN_LANG_DEFAULT',1).",".$db->encrypt($setuplang,1).",'chaine',0,'Default language',1)");
//if (! $resql) dol_print_error($db,'Error in setup program');
- print '</table>';
-
$db->close();
}
-print "<br>";
// Create lock file
diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
index de80d439b825c59dd8e52568a38acbe6a87f204a..40a7f7b86c68188d0a119fbeb6bac4174bbb469d 100755
--- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
+++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
@@ -1136,6 +1136,9 @@ ALTER TABLE llx_facture_fourn MODIFY COLUMN ref VARCHAR(255);
ALTER TABLE llx_facture_fourn MODIFY COLUMN ref_ext VARCHAR(255);
ALTER TABLE llx_facture_fourn MODIFY COLUMN ref_supplier VARCHAR(255);
+ALTER TABLE llx_facture_rec ADD COLUMN revenuestamp double(24,8) DEFAULT 0;
+ALTER TABLE llx_facturedet_rec MODIFY COLUMN tva_tx double(6,3);
+ALTER TABLE llx_facturedet_rec ADD COLUMN fk_contract_line integer NULL;
-- This request make mysql drop (mysql bug, so we add it at end):
--ALTER TABLE llx_product ADD CONSTRAINT fk_product_barcode_type FOREIGN KEY (fk_barcode_type) REFERENCES llx_c_barcode_type(rowid);
diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
new file mode 100755
index 0000000000000000000000000000000000000000..a190f102023c284e543e74162ef8d462d9bc6a94
--- /dev/null
+++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
@@ -0,0 +1,29 @@
+--
+-- Be carefull to requests order.
+-- This file must be loaded by calling /install/index.php page
+-- when current version is 3.8.0 or higher.
+--
+-- To rename a table: ALTER TABLE llx_table RENAME TO llx_table_new;
+-- To add a column: ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol;
+-- To rename a column: ALTER TABLE llx_table CHANGE COLUMN oldname newname varchar(60);
+-- To drop a column: ALTER TABLE llx_table DROP COLUMN oldname;
+-- To change type of field: ALTER TABLE llx_table MODIFY COLUMN name varchar(60);
+-- To drop a foreign key: ALTER TABLE llx_table DROP FOREIGN KEY fk_name;
+-- To restrict request to Mysql version x.y use -- VMYSQLx.y
+-- To restrict request to Pgsql version x.y use -- VPGSQLx.y
+-- To make pk to be auto increment (mysql): VMYSQL4.3 ALTER TABLE llx_c_shipment_mode CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
+-- To make pk to be auto increment (postgres): VPGSQL8.2 NOT POSSIBLE. MUST DELETE/CREATE TABLE
+-- To set a field as NULL: VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name DROP NOT NULL;
+-- To set a field as default NULL: VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET DEFAULT NULL;
+-- -- VPGSQL8.2 DELETE FROM llx_usergroup_user WHERE fk_user NOT IN (SELECT rowid from llx_user);
+-- -- VMYSQL4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
+
+--create table for price expressions and add column in product supplier
+create table llx_c_price_expression
+(
+ rowid integer AUTO_INCREMENT PRIMARY KEY,
+ title varchar(20) NOT NULL,
+ expression varchar(80) NOT NULL
+)ENGINE=innodb;
+
+ALTER TABLE llx_product_fournisseur_price ADD fk_price_expression integer DEFAULT NULL;
diff --git a/htdocs/install/mysql/tables/llx_c_price_expression.sql b/htdocs/install/mysql/tables/llx_c_price_expression.sql
new file mode 100755
index 0000000000000000000000000000000000000000..4c1788e42764f0b64fd0cb9700e1c12cb81a4eb2
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_price_expression.sql
@@ -0,0 +1,24 @@
+-- ============================================================================
+-- Copyright (C) 2014 Ion agorria <ion@agorria.com>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ============================================================================
+
+create table llx_c_price_expression
+(
+ rowid integer AUTO_INCREMENT PRIMARY KEY,
+ title varchar(20) NOT NULL,
+ expression varchar(80) NOT NULL
+)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql
index 433bef887f1b8b36abe666b42fdfa3acebc8eb4b..9757f749cd0a51764601d7f03352bf04bf18b519 100644
--- a/htdocs/install/mysql/tables/llx_facture.sql
+++ b/htdocs/install/mysql/tables/llx_facture.sql
@@ -65,6 +65,7 @@ create table llx_facture
fk_account integer, -- bank account
fk_currency varchar(3), -- currency code
+
fk_cond_reglement integer DEFAULT 1 NOT NULL, -- condition de reglement (30 jours, fin de mois ...)
fk_mode_reglement integer, -- mode de reglement (Virement, Prelevement)
date_lim_reglement date, -- date limite de reglement
diff --git a/htdocs/install/mysql/tables/llx_facture_rec.sql b/htdocs/install/mysql/tables/llx_facture_rec.sql
index 947a65fa5ff5f004ea8721c47771ce2a434bb538..cba4b580cf0f843d38b3f4efc5fe6ab43a6bce34 100644
--- a/htdocs/install/mysql/tables/llx_facture_rec.sql
+++ b/htdocs/install/mysql/tables/llx_facture_rec.sql
@@ -1,8 +1,8 @@
-- ===========================================================================
--- Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
--- Copyright (C) 2012 Laurent Destailleur <eldy@users.sourceforge.net>
--- Copyright (C) 2009 Regis Houssin <regis.houssin@capnetworks.com>
--- Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
+-- Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2012-2014 Laurent Destailleur <eldy@users.sourceforge.net>
+-- Copyright (C) 2009 Regis Houssin <regis.houssin@capnetworks.com>
+-- Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
@@ -31,17 +31,21 @@ create table llx_facture_rec
remise real DEFAULT 0,
remise_percent real DEFAULT 0,
remise_absolue real DEFAULT 0,
+
tva double(24,8) DEFAULT 0,
localtax1 double(24,8) DEFAULT 0, -- amount localtax1
localtax2 double(24,8) DEFAULT 0, -- amount localtax2
+ revenuestamp double(24,8) DEFAULT 0, -- amount total revenuestamp
total double(24,8) DEFAULT 0,
total_ttc double(24,8) DEFAULT 0,
fk_user_author integer, -- createur
+
fk_projet integer, -- projet auquel est associe la facture
- fk_cond_reglement integer DEFAULT 0, -- condition de reglement
+
+ fk_cond_reglement integer DEFAULT 0, -- condition de reglement
fk_mode_reglement integer DEFAULT 0, -- mode de reglement (Virement, Prelevement)
- date_lim_reglement date, -- date limite de reglement
+ date_lim_reglement date, -- date limite de reglement
note_private text,
note_public text,
@@ -49,8 +53,9 @@ create table llx_facture_rec
usenewprice integer DEFAULT 0,
frequency integer,
unit_frequency varchar(2) DEFAULT 'd',
+
date_when datetime DEFAULT NULL, -- date for next gen (when an invoice is generated, this field must be updated with next date)
date_last_gen datetime DEFAULT NULL, -- date for last gen (date with last successfull generation of invoice)
nb_gen_done integer DEFAULT NULL, -- nb of generation done (when an invoice is generated, this field must incremented)
- nb_gen_max integer DEFAULT NULL -- maximum number of generation
+ nb_gen_max integer DEFAULT NULL -- maximum number of generation
)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_facturedet_rec.sql b/htdocs/install/mysql/tables/llx_facturedet_rec.sql
index 8da2d147574e676f75a1e669e18bba59465de388..05bfa71ec2e4ee90c7292d4a38842d3646d49aa8 100644
--- a/htdocs/install/mysql/tables/llx_facturedet_rec.sql
+++ b/htdocs/install/mysql/tables/llx_facturedet_rec.sql
@@ -1,6 +1,6 @@
-- ===================================================================
-- Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
--- Copyright (C) 2009 Laurent Destailleur <eldy@users.sourceforge.net>
+-- Copyright (C) 2009-2014 Laurent Destailleur <eldy@users.sourceforge.net>
-- Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
-- Copyright (C) 2010-2012 Regis Houssin <regis.houssin@capnetworks.com>
--
@@ -28,23 +28,23 @@ create table llx_facturedet_rec
product_type integer DEFAULT 0,
label varchar(255) DEFAULT NULL,
description text,
- tva_tx double(6,3) DEFAULT 19.6, -- taux tva
+ tva_tx double(6,3), -- taux tva
localtax1_tx double(6,3) DEFAULT 0, -- localtax1 rate
- localtax1_type varchar(10) NULL, -- localtax1 type
+ localtax1_type varchar(10) NULL, -- localtax1 type
localtax2_tx double(6,3) DEFAULT 0, -- localtax2 rate
- localtax2_type varchar(10) NULL, -- localtax2 type
+ localtax2_type varchar(10) NULL, -- localtax2 type
qty real, -- quantity
- remise_percent real DEFAULT 0, -- pourcentage de remise
- remise real DEFAULT 0, -- montant de la remise
+ remise_percent real DEFAULT 0, -- pourcentage de remise
+ remise real DEFAULT 0, -- montant de la remise
subprice double(24,8), -- prix avant remise
price double(24,8), -- prix final
total_ht double(24,8), -- Total HT de la ligne toute quantity et incluant remise ligne et globale
total_tva double(24,8), -- Total TVA de la ligne toute quantity et incluant remise ligne et globale
- total_localtax1 double(24,8) DEFAULT 0, -- Total LocalTax1 for total quantity of line
- total_localtax2 double(24,8) DEFAULT 0, -- total LocalTax2 for total quantity of line
+ total_localtax1 double(24,8) DEFAULT 0, -- Total LocalTax1 for total quantity of line
+ total_localtax2 double(24,8) DEFAULT 0, -- total LocalTax2 for total quantity of line
total_ttc double(24,8), -- Total TTC de la ligne toute quantity et incluant remise ligne et globale
- info_bits integer DEFAULT 0, -- TVA NPR ou non
- special_code integer UNSIGNED DEFAULT 0, -- code pour les lignes speciales
- rang integer DEFAULT 0 -- ordre d'affichage
-
+ info_bits integer DEFAULT 0, -- TVA NPR ou non
+ special_code integer UNSIGNED DEFAULT 0, -- code pour les lignes speciales
+ rang integer DEFAULT 0, -- ordre d'affichage
+ fk_contract_line integer NULL -- id of contract line when predefined invoice comes from contract lines
)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
old mode 100644
new mode 100755
index e48c3ce6f8244cd9779efa99917b283f03f12fc3..a0554d4345c05d03128e762dca1e7f0963e64082
--- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
+++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
@@ -39,5 +39,6 @@ create table llx_product_fournisseur_price
tva_tx double(6,3) NOT NULL,
info_bits integer NOT NULL DEFAULT 0,
fk_user integer,
+ fk_price_expression integer, -- Link to the rule for dynamic amount calculation
import_key varchar(14) -- Import key
)ENGINE=innodb;
diff --git a/htdocs/langs/ar_SA/accountancy.lang b/htdocs/langs/ar_SA/accountancy.lang
index 8cab9d2b651d75b0721d76fda619e2034e4509b4..39c2732ec29852cf93d41614ed1812c2a4c1ce4f 100644
--- a/htdocs/langs/ar_SA/accountancy.lang
+++ b/htdocs/langs/ar_SA/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts
Validate=Validate
Addanaccount=Add an accounting account
AccountAccounting=Accounting account
-Ventilation=Ventilation
+Ventilation=Breakdown
ToDispatch=To dispatch
Dispatched=Dispatched
-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
TradeMargin=Trade margin
Reports=Reports
ByCustomerInvoice=By invoices customers
@@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger
Bookkeeping=General ledger
AccountBalanceByMonth=Account balance by month
-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
Line=Line
CAHTF=Total purchase supplier HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice
IntoAccount=In the accounting account
Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
+VentilationAuto=Automatic breakdown
Processing=Processing
EndProcessing=The end of processing
@@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account
ACCOUNTING_SEPARATORCSV=Separator CSV
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
@@ -140,14 +140,14 @@ Active=Statement
NewFiscalYear=New fiscal year
-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
TotalVente=Total turnover HT
TotalMarge=Total sales margin
DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
ChangeAccount=Change the accounting account for lines selected by the account:
Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
@@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically
ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index 76d3acd579b3997854b41f80957acf20c1f1d494..a4214d4e592e48babfac79205b0affbeca08c7fa 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -475,8 +475,8 @@ Module320Name=تغذية RSS
Module320Desc=إضافة تغذية RSS داخل الشاشة صفحة Dolibarr
Module330Name=العناوين
Module330Desc=العناوين إدارة
-Module400Name=المشاريع
-Module400Desc=إدارة المشاريع داخل وحدات أخرى
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=Webcalendar
Module410Desc=Webcalendar التكامل
Module500Name=Special expenses (tax, social contributions, dividends)
@@ -484,7 +484,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di
Module510Name=Salaries
Module510Desc=Management of employees salaries and payments
Module600Name=الإخطارات
-Module600Desc=إرسال الإشعارات عن طريق البريد الإلكتروني على بعض الفعاليات التجارية Dolibarr لطرف ثالث اتصالات
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=التبرعات
Module700Desc=التبرعات إدارة
Module1200Name=فرس النبي
@@ -514,16 +514,16 @@ Module5000Name=شركة متعددة
Module5000Desc=يسمح لك لإدارة الشركات المتعددة
Module6000Name=Workflow
Module6000Desc=Workflow management
-Module20000Name=Holidays
-Module20000Desc=Declare and follow employees holidays
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
Module39000Name=Product batch
Module39000Desc=Batch number, eat-by and sell-by date management on products
Module50000Name=PayBox
Module50000Desc=وحدة لتقديم على صفحة الدفع عبر الإنترنت عن طريق بطاقة الائتمان مع PayBox
Module50100Name=نقطة البيع
Module50100Desc=نقطة بيع وحدة
-Module50200Name= باي بال
-Module50200Desc= وحدة لتقديم على صفحة الدفع عبر الإنترنت عن طريق بطاقة الائتمان مع بايبال
+Module50200Name=باي بال
+Module50200Desc=وحدة لتقديم على صفحة الدفع عبر الإنترنت عن طريق بطاقة الائتمان مع بايبال
Module50400Name=Accounting (advanced)
Module50400Desc=Accounting management (double parties)
Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=قراءة أوامر دائمة
Permission152=إعداد أوامر دائمة
Permission153=قراءة أوامر دائمة إيصالات
Permission154=الائتمان / ورفض أوامر دائمة ايصالات
-Permission161=قراءة العقود
-Permission162=إنشاء / تغيير العقود
-Permission163=تفعيل خدمة للعقد
-Permission164=تعطيل خدمة للعقد
-Permission165=حذف العقود
-Permission171=قراءة رحلات
-Permission172=إنشاء / تغيير الرحلات
-Permission173=حذف رحلات
-Permission178=رحلات التصدير
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Read trips and expenses (own and his subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
Permission180=قراءة الموردين
Permission181=قراءة مورد أوامر
Permission182=إنشاء / تغيير المورد أوامر
@@ -671,7 +672,7 @@ Permission300=شريط قراءة المدونات
Permission301=إنشاء / تغيير شريط الرموز
Permission302=حذف شريط الرموز
Permission311=قراءة الخدمات
-Permission312=إسناد عقود الخدمة
+Permission312=Assign service/subscription to contract
Permission331=قراءة العناوين
Permission332=إنشاء / تغيير العناوين
Permission333=حذف العناوين
@@ -701,8 +702,8 @@ Permission701=قراءة التبرعات
Permission702=إنشاء / تعديل والهبات
Permission703=حذف التبرعات
Permission1001=قراءة مخزونات
-Permission1002=إنشاء / تغيير المخزونات
-Permission1003=حذف الأرصدة
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=قراءة تحركات الأسهم
Permission1005=إنشاء / تعديل تحركات الأسهم
Permission1101=قراءة تسليم أوامر
@@ -1038,7 +1039,6 @@ YesInSummer=Yes in summer
OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
SuhosinSessionEncrypt=Session storage encrypted by Suhosin
ConditionIsCurrently=Condition is currently %s
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
YouUseBestDriver=You use driver %s that is best driver available currently.
YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=عودة رمز المحاسبة التي بناها:
ModuleCompanyCodePanicum=العودة فارغة مدونة المحاسبة.
ModuleCompanyCodeDigitaria=قانون المحاسبة طرف ثالث يعتمد على الرمز. الشفرة تتكون من طابع "جيم" في المركز الأول يليه 5 الحروف الأولى من طرف ثالث المدونة.
UseNotifications=استخدام الإخطارات
-NotificationsDesc=إشعارات البريد الإلكتروني ميزة تسمح لك صمت إرسال البريد الآلي ، وبالنسبة لبعض الأحداث Dolibarr ، لأطراف ثالثة (العملاء أو الموردين) التي هي لتهيئتها. اختيار نشط الاشعار الاتصالات واعتماد أهداف واحدة لطرف ثالث في الوقت المناسب.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
ModelModules=وثائق قوالب
DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
WatermarkOnDraft=علامة مائية على مشروع الوثيقة
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=إضافة قدرة تاريخ التسليم
UseOptionLineIfNoQuantity=خط من المنتجات / الخدمات ذات الصفر المبلغ يعتبر خيارا
FreeLegalTextOnProposal=نص تجارية حرة على مقترحات
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=أوامر إدارة الإعداد
OrdersNumberingModules=أوامر الترقيم نمائط
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list
ValidOrderAfterPropalClosed=للمصادقة على النظام بعد اقتراح أوثق ، لا يجعل من الممكن للخطوة من جانب النظام المؤقت
FreeLegalTextOnOrders=بناء على أوامر النص الحر
WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
##### Clicktodial #####
ClickToDialSetup=انقر لإعداد وحدة الاتصال الهاتفي
ClickToDialUrlDesc=ودعا الموقع عندما تنقر على الهاتف picto ذلك. Dans l' رابط ، vous pouvez utiliser ليه balises <br> <b>٪ ٪ 1 $ ق</b> qui الأمصال remplacé قدم المساواة جنيه téléphone دي l' appelé <br> <b>٪ ٪</b> 2 $ <b>ق</b> qui الأمصال remplacé لو قدم المساواة téléphone دي l' appelant جنيه مصري vôtre) <br> <b>٪ ٪ ل 3</b> دولار qui الأمصال remplacé vôtre ادخل clicktodial الفقرة (défini سور vôtre فيشه utilisateur) <br> <b>٪ ٪</b> 4 <b>$</b> ق qui الأمصال remplacé الفقرة vôtre يذكره دي clicktodial عتيق (défini سور vôtre فيشه utilisateur).
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=الترقيم وحدات التدخل
TemplatePDFInterventions=تدخل بطاقة نماذج الوثائق
WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
##### Contracts #####
-ContractsSetup=عقود وحدة الإعداد
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=عقود ترقيم الوحدات
TemplatePDFContracts=Contracts documents models
FreeLegalTextOnContracts=Free text on contracts
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
CacheByServer=Cache by server
CacheByClient=Cache by browser
CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=المنتجات وحدة الإعداد
ServiceSetup=خدمات وحدة الإعداد
@@ -1382,9 +1384,10 @@ MailingSetup=إعداد وحدة الارسال بالبريد الالكترو
MailingEMailFrom=مرسل البريد الالكتروني (من) لرسائل البريد الإلكتروني التي بعث بها وحدة الإنترنت
MailingEMailError=بريد إلكتروني العودة (إلى أخطاء) لرسائل البريد الإلكتروني مع الأخطاء
##### Notification #####
-NotificationSetup=الإخطار بو الإعداد وحدة البريد الإلكتروني
+NotificationSetup=EMail notification module setup
NotificationEMailFrom=مرسل البريد الالكتروني (من) لإرسال رسائل البريد الإلكتروني لالإخطارات
-ListOfAvailableNotifications=قائمة الإخطارات المتاحة (هذا يعتمد على وحدات قائمة المنشط)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
##### Sendings #####
SendingsSetup=ارسال وحدة الإعداد
SendingsReceiptModel=ارسال استلام نموذج
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=علاقة الخادم '٪ ق' على قاعدة البيان
OSCommerceTestKo1=علاقة الخادم '٪ ق' تنجح ولكن قاعدة البيانات '٪ ق' لا يمكن التوصل إليها.
OSCommerceTestKo2=علاقة الخادم '٪ ق' مستخدم '٪ ق' فشلت.
##### Stock #####
-StockSetup=تكوين وحدة المخزون
-UserWarehouse=استخدام الأرصدة الشخصية للمستخدم
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=حذف من القائمة
TreeMenu=شجرة القوائم
@@ -1478,11 +1482,14 @@ ClickToDialDesc=هذا النموذج يسمح لإضافة رمز بعد رقم
##### Point Of Sales (CashDesk) #####
CashDesk=نقاط البيع
CashDeskSetup=مكتب الإعداد وحدة نقدية
-CashDeskThirdPartyForSell=عامة لاستخدام طرف ثالث لتبيعها
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=الحساب النقدي لاستخدامها لتبيع
CashDeskBankAccountForCheque= حساب لاستخدام لتلقي المدفوعات عن طريق الشيكات
CashDeskBankAccountForCB= حساب لاستخدام لاستلام المبالغ النقدية عن طريق بطاقات الائتمان
-CashDeskIdWareHouse=Datawarehous لتبيع للمستخدم
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=إعداد وحدة المرجعية
BookmarkDesc=هذا النموذج يسمح لك لإدارة العناوين. يمكنك أيضا إضافة أي Dolibarr اختصارات لصفحات أو مواقع الويب externale على القائمة اليمنى.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Delete fiscal year
ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
Opened=Opened
Closed=Closed
-
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
diff --git a/htdocs/langs/ar_SA/agenda.lang b/htdocs/langs/ar_SA/agenda.lang
index 33367cff796f26ccfcc005dabd28cc59e1555069..d732b03639c0008a04ed1f6d8235ec125185f7ad 100644
--- a/htdocs/langs/ar_SA/agenda.lang
+++ b/htdocs/langs/ar_SA/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= إكمال تلقائي
AgendaAutoActionDesc= عرف الأحداث التي تريد من دوليبار إنشائها تلقائيا في جدوال الأعمال. إذا لم تقم بإختيار أي شي (الخيار الإفتراضي), سوف يتم فقط إدخال الأنشطلة إلى جدول الأعمال يدوياً
AgendaSetupOtherDesc= تسمح لك هذه الصفحة بنقل الأحداث إلى تقويم خارجي مثل جوجل, تندربيرد وغيرها, وذلك بإستخدام الخيارات في هذه الصفحة
AgendaExtSitesDesc=تسمح لك هذه الصفحة بتعريف مصادر خارجية للتقويم وذلك لرؤية الأحداث الخاصة بالتقويم الخاص بهم في تقويم دوليبار
-ActionsEvents= الأحداث التي ستمكن دوليبار من إنشاء أعمال تلقائية في جدول الأعمال
-PropalValidatedInDolibarr= تم تفعيل %s من الإقتراح
-InvoiceValidatedInDolibarr= تم توثيق %s من الفاتورة
+ActionsEvents=الأحداث التي ستمكن دوليبار من إنشاء أعمال تلقائية في جدول الأعمال
+PropalValidatedInDolibarr=تم تفعيل %s من الإقتراح
+InvoiceValidatedInDolibarr=تم توثيق %s من الفاتورة
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=الفاتورة %s للذهاب بها إلى حالة المسودة
InvoiceDeleteDolibarr=تم حذف %s من الفاتورة
OrderValidatedInDolibarr= تم توثيق %s من الطلب
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=تم الموافقة على %s من الطلب
OrderRefusedInDolibarr=Order %s refused
OrderBackToDraftInDolibarr=الطلب %s للذهاب بها إلى حالة المسودة
OrderCanceledInDolibarr=تم إلغاء %s من الطلب
-InterventionValidatedInDolibarr=تم توثيق %s من التدخل
ProposalSentByEMail=تم إرسال العرض الرسمي %s بواسطة البريد الإلكتروني
OrderSentByEMail=تم إرسال طلبية العميل %s بواسطة البريد الإلكتروني
InvoiceSentByEMail=تم إرسال فاتروة العميل %s بواسطة البريد الإلكتروني
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=تم إرسال طلبية المزود %s بواسطة
SupplierInvoiceSentByEMail=تم إرسال فاتروة المزود%s بواسطة البريد الإلكتروني
ShippingSentByEMail=تم إرسال الشحنة %s بواسطة البريد الإلكتروني
ShippingValidated= Shipping %s validated
-InterventionSentByEMail=تم إرسال التدخل %s بواسطة البريد الإلكتروني
-InterventionClassifiedBilled=Intervention %s classified as Billed
NewCompanyToDolibarr= تم إنشاء طرف ثالث أو خارجي
DateActionPlannedStart= التاريخ المخطط للبدء
DateActionPlannedEnd= التاريخ المخطط للإنهاء
@@ -70,9 +68,9 @@ DateActionStart= تاريخ البدء
DateActionEnd= تاريخ النهاية
AgendaUrlOptions1=يمكنك أيضا إضافة المعايير التالية لترشيح النتائج:
AgendaUrlOptions2=<b>login=<b>login=%s</b> لتقييد الانتاج المنشأ أو الذي تم الإنتهاء منه بواسطة المستخدم <b>%s</b>
-AgendaUrlOptions3=<b>logina=<b>logina=%s</b> لتقييد الانتاج للإجراءات التي أنشأها المستخدم <b>%s</b>
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
AgendaUrlOptions4=<b>logint=<b>logint=%s</b> لتقييد الانتاج للإجراءات المناطة للمستخدم <b>%s</b>
-AgendaUrlOptions5=<b>logind=<b>logind=%s</b> لتقييد الانتاج للإجراءات التي قام بها المستخدم <b>%s</b>
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
AgendaShowBirthdayEvents=أظهر تاريخ الميلاد في عناوين الإتصال
AgendaHideBirthdayEvents=أخفي تاريخ الميلاد في عناوين الإتصال
Busy=مشغول
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=عنوان المتصفح للدخول لملف .ical
ExtSiteNoLabel=لا يوجد وصف
WorkingTimeRange=Working time range
WorkingDaysRange=Working days range
-AddEvent=Add event
+AddEvent=Create event
MyAvailability=My availability
diff --git a/htdocs/langs/ar_SA/bills.lang b/htdocs/langs/ar_SA/bills.lang
index 6a931ac16af8782993dd5cb7ac52c2f55bfd3169..828582f7b39671d09f0f472a54745f29f3baa77b 100644
--- a/htdocs/langs/ar_SA/bills.lang
+++ b/htdocs/langs/ar_SA/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=علما الائتمان
InvoiceAvoirAsk=علما الائتمان لتصحيح الفاتورة
InvoiceAvoirDesc=<b>الفضل</b> في <b>المذكرة</b> سلبية الفاتورة تستخدم لحل كون فاتورة بمبلغ قد يختلف عن المبلغ المدفوع فعلا (لأنه دفع الكثير من العملاء عن طريق الخطأ ، أو لن تدفع بالكامل منذ عودته لبعض المنتجات على سبيل المثال).
invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
-invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
ReplaceInvoice=يستعاض عن فاتورة ٪ ق
ReplacementInvoice=استبدال الفاتورة
ReplacedByInvoice=بعبارة فاتورة ق ٪
@@ -87,7 +87,7 @@ ClassifyCanceled=تصنيف 'المهجورة'
ClassifyClosed=تصنيف 'مغلقة'
ClassifyUnBilled=Classify 'Unbilled'
CreateBill=إنشاء الفاتورة
-AddBill=تضيف المذكرة الائتمان أو فاتورة
+AddBill=Create invoice or credit note
AddToDraftInvoices=Add to draft invoice
DeleteBill=شطب فاتورة
SearchACustomerInvoice=البحث عن زبون فاتورة
@@ -99,7 +99,7 @@ DoPaymentBack=هل لدفع الظهر
ConvertToReduc=تحويل الخصم في المستقبل
EnterPaymentReceivedFromCustomer=دخول الدفع الواردة من العملاء
EnterPaymentDueToCustomer=من المقرر أن يسدد العميل
-DisabledBecauseRemainderToPayIsZero=لأن بقية المعوقين الدفع صفر
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
Amount=مبلغ
PriceBase=سعر الأساس
BillStatus=حالة الفاتورة
@@ -137,8 +137,6 @@ BillFrom=من
BillTo=مشروع قانون ل
ActionsOnBill=الإجراءات على فاتورة
NewBill=فاتورة جديدة
-Prélèvements=من أجل الوقوف
-Prélèvements=من أجل الوقوف
LastBills=آخر الفواتير ق ٪
LastCustomersBills=٪ ق الماضي فواتير العملاء
LastSuppliersBills=٪ ق الماضي فواتير الموردين
@@ -156,9 +154,9 @@ ConfirmCancelBill=هل أنت متأكد من أنك تريد إلغاء الف
ConfirmCancelBillQuestion=لماذا تريدها لتصنيف هذه الفاتورة 'المهجورة؟
ConfirmClassifyPaidPartially=هل أنت متأكد من أنك تريد تغيير فاتورة <b>٪ ق</b> لمركز paid؟
ConfirmClassifyPaidPartiallyQuestion=هذه الفاتورة لم تدفع بالكامل. ما هي أسباب قريبة لك هذه الفاتورة؟
-ConfirmClassifyPaidPartiallyReasonAvoir=دفع ما تبقى <b>(٪ ق ٪)</b> هي الخصم الممنوح لدفع مبلغ من قبل. أنا مع تصحيح وضع ضريبة القيمة المضافة علما ائتمان.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=دفع ما تبقى <b>(٪ ق ٪)</b> هي الخصم الممنوح لدفع مبلغ من قبل. إنني أقبل أن تفقد ضريبة القيمة المضافة على هذا الخصم.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=دفع ما تبقى <b>(٪ ق ٪)</b> هي الخصم الممنوح لدفع مبلغ من قبل. أنا استرداد ضريبة القيمة المضافة على هذا الائتمان والخصم من دون ملاحظة.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
ConfirmClassifyPaidPartiallyReasonBadCustomer=العملاء سيئة
ConfirmClassifyPaidPartiallyReasonProductReturned=المنتجات عاد جزئيا
ConfirmClassifyPaidPartiallyReasonOther=التخلي عن المبلغ لسبب آخر
@@ -191,9 +189,9 @@ AlreadyPaid=دفعت بالفعل
AlreadyPaidBack=Already paid back
AlreadyPaidNoCreditNotesNoDeposits=دفعت بالفعل (بدون تلاحظ الائتمان والودائع)
Abandoned=المهجورة
-RemainderToPay=تبقى على الدفع
-RemainderToTake=ما تبقى لاتخاذ
-RemainderToPayBack=Remainder to pay back
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
Rest=Pending
AmountExpected=المبلغ المطالب به
ExcessReceived=تلقى الزائدة
@@ -219,19 +217,18 @@ NoInvoice=لا الفاتورة
ClassifyBill=تصنيف الفاتورة
SupplierBillsToPay=دفع فواتير الموردين
CustomerBillsUnpaid=فواتير غير مدفوعة للعملاء
-DispenseMontantLettres=ليه factures rédigées قدم المساواة طرائق mécanographiques sont l' arrêté dispensées دي én lettres
-DispenseMontantLettres=ليه factures rédigées قدم المساواة طرائق mécanographiques sont l' arrêté dispensées دي én lettres
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=غير القابلة للاسترداد
SetConditions=تحدد شروط الدفع
SetMode=حدد طريقة الدفع
Billed=فواتير
-RepeatableInvoice=محددة مسبقا فاتورة
-RepeatableInvoices=محددة مسبقا والفواتير
-Repeatable=محددة مسبقا
-Repeatables=محددة مسبقا
-ChangeIntoRepeatableInvoice=تحويل محددة مسبقا
-CreateRepeatableInvoice=إنشاء فاتورة محددة مسبقا
-CreateFromRepeatableInvoice=خلق من فاتورة محددة مسبقا
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
CustomersInvoicesAndInvoiceLines=فواتير العملاء والفواتير 'خطوط
CustomersInvoicesAndPayments=العملاء والفواتير والمدفوعات
ExportDataset_invoice_1=قائمة العملاء والفواتير والفواتير 'خطوط
diff --git a/htdocs/langs/ar_SA/categories.lang b/htdocs/langs/ar_SA/categories.lang
index acdb64f33174500b80615a6cb729f463148d3e78..b67793fcf848319991e11fc75dfe27b0316eb29b 100644
--- a/htdocs/langs/ar_SA/categories.lang
+++ b/htdocs/langs/ar_SA/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories
CatCusLinks=Links between customers/prospects and categories
CatProdLinks=Links between products/services and categories
CatMemberLinks=Links between members and categories
-CatProdLinks=Links between products/services and categories
-CatCusLinks=Links between customers/prospects and categories
-CatSupLinks=Links between suppliers and categories
DeleteFromCat=Remove from category
DeletePicture=Picture delete
ConfirmDeletePicture=Confirm picture deletion?
@@ -112,3 +109,4 @@ CategoriesSetup=Categories setup
CategorieRecursiv=Link with parent category automatically
CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category
diff --git a/htdocs/langs/ar_SA/compta.lang b/htdocs/langs/ar_SA/compta.lang
index 8b753c5849ceae17972a4b41a5aec8b5d2826060..88215629f80a59118e15734410bfc5a6259c3c9f 100644
--- a/htdocs/langs/ar_SA/compta.lang
+++ b/htdocs/langs/ar_SA/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=قانون محاسبة العملاء سي
SuppliersProductsSellSalesTurnover=وقد ولدت عن طريق الدوران مبيعات الموردين المنتجات.
CheckReceipt=التحقق من إيداع
CheckReceiptShort=التحقق من إيداع
+LastCheckReceiptShort=Last %s check receipts
NewCheckReceipt=خصم جديد
NewCheckDeposit=تأكد من ايداع جديدة
NewCheckDepositOn=تهيئة لتلقي الودائع على حساب : ٪ ق
diff --git a/htdocs/langs/ar_SA/contracts.lang b/htdocs/langs/ar_SA/contracts.lang
index 689f6b4ca52d83363717e23ca016acbd22b47e4b..446ea9e2fb7dc0f4dec05de26e3f6a303b141496 100644
--- a/htdocs/langs/ar_SA/contracts.lang
+++ b/htdocs/langs/ar_SA/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=عقود منطقة
ListOfContracts=قائمة العقود
-LastContracts=آخر تعديل العقود ق ٪
+LastModifiedContracts=Last %s modified contracts
AllContracts=جميع العقود
ContractCard=عقد بطاقة
ContractStatus=عقد مركز
@@ -27,7 +27,7 @@ MenuRunningServices=ادارة الخدمات
MenuExpiredServices=انتهت الخدمات
MenuClosedServices=أغلقت الخدمات
NewContract=العقد الجديد
-AddContract=إضافة العقد
+AddContract=Create contract
SearchAContract=بحث عقد
DeleteAContract=الغاء العقد
CloseAContract=وثيقة العقد
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=قائمة تشغيل خطوط العقد
ListOfRunningServices=لائحة ادارة الخدمات
NotActivatedServices=لا تنشيط الخدمات) بين مصدق العقود)
BoardNotActivatedServices=خدمات لتفعيل العقود بين مصدق
-LastContracts=آخر تعديل العقود ق ٪
+LastContracts=Last % contracts
LastActivatedServices=ق الماضي ٪ تنشيط الخدمات
LastModifiedServices=آخر تعديل ٪ ق الخدمات
EditServiceLine=تعديل خط الخدمات
diff --git a/htdocs/langs/ar_SA/cron.lang b/htdocs/langs/ar_SA/cron.lang
index 8688153967d920c7fad84f700a3fcf1bb2f425b3..d8af5980ceb7519dbbf28378a36efb9578eaf055 100644
--- a/htdocs/langs/ar_SA/cron.lang
+++ b/htdocs/langs/ar_SA/cron.lang
@@ -1,10 +1,8 @@
# Dolibarr language file - Source file is en_US - cron
-#
# About page
About = حول
CronAbout = About Cron
CronAboutPage = Cron about page
-
# Right
Permission23101 = Read Scheduled task
Permission23102 = Create/update Scheduled task
@@ -20,9 +18,8 @@ CronExplainHowToRunUnix=On Unix environment you should use crontab to run Comman
CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
# Menu
CronJobs=Scheduled jobs
-CronListActive= List of active jobs
-CronListInactive= List of disabled jobs
-CronListActive= List of active jobs
+CronListActive=List of active/scheduled jobs
+CronListInactive=List of disabled jobs
# Page list
CronDateLastRun=Last run
CronLastOutput=Last run output
diff --git a/htdocs/langs/ar_SA/donations.lang b/htdocs/langs/ar_SA/donations.lang
index 987a81420594a2a59d01bc8a9baf627af5fc12db..a6bc12ad61a9a32bdf2e63fd2bda0a1f9fcbb617 100644
--- a/htdocs/langs/ar_SA/donations.lang
+++ b/htdocs/langs/ar_SA/donations.lang
@@ -4,7 +4,7 @@ Donations=التبرعات
DonationRef=Donation ref.
Donor=الجهات المانحة
Donors=الجهات المانحة
-AddDonation=إضافة تبرع
+AddDonation=Create a donation
NewDonation=منحة جديدة
ShowDonation=Show donation
DonationPromise=هدية الوعد
@@ -31,3 +31,8 @@ DonationRecipient=Donation recipient
ThankYou=Thank You
IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
MinimumAmount=Minimum amount is %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/ar_SA/externalsite.lang b/htdocs/langs/ar_SA/externalsite.lang
index 44a6efa2334e47374a683417b4d28e1cec983bd8..a3b4dddc6b231e8ceb44ba1a1e37219b97a99b3b 100644
--- a/htdocs/langs/ar_SA/externalsite.lang
+++ b/htdocs/langs/ar_SA/externalsite.lang
@@ -2,3 +2,4 @@
ExternalSiteSetup=رابط الإعداد لموقع خارجي
ExternalSiteURL=الخارجية الموقع URL
ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/ar_SA/holiday.lang b/htdocs/langs/ar_SA/holiday.lang
index 2c37582091f770f1e53dd5e9971b569ad6b1ee2e..0e453b010759a875915706d380b3d7f2ffbf021d 100644
--- a/htdocs/langs/ar_SA/holiday.lang
+++ b/htdocs/langs/ar_SA/holiday.lang
@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
CantCreateCP=You don't have the right to make leave requests.
InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=تحديث
CantUpdate=You cannot update this leave request.
NoDateDebut=You must select a start date.
NoDateFin=You must select an end date.
-ErrorDureeCP=Your request for holidays does not contain working day.
-TitleValidCP=Approve the request holidays
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
ConfirmValidCP=Are you sure you want to approve the leave request?
DateValidCP=Date approved
TitleToValidCP=Send leave request
ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the request holidays
+TitleRefuseCP=Refuse the leave request
ConfirmRefuseCP=Are you sure you want to refuse the leave request?
NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
+TitleCancelCP=Cancel the leave request
ConfirmCancelCP=Are you sure you want to cancel the leave request?
DetailRefusCP=Reason for refusal
DateRefusCP=Date of refusal
@@ -78,7 +77,7 @@ ActionByCP=Performed by
UserUpdateCP=For the user
PrevSoldeCP=Previous Balance
NewSoldeCP=New Balance
-alreadyCPexist=A request for holidays has already been done on this period.
+alreadyCPexist=A leave request has already been done on this period.
UserName=اسم
Employee=Employee
FirstDayOfHoliday=First day of vacation
@@ -88,25 +87,25 @@ ManualUpdate=Manual update
HolidaysCancelation=Leave request cancelation
## Configuration du Module ##
-ConfCP=Configuration of holidays module
+ConfCP=Configuration of leave request module
DescOptionCP=Description of the option
ValueOptionCP=القيمة
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
UpdateConfCPOK=Updated successfully.
ErrorUpdateConfCP=An error occurred during the update, please try again.
-AddCPforUsers=Please add the balance of holidays of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
Module27130Name= Management of leave requests
Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
TitleOptionEventCP=Settings of leave requets for events
ValidEventCP=صحة
UpdateEventCP=Update events
diff --git a/htdocs/langs/ar_SA/interventions.lang b/htdocs/langs/ar_SA/interventions.lang
index cf6fe19175fd3c062997985417b8f5829b7f4552..a3c527f874d6670c4924fac63265aada6455e8c5 100644
--- a/htdocs/langs/ar_SA/interventions.lang
+++ b/htdocs/langs/ar_SA/interventions.lang
@@ -3,7 +3,7 @@ Intervention=التدخل
Interventions=المداخلات
InterventionCard=تدخل البطاقة
NewIntervention=التدخل الجديدة
-AddIntervention=إضافة التدخل
+AddIntervention=Create intervention
ListOfInterventions=قائمة التدخلات
EditIntervention=Editer التدخل
ActionsOnFicheInter=إجراءات على التدخل
@@ -30,6 +30,15 @@ StatusInterInvoiced=فواتير
RelatedInterventions=التدخلات المتعلقة
ShowIntervention=عرض التدخل
SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=ممثل متابعة التدخل
TypeContact_fichinter_internal_INTERVENING=التدخل
diff --git a/htdocs/langs/ar_SA/mails.lang b/htdocs/langs/ar_SA/mails.lang
index 6ccd3b41b7779ea716a653828366509c4f1abc17..03b8db4771f520f2e47b986c8866768dee4fc06b 100644
--- a/htdocs/langs/ar_SA/mails.lang
+++ b/htdocs/langs/ar_SA/mails.lang
@@ -115,7 +115,7 @@ SentBy=أرسلها
MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
MailingNeedCommand2=ولكن يمكنك إرسالها عبر الإنترنت عن طريق إضافة معلمة MAILING_LIMIT_SENDBYWEB مع قيمة الحد الأقصى لعدد من رسائل البريد الإلكتروني التي تريد إرسالها من خلال هذه الدورة.
ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=لائحة واضحة
ToClearAllRecipientsClickHere=من الواضح أن المستفيدين قائمة لهذا البريد الإلكتروني ، انقر على زر
ToAddRecipientsChooseHere=إضافة إلى المتلقين ، وتختار في هذه القوائم
@@ -133,6 +133,9 @@ Notifications=الإخطارات
NoNotificationsWillBeSent=إشعارات البريد الإلكتروني لا يجري التخطيط لهذا الحدث ، وشركة
ANotificationsWillBeSent=1 سيتم إرسال الإشعار عن طريق البريد الإلكتروني
SomeNotificationsWillBeSent=ق ٪ سوف يتم إرسال الإخطارات عبر البريد الإلكتروني
-AddNewNotification=تفعيل جديد طلب إخطار بالبريد الإلكتروني
-ListOfActiveNotifications=قائمة البريد الإلكتروني لجميع طلبات الإخطار
+AddNewNotification=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
ListOfNotificationsDone=أرسلت قائمة جميع اشعارات بالبريد الالكتروني
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang
index e8ff1e2b3f21dcaaec7e0f69d5b71dca66ce1443..65692d8c64d70cb811544283295fd2ece6a8bda7 100644
--- a/htdocs/langs/ar_SA/main.lang
+++ b/htdocs/langs/ar_SA/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=فشلت في العثور على المس
ErrorNoVATRateDefinedForSellerCountry=خطأ ، لم يعرف لمعدلات ضريبة القيمة المضافة فى البلاد ٪ ق.
ErrorNoSocialContributionForSellerCountry=خطأ ، لا يوجد نوع المساهمة الاجتماعية المحددة للبلد '%s'.
ErrorFailedToSaveFile=خطأ ، وفشلت في انقاذ الملف.
-ErrorOnlyPngJpgSupported=خطأ فقط. بابوا نيو غينيا ، وجيه. شكل صورة ملف الدعم.
-ErrorImageFormatNotSupported=PHP الخاص بك لا يدعم وظائف لتحويل الصور من هذا الشكل.
SetDate=Set date
SelectDate=Select a date
SeeAlso=See also %s
BackgroundColorByDefault=لون الخلفية الافتراضي
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
FileWasNotUploaded=يتم تحديد ملف مرفق لكنه لم يكن بعد تحميلها. انقر على "ملف إرفاق" لهذا الغرض.
NbOfEntries=ملاحظة : إدخالات
GoToWikiHelpPage=الانترنت تساعد على قراءة (على ضرورة الوصول إلى الإنترنت)
@@ -266,6 +266,7 @@ Afternoon=Afternoon
Quadri=قادري
MonthOfDay=خلال شهر من اليوم
HourShort=حاء
+MinuteShort=mn
Rate=سعر
UseLocalTax=Include tax
Bytes=بايت
@@ -340,6 +341,7 @@ FullList=القائمة الكاملة
Statistics=احصاءات
OtherStatistics=آخر الإحصاءات
Status=حالة
+Favorite=Favorite
ShortInfo=Info.
Ref=المرجع.
RefSupplier=المرجع. المورد
@@ -365,6 +367,7 @@ ActionsOnCompany=الأعمال حول هذا الطرف الثالث
ActionsOnMember=أحداث حول هذا العضو
NActions=ق ٪ الإجراءات
NActionsLate=ق ٪ في وقت متأخر
+RequestAlreadyDone=Request already recorded
Filter=فلتر
RemoveFilter=إزالة فلتر
ChartGenerated=رسم ولدت
@@ -645,6 +648,7 @@ OptionalFieldsSetup=اضافية سمات الإعداد
URLPhoto=للتسجيل من الصورة / الشعار
SetLinkToThirdParty=ربط طرف ثالث آخر
CreateDraft=خلق مشروع
+SetToDraft=Back to draft
ClickToEdit=انقر للتحرير
ObjectDeleted=%s الكائن المحذوف
ByCountry=حسب البلد
@@ -678,7 +682,7 @@ ViewPrivateNote=View notes
XMoreLines=%s line(s) hidden
PublicUrl=Public URL
AddBox=Add box
-
+SelectElementAndClickRefresh=Select an element and click Refresh
# Week day
Monday=يوم الاثنين
Tuesday=الثلاثاء
diff --git a/htdocs/langs/ar_SA/margins.lang b/htdocs/langs/ar_SA/margins.lang
index ac2e3e87070480499521c4d67560020c43fddfd0..d9ad810fa757a8efad5d3fbb243ac85a0659d91d 100644
--- a/htdocs/langs/ar_SA/margins.lang
+++ b/htdocs/langs/ar_SA/margins.lang
@@ -10,24 +10,18 @@ MarkRate=Mark rate
DisplayMarginRates=Display margin rates
DisplayMarkRates=Display mark rates
InputPrice=Input price
-
margin=Profit margins management
margesSetup=Profit margins management setup
-
MarginDetails=Margin details
-
ProductMargins=Product margins
CustomerMargins=Customer margins
SalesRepresentativeMargins=Sales representative margins
-
ProductService=المنتج أو الخدمة
AllProducts=All products and services
ChooseProduct/Service=Choose product or service
-
StartDate=تاريخ البدء
EndDate=نهاية التاريخ
Launch=يبدأ
-
ForceBuyingPriceIfNull=Force buying price if null
ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0)
MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
@@ -35,16 +29,16 @@ UseDiscountAsProduct=As a product
UseDiscountAsService=As a service
UseDiscountOnTotal=On subtotal
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
-
MARGIN_TYPE=Margin type
MargeBrute=Raw margin
MargeNette=Net margin
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - Cost price
-
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
Charges=Charges
-
AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/ar_SA/orders.lang b/htdocs/langs/ar_SA/orders.lang
index b2a84c2c709a5f2ae77314cab3cc9b0f1d1ef597..fa265e9fe8eb73717b6b0cb71b19ae3cf1c0abb7 100644
--- a/htdocs/langs/ar_SA/orders.lang
+++ b/htdocs/langs/ar_SA/orders.lang
@@ -2,7 +2,7 @@
OrdersArea=أوامر منطقة العملاء
SuppliersOrdersArea=الموردين أوامر المنطقة
OrderCard=من أجل بطاقة
-# OrderId=Order Id
+OrderId=Order Id
Order=ترتيب
Orders=أوامر
OrderLine=من أجل خط
@@ -28,7 +28,7 @@ StatusOrderCanceledShort=ألغى
StatusOrderDraftShort=مسودة
StatusOrderValidatedShort=صادق
StatusOrderSentShort=في عملية
-# StatusOrderSent=Shipment in process
+StatusOrderSent=Shipment in process
StatusOrderOnProcessShort=على عملية
StatusOrderProcessedShort=تجهيز
StatusOrderToBillShort=على مشروع قانون
@@ -53,9 +53,9 @@ ShippingExist=شحنة موجود
DraftOrWaitingApproved=الموافقة على مشروع أو لم يأمر بعد
DraftOrWaitingShipped=مشروع مصادق عليه أو لم تشحن
MenuOrdersToBill=أوامر لمشروع قانون
-# MenuOrdersToBill2=Orders to bill
+MenuOrdersToBill2=Billable orders
SearchOrder=من أجل البحث
-# SearchACustomerOrder=Search a customer order
+SearchACustomerOrder=Search a customer order
ShipProduct=سفينة المنتج
Discount=الخصم
CreateOrder=خلق أمر
@@ -65,14 +65,14 @@ ValidateOrder=من أجل التحقق من صحة
UnvalidateOrder=Unvalidate النظام
DeleteOrder=من أجل حذف
CancelOrder=من أجل إلغاء
-AddOrder=من أجل إضافة
+AddOrder=Create order
AddToMyOrders=أضف إلى أوامر
AddToOtherOrders=إضافة إلى أوامر أخرى
-# AddToDraftOrders=Add to draft order
+AddToDraftOrders=Add to draft order
ShowOrder=وتبين من أجل
NoOpenedOrders=أي أوامر فتح
NoOtherOpenedOrders=أي أوامر فتح
-# NoDraftOrders=No draft orders
+NoDraftOrders=No draft orders
OtherOrders=أوامر أخرى
LastOrders=ق الماضي أوامر ٪
LastModifiedOrders=آخر تعديل أوامر ق ٪
@@ -82,7 +82,7 @@ NbOfOrders=عدد الأوامر
OrdersStatistics=أوامر إحصاءات
OrdersStatisticsSuppliers=المورد أوامر إحصاءات
NumberOfOrdersByMonth=عدد أوامر الشهر
-# AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
+AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
ListOfOrders=قائمة الأوامر
CloseOrder=وثيق من أجل
ConfirmCloseOrder=هل أنت متأكد من أجل اقفال هذا؟ مرة واحدة أمر قد انتهى ، فإنه لا يمكن إلا أن يكون فواتير.
@@ -93,7 +93,7 @@ ConfirmUnvalidateOrder=هل أنت متأكد أنك تريد استعادة <b>
ConfirmCancelOrder=هل أنت متأكد من أنك تريد إلغاء هذا النظام؟
ConfirmMakeOrder=هل أنت متأكد من أن يؤكد لك هذا النظام على <b>٪ ق؟</b>
GenerateBill=توليد الفاتورة
-# ClassifyShipped=Classify delivered
+ClassifyShipped=Classify delivered
ClassifyBilled=تصنيف "فواتير"
ComptaCard=بطاقة المحاسبة
DraftOrders=مشروع أوامر
@@ -101,7 +101,6 @@ RelatedOrders=الأوامر ذات الصلة
OnProcessOrders=على عملية أوامر
RefOrder=المرجع. ترتيب
RefCustomerOrder=المرجع. عملاء النظام
-CustomerOrder=عملاء النظام
RefCustomerOrderShort=المرجع. العملاء. ترتيب
SendOrderByMail=لكي ترسل عن طريق البريد
ActionsOnOrder=إجراءات من أجل
@@ -131,9 +130,7 @@ Error_COMMANDE_SUPPLIER_ADDON_NotDefined=لم تعرف COMMANDE_SUPPLIER_ADDON
Error_COMMANDE_ADDON_NotDefined=لم تعرف COMMANDE_ADDON مستمر
Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=لم يتم تحميل الملف وحدة '٪ ق'
Error_FailedToLoad_COMMANDE_ADDON_File=لم يتم تحميل الملف وحدة '٪ ق'
-# Error_OrderNotChecked=No orders to invoice selected
-
-
+Error_OrderNotChecked=No orders to invoice selected
# Sources
OrderSource0=اقتراح التجارية
OrderSource1=الإنترنت
@@ -144,25 +141,22 @@ OrderSource5=التجارية
OrderSource6=مخزن
QtyOrdered=الكمية أمرت
AddDeliveryCostLine=تضاف تكلفة توصيل خط يبين الوزن من أجل
-
# Documents models
PDFEinsteinDescription=من أجل نموذج كامل (logo...)
PDFEdisonDescription=نموذج النظام بسيطة
-# PDFProformaDescription=A complete proforma invoice (logo…)
+PDFProformaDescription=A complete proforma invoice (logo…)
# Orders modes
OrderByMail=بريد
OrderByFax=الفاكس
OrderByEMail=بريد إلكتروني
OrderByWWW=على الانترنت
OrderByPhone=هاتف
-
-# CreateInvoiceForThisCustomer=Bill orders
-# NoOrdersToInvoice=No orders billable
-# CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-# MenuOrdersToBill2=Orders to bill
-# OrderCreation=Order creation
-# Ordered=Ordered
-# OrderCreated=Your orders have been created
-# OrderFail=An error happened during your orders creation
-# CreateOrders=Create orders
-# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+CreateInvoiceForThisCustomer=Bill orders
+NoOrdersToInvoice=No orders billable
+CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
+OrderCreation=Order creation
+Ordered=Ordered
+OrderCreated=Your orders have been created
+OrderFail=An error happened during your orders creation
+CreateOrders=Create orders
+ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
diff --git a/htdocs/langs/ar_SA/oscommerce.lang b/htdocs/langs/ar_SA/oscommerce.lang
deleted file mode 100644
index a6668b2519fda96bcd5ccdd9c8d153511bf0d38a..0000000000000000000000000000000000000000
--- a/htdocs/langs/ar_SA/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=نظام التشغيل والتجارة
-OSCommerceSetup=نظام تشغيل وحدة التجارة الإعداد
-OSCommerceSetupSaved=التجارة إعداد نظام التشغيل الموفرة
-OSCommerceServer=نظام تشغيل الخادم المضيف التجارة / الملكية الفكرية
-OSCommerceDatabaseName=اسم قاعدة بيانات نظام التشغيل والتجارة
-OSCommercePrefix=نظام التشغيل التجاري بادئة الجداول
-OSCommerceUser=قاعدة بيانات التجارة ادخل نظام التشغيل
diff --git a/htdocs/langs/ar_SA/other.lang b/htdocs/langs/ar_SA/other.lang
index f349799841dae64aed1c46b8d3ee3194732f0eec..4500fbcdd8b2716b40143d615403ce4bb358f0fe 100644
--- a/htdocs/langs/ar_SA/other.lang
+++ b/htdocs/langs/ar_SA/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=رمز الحماية
Calendar=التقويم
-AddTrip=إضافة رحلة
Tools=أدوات
ToolsDesc=ويكرس هذا المجال لمجموعة الأدوات المتنوعة التي لم تتوفر في إدخالات القوائم الأخرى. <br><br> ويمكن الوصول إلى هذه الأدوات من القائمة على الجانب.
Birthday=عيد ميلاد
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation
Notify_TASK_CREATE=Task created
Notify_TASK_MODIFY=Task modified
Notify_TASK_DELETE=Task deleted
+SeeModuleSetup=See module setup
NbOfAttachedFiles=عدد الملفات المرفقة / وثائق
TotalSizeOfAttachedFiles=اجمالى حجم الملفات المرفقة / وثائق
MaxSize=الحجم الأقصى
@@ -80,6 +80,16 @@ ModifiedBy=المعدلة ق ٪
ValidatedBy=يصادق عليها ق ٪
CanceledBy=ألغى به ق ٪
ClosedBy=أغلقت ٪ ق
+CreatedById=User id who created
+ModifiedById=User id who made last change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made last change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
FileWasRemoved=تم حذف الملف
DirWasRemoved=دليل أزيل
FeatureNotYetAvailableShort=متاحة في الإصدار التالي
@@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your
##### Calendar common #####
AddCalendarEntry=إضافة الدخول في التقويم ق ٪
-NewCompanyToDolibarr=وأضافت الشركة ل ٪ الى Dolibarr
-ContractValidatedInDolibarr=ق ٪ العقد المصادق عليه في Dolibarr
-ContractCanceledInDolibarr=٪ ق الغاء العقد في Dolibarr
-ContractClosedInDolibarr=ق ٪ مغلقا عقد في Dolibarr
-PropalClosedSignedInDolibarr=اقتراح ٪ ق الذي وقع في Dolibarr
-PropalClosedRefusedInDolibarr=ق رفض الاقتراح ٪ في Dolibarr
-PropalValidatedInDolibarr=اقتراح ٪ في التحقق من صحة المستندات Dolibarr
-InvoiceValidatedInDolibarr=فاتورة ٪ في التحقق من صحة المستندات Dolibarr
-InvoicePaidInDolibarr=ق ٪ الفاتورة المدفوعة في تغيير Dolibarr
-InvoiceCanceledInDolibarr=فاتورة ٪ ق الغى في Dolibarr
-PaymentDoneInDolibarr=ق ٪ الدفع به في Dolibarr
-CustomerPaymentDoneInDolibarr=العميل بدفع ٪ ق عمله في Dolibarr
-SupplierPaymentDoneInDolibarr=المورد ٪ ق دفع به في Dolibarr
-MemberValidatedInDolibarr=عضو ٪ في التحقق من صحة المستندات Dolibarr
-MemberResiliatedInDolibarr=عضو في resiliated ٪ ق Dolibarr
-MemberDeletedInDolibarr=عضو ٪ ق حذفها من Dolibarr
-MemberSubscriptionAddedInDolibarr=الاكتتاب عضو ق ٪ وأضاف في Dolibarr
-ShipmentValidatedInDolibarr=%s شحنة التحقق من صحتها في Dolibarr
-ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
##### Export #####
Export=تصدير
ExportsArea=صادرات المنطقة
diff --git a/htdocs/langs/ar_SA/paybox.lang b/htdocs/langs/ar_SA/paybox.lang
index 4e950f0ba13f658afe8b8f3a10970106e93103eb..36cef5fe4cc1ece14252162ef9267c88f0ee45a0 100644
--- a/htdocs/langs/ar_SA/paybox.lang
+++ b/htdocs/langs/ar_SA/paybox.lang
@@ -32,6 +32,9 @@ VendorName=اسم البائع
CSSUrlForPaymentForm=عزيزي ورقة النمط المغلق للنموذج الدفع
MessageOK=رسالة على الصفحة التحقق من صحة الدفع عودة
MessageKO=رسالة في إلغاء دفع الصفحة عودة
-# NewPayboxPaymentReceived=New Paybox payment received
-# NewPayboxPaymentFailed=New Paybox payment tried but failed
-# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+NewPayboxPaymentReceived=New Paybox payment received
+NewPayboxPaymentFailed=New Paybox payment tried but failed
+PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/ar_SA/resource.lang b/htdocs/langs/ar_SA/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..d64075dfbf595897a63e3eebf19194d8f71030dd
--- /dev/null
+++ b/htdocs/langs/ar_SA/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
diff --git a/htdocs/langs/ar_SA/sendings.lang b/htdocs/langs/ar_SA/sendings.lang
index 82b1e7a1126dd08d50314cf9c4566efe377b425d..8821b3f6aca508e2af3fc6ae727c654e022c8da0 100644
--- a/htdocs/langs/ar_SA/sendings.lang
+++ b/htdocs/langs/ar_SA/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=لحظة، ويتم إنشاء لشحنة جدي
RelatedShippings=Related shippings
ShipmentLine=Shipment line
CarrierList=List of transporters
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
# Sending methods
SendingMethodCATCH=القبض على العملاء
diff --git a/htdocs/langs/ar_SA/stocks.lang b/htdocs/langs/ar_SA/stocks.lang
index 6c31869aa9d2c7ca34d90d6623e465ced3262524..d2157295ec97551df3dd62db0a1b1e4c5b83c613 100644
--- a/htdocs/langs/ar_SA/stocks.lang
+++ b/htdocs/langs/ar_SA/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=مستودع العلامة مطلوبة
CorrectStock=تصحيح الأوراق المالية
ListOfWarehouses=لائحة المخازن
ListOfStockMovements=قائمة الحركات الأسهم
-StocksArea=مخزون المنطقة
+StocksArea=Warehouses area
Location=عوضا عن
LocationSummary=باختصار اسم الموقع
NumberOfDifferentProducts=Number of different products
diff --git a/htdocs/langs/ar_SA/users.lang b/htdocs/langs/ar_SA/users.lang
index 9e27d64edffb255d60ffd40c40384253e9b4a94e..e0d5726d41b64eb9a1d63f7fd09bf6fc6706a931 100644
--- a/htdocs/langs/ar_SA/users.lang
+++ b/htdocs/langs/ar_SA/users.lang
@@ -63,7 +63,6 @@ ShowGroup=وتبين لفريق
ShowUser=وتظهر للمستخدم
NonAffectedUsers=غير المتأثرة المستخدمين
UserModified=المعدل المستخدم بنجاح
-GroupModified=تعديل المجموعة بنجاح
PhotoFile=ملف الصور
UserWithDolibarrAccess=مع وصول المستخدمين Dolibarr
ListOfUsersInGroup=قائمة المستخدمين في هذه المجموعة
@@ -103,7 +102,7 @@ UserDisabled=مستخدم ٪ ق المعوقين
UserEnabled=مستخدم ٪ ق تفعيلها
UserDeleted=ق إزالة المستخدم ٪
NewGroupCreated=أنشأت مجموعة ق ٪
-GroupModified=تعديل المجموعة بنجاح
+GroupModified=Group %s modified
GroupDeleted=فريق ازالة ق ٪
ConfirmCreateContact=هل أنت متأكد من خلق Dolibarr حساب هذا الاتصال؟
ConfirmCreateLogin=هل أنت متأكد من خلق Dolibarr حساب هذا؟
@@ -114,8 +113,10 @@ YourRole=الأدوار الخاص
YourQuotaOfUsersIsReached=يتم التوصل إلى حصة الخاص بك من المستخدمين النشطين!
NbOfUsers=ملحوظة من المستخدمين
DontDowngradeSuperAdmin=يمكن فقط superadmin تقليله a superadmin
-HierarchicalResponsible=Hierarchical responsible
+HierarchicalResponsible=Supervisor
HierarchicView=Hierarchical view
UseTypeFieldToChange=Use field Type to change
OpenIDURL=OpenID URL
LoginUsingOpenID=Use OpenID to login
+WeeklyHours=Weekly hours
+ColorUser=Color of the user
diff --git a/htdocs/langs/ar_SA/withdrawals.lang b/htdocs/langs/ar_SA/withdrawals.lang
index 25dfca754941690b5a036be705f27012bbcbd8cb..96323e4b1bb3a4a89945e396e268cf03d909914c 100644
--- a/htdocs/langs/ar_SA/withdrawals.lang
+++ b/htdocs/langs/ar_SA/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=ورود
LastWithdrawalReceipts=ق الماضي سحب إيصالات ٪
WithdrawedBills=Withdrawed الفواتير
WithdrawalsLines=خطوط السحب
-RequestStandingOrderToTreat=طلب لأوامر دائمة لمعالجة
-RequestStandingOrderTreated=طلب تعامل أوامر دائمة
+RequestStandingOrderToTreat=Request for standing orders to process
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=الزبون أوامر دائمة
CustomerStandingOrder=يقف النظام العميل
NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
@@ -40,14 +41,13 @@ TransMetod=طريقة البث
Send=إرسال
Lines=خطوط
StandingOrderReject=رفض إصدار
-InvoiceRefused=تهمة الرفض لزبون
WithdrawalRefused=سحب Refuseds
WithdrawalRefusedConfirm=هل أنت متأكد أنك تريد الدخول في رفض الانسحاب للمجتمع
RefusedData=تاريخ الرفض
RefusedReason=أسباب الرفض
RefusedInvoicing=رفض الفواتير
NoInvoiceRefused=لا تهمة الرفض
-InvoiceRefused=تهمة الرفض لزبون
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=حالة
StatusUnknown=غير معروف
StatusWaiting=انتظار
@@ -76,7 +76,7 @@ WithBankUsingRIB=عن الحسابات المصرفية باستخدام RIB
WithBankUsingBANBIC=عن الحسابات المصرفية باستخدام IBAN / BIC / SWIFT
BankToReceiveWithdraw=حساب مصرفي لتلقي تنسحب
CreditDate=الائتمان على
-WithdrawalFileNotCapable=غير قادر على توليد سحب ملف استلام لبلدك
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
ShowWithdraw=وتظهر سحب
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=ومع ذلك، إذا فاتورة واحدة على الأقل دفع انسحاب لا تتم معالجتها حتى الآن، فإنه لن يكون كما سيولي للسماح لإدارة الانسحاب قبل.
DoStandingOrdersBeforePayments=هذه علامات تسمح لك لطلب لاستصدار أمر دائم. مرة واحدة وسيتم الانتهاء من ذلك، يمكنك كتابة دفع لإغلاق الفاتورة.
diff --git a/htdocs/langs/bg_BG/accountancy.lang b/htdocs/langs/bg_BG/accountancy.lang
index 8cab9d2b651d75b0721d76fda619e2034e4509b4..56ea784ecdf967f45489937e101c004c0b4752fd 100644
--- a/htdocs/langs/bg_BG/accountancy.lang
+++ b/htdocs/langs/bg_BG/accountancy.lang
@@ -7,7 +7,7 @@ Chartofaccounts=Chart of accounts
Fiscalyear=Fiscal years
Menuaccount=Accounting accounts
Menuthirdpartyaccount=Thirdparty accounts
-MenuTools=Tools
+MenuTools=Инструменти
ConfigAccountingExpert=Configuration of the module accounting expert
Journaux=Journals
@@ -25,19 +25,19 @@ Selectchartofaccounts=Select a chart of accounts
Validate=Validate
Addanaccount=Add an accounting account
AccountAccounting=Accounting account
-Ventilation=Ventilation
+Ventilation=Breakdown
ToDispatch=To dispatch
Dispatched=Dispatched
-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
TradeMargin=Trade margin
-Reports=Reports
+Reports=Отчети
ByCustomerInvoice=By invoices customers
-ByMonth=By Month
+ByMonth=По месец
NewAccount=New accounting account
Update=Update
-List=List
+List=Списък
Create=Create
UpdateAccount=Modification of an accounting account
UpdateMvts=Modification of a movement
@@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger
Bookkeeping=General ledger
AccountBalanceByMonth=Account balance by month
-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
Line=Line
CAHTF=Total purchase supplier HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice
IntoAccount=In the accounting account
Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
+VentilationAuto=Automatic breakdown
Processing=Processing
EndProcessing=The end of processing
@@ -66,11 +66,11 @@ Lineofinvoice=Line of invoice
VentilatedinAccount=Ventilated successfully in the accounting account
NotVentilatedinAccount=Not ventilated in the accounting account
-ACCOUNTING_SEPARATORCSV=Separator CSV
+ACCOUNTING_SEPARATORCSV=Разделител CSV (стандарт за разделяне със "," запетя)
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
@@ -92,17 +92,17 @@ ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold produ
ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
-Doctype=Type of document
-Docdate=Date
-Docref=Reference
-Numerocompte=Account
-Code_tiers=Thirdparty
-Labelcompte=Label account
-Debit=Debit
-Credit=Credit
-Amount=Amount
+Doctype=Тип на документа
+Docdate=Дата
+Docref=Справка
+Numerocompte=Сметка
+Code_tiers=Трета страна
+Labelcompte=Етикет на сметка
+Debit=Дебит
+Credit=Кредит
+Amount=Сума
Sens=Sens
-Codejournal=Journal
+Codejournal=Дневник
DelBookKeeping=Delete the records of the general ledger
@@ -140,19 +140,19 @@ Active=Statement
NewFiscalYear=New fiscal year
-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
TotalVente=Total turnover HT
TotalMarge=Total sales margin
DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
ChangeAccount=Change the accounting account for lines selected by the account:
Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
-ValidateHistory=Validate Automatically
+ValidateHistory=Валидирайте автоматично
-ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+ErrorAccountancyCodeIsAlreadyUse=Възникна грешка, вие не можете да изтриете тази счетоводна сметка, защото се използва.
-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index 7141ecac2a94ac357dc201c895a68507801bcb9a..2300a4772e894ad5dca9be745f6628e05e4ada7e 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -12,10 +12,10 @@ SessionId=ID на сесията
SessionSaveHandler=Handler за да запазите сесията
SessionSavePath=Място за съхранение на сесията
PurgeSessions=Изчистване на сесиите
-ConfirmPurgeSessions=Do you really want to purge all sessions ? This will disconnect every user (except yourself).
+ConfirmPurgeSessions=Сигурни ли сте, че желаете да изчистите всички сесии? Това ще прекъсне всички потребители (освен Вас).
NoSessionListWithThisHandler=Запиши сесиен манипулатор конфигурирани във вашата PHP, не позволява да се изброят всички текущи сесии.
LockNewSessions=Заключване за нови свързвания
-ConfirmLockNewSessions=Сигурен ли сте, че искате да ограничите всяка нова връзка Dolibarr за себе си. Само <b>%s</b> потребителят ще бъде в състояние да се свърже след това.
+ConfirmLockNewSessions=Сигурни ли сте, че желаете да ограничите всяка нова връзка Dolibarr за себе си. Само <b>%s</b> потребителят ще бъде в състояние да се свърже след това.
UnlockNewSessions=Разрешаване на свързването
YourSession=Вашата сесия
Sessions=Потребителска сесия
@@ -42,20 +42,20 @@ RestoreLock=Възстановете файла <b>%s,</b> само с прав
SecuritySetup=Настройки на сигурността
ErrorModuleRequirePHPVersion=Грешка, този модул изисква PHP версия %s или по-висока
ErrorModuleRequireDolibarrVersion=Грешка, този модул изисква Dolibarr версия %s или по-висока
-ErrorDecimalLargerThanAreForbidden=Грешка, с точност по-висока от <b>%s</b> не се поддържа.
+ErrorDecimalLargerThanAreForbidden=Грешка, точност по-висока от <b>%s</b> не се поддържа.
DictionarySetup=Dictionary setup
Dictionary=Dictionaries
Chartofaccounts=Chart of accounts
Fiscalyear=Fiscal years
-ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
-ErrorCodeCantContainZero=Code can't contain value 0
-DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
+ErrorReservedTypeSystemSystemAuto=Стойност 'система' и 'автосистема' за типа са запазени. Може да използвате за стойност 'потребител' при добавяне на ваш личен запис.
+ErrorCodeCantContainZero=Кода не може да съдържа стойност 0
+DisableJavascript=Изключете функциите JavaScript и Ajax (Препоръчва се за незрящи и при текстови браузъри)
ConfirmAjax=Използвайте Аякс потвърждение изскачащи прозорци
UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectCompany=Use autocompletion fields to choose third parties instead of using a list box.
+UseSearchToSelectCompany=Използвайте автоматично довършване на полета, за избране на трети страни, вместо да използват списъка от полето.
ActivityStateToSelectCompany= Добавяне на филтър опция за показване / скриване на thirdparties, които в момента са в дейност или е престанала
UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+UseSearchToSelectContact=Използвайте автоматично довършване полета, за избор на контакт (вместо да използвте списъка от полето).
SearchFilter=Опции на филтрите за търсене
NumberOfKeyToSearch=NBR от знаци, за да предизвика търсене: %s
ViewFullDateActions=Показване на пълните събития дати в третия лист
@@ -70,16 +70,16 @@ CurrentTimeZone=TimeZone PHP (сървър)
MySQLTimeZone=TimeZone MySql (database)
TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
Space=Пространство
-Table=Table
+Table=Таблица
Fields=Полетата
-Index=Index
+Index=Индекс
Mask=Маска
NextValue=Следваща стойност
NextValueForInvoices=Следваща стойност (фактури)
NextValueForCreditNotes=Следваща стойност (кредитни известия)
NextValueForDeposit=Next value (deposit)
NextValueForReplacements=Next value (replacements)
-MustBeLowerThanPHPLimit=Забележка: PHP ограничава размера на всяко качване на файлове на %s <b>%s,</b> независимо от стойността на този параметър е
+MustBeLowerThanPHPLimit=Забележка: PHP ограничава размера на всяко качване на файлове на <b>%s</b> %s, независимо от стойността на този параметър е
NoMaxSizeByPHPLimit=Забележка: Не срокът се определя в конфигурацията на вашия PHP
MaxSizeForUploadedFiles=Максимален размер за качените файлове (0 за да забраните качване)
UseCaptchaCode=Използвайте графичен код (CAPTCHA) на страницата за вход
@@ -118,28 +118,28 @@ ParameterInDolibarr=Параметър %s
LanguageParameter=Езиков параметър %s
LanguageBrowserParameter=Параметър %s
LocalisationDolibarrParameters=Локализация параметри
-ClientTZ=Client Time Zone (user)
-ClientHour=Client time (user)
-OSTZ=Server OS Time Zone
-PHPTZ=PHP server Time Zone
+ClientTZ=Часова зона на клиента (потребител)
+ClientHour=Час на клиента (потребител)
+OSTZ=Часова зона на Операционната Система
+PHPTZ=Часова зона на PHP Сървъра
PHPServerOffsetWithGreenwich=PHP сървъра компенсира широчина Гринуич (секунди)
ClientOffsetWithGreenwich=Клиент / Browser компенсира широчина Гринуич (секунди)
DaylingSavingTime=Лятното часово време
-CurrentHour=PHP Time (server)
-CompanyTZ=Company Time Zone (main company)
-CompanyHour=Company Time (main company)
+CurrentHour=Час на PHP (сървър)
+CompanyTZ=Часова зона на фирмата (основна фирма)
+CompanyHour=Час на фирмата (основна фирма)
CurrentSessionTimeOut=Продължителност на текущата сесия
YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
OSEnv=OS околната среда
Box=Кутия
Boxes=Кутии
MaxNbOfLinesForBoxes=Максимален брой на редовете за кутии
-PositionByDefault=Подразбиране за
-Position=Position
+PositionByDefault=Default order
+Position=Длъжност
MenusDesc=Менюта мениджърите определят съдържанието на две ленти с менюта (хоризонтална лента и вертикална лента).
MenusEditorDesc=Менюто редактор ви позволяват да определите персонализирани вписвания в менютата. Използвайте го внимателно, за да се избегне dolibarr нестабилна и записи в менюто постоянно недостижим. <br> Някои модули добавяне на записи в менютата (в менюто <b>Всички</b> в повечето случаи). Ако сте премахнали някои от тези записи по погрешка, можете да ги възстановите, като изключите и отново да активирате модула.
MenuForUsers=Меню за потребители
-LangFile=.lang file
+LangFile=.lang файл
System=Система
SystemInfo=Системна информация
SystemTools=Системни инструменти
@@ -171,7 +171,7 @@ ImportMethod=Внос метод
ToBuildBackupFileClickHere=За изграждането на резервно копие на файла, натиснете <a href="%s">тук</a> .
ImportMySqlDesc=За да импортирате архивния файл, трябва да използвате MySQL команда от командния ред:
ImportPostgreSqlDesc=За да импортирате архивния файл, трябва да използвате pg_restore команда от командния ред:
-ImportMySqlCommand=%s %s <mybackupfile.sql
+ImportMySqlCommand=%s %s < mybackupfile.sql
ImportPostgreSqlCommand=%s %s mybackupfile.sql
FileNameToGenerate=Име на генерирания файл
Compression=Компресия
@@ -210,8 +210,8 @@ ModulesMarketPlaces=Повече модули ...
DoliStoreDesc=DoliStore, официалният пазар за външни модули за Dolibarr ERP/CRM
WebSiteDesc=Доставчици на уеб сайта можете да търсите да намерите повече модули ...
URL=Връзка
-BoxesAvailable=Кутии наличните
-BoxesActivated=Кутии активира
+BoxesAvailable=Налични Кутии
+BoxesActivated=Активирани Кутии
ActivateOn=Активиране на
ActiveOn=Активирана
SourceFile=Изходният файл
@@ -238,7 +238,7 @@ OfficialWebSiteFr=Френски официален уеб сайт
OfficialWiki=Dolibarr документация на Wiki
OfficialDemo=Dolibarr онлайн демо
OfficialMarketPlace=Официален магазин за външни модули/добавки
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
+OfficialWebHostingService=Препоръчителен уеб хостинг услуги (хостинг в интернет облак)
ReferencedPreferredPartners=Preferred Partners
OtherResources=Autres ressources
ForDocumentationSeeWiki=Документация за потребител или разработчик (Doc, често задавани въпроси ...), <br> можете да намерите в Dolibarr Wiki: <br> <a href="%s" target="_blank"><b>%s</b></a>
@@ -283,11 +283,11 @@ ModuleFamilyProjects=Проекти / съвместна работа
ModuleFamilyOther=Друг
ModuleFamilyTechnic=Mutli модули инструменти
ModuleFamilyExperimental=Експериментални модули
-ModuleFamilyFinancial=Финансови Модули (Счетоводство / Каса)
+ModuleFamilyFinancial=Финансови Модули (Счетоводство/Каса)
ModuleFamilyECM=Електронно Управление на Съдържанието (ECM)
MenuHandlers=Меню работещи
MenuAdmin=Menu Editor
-DoNotUseInProduction=Do not use in production
+DoNotUseInProduction=Не използвайте на продукшън платформа
ThisIsProcessToFollow=Това е настройка на процеса:
StepNb=Стъпка %s
FindPackageFromWebSite=Намери пакет, който осигурява функция искате (например относно официалния уеб сайт %s).
@@ -302,7 +302,7 @@ CurrentVersion=Текуща версия на Dolibarr
CallUpdatePage=Отидете на страницата, която се актуализира структурата на базата данни и презареждане на: %s.
LastStableVersion=Последна стабилна версия
GenericMaskCodes=Можете да въведете всяка маска за номериране. В тази маска, могат да се използват следните тагове: <br> <b>{000000}</b> съответства на номер, който се увеличава на всеки %s. Влез като много нули като желаната дължина на брояча. Броячът ще бъде завършен с нули от ляво, за да има колкото се може повече нули като маска. <br> <b>{000000 000}</b> същата като предишната, но компенсира, съответстваща на броя на правото на знака + се прилага започва на първи %s. <br> <b>{000000 @}</b> същата като предишната, но броячът се нулира, когато месеца Х е достигнал (Х между 1 и 12, или 0, за да използвате началото на месеца на фискалната година, определени в вашата конфигурация). Ако тази опция се използва и х е 2 или по-висока, тогава последователност {гг} {mm} или {гггг} {mm} също е задължително. <br> <b>{DD}</b> ден (01 до 31). <br> <b>{Mm}</b> месец (01 до 12). <br> <b>{Гг} {гггг}</b> или <b>{Y}</b> година над 2, 4 или 1 брой. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> клиентския код в знака n <br><b>{cccc000}</b>клиентския код в знак n се следва от брояч предназначен за клиента. Този брояч предназначен за клиента се нулира в същото време в което и глобалния брояч.<br><b>{tttt}</b> Кодът на типа трети страни в знака n (погледнете речник-типове трети страни).<br>
GenericMaskCodes3=Всички други символи на маската ще останат непокътнати. <br> Интервалите не са разрешени. <br>
GenericMaskCodes4a=<u>Пример за използване на 99 %s на третата страна КОМПАНИЯТА извършва 2007-01-31:</u> <br>
GenericMaskCodes4b=<u>Пример за трета страна е създаден на 2007-03-01:</u> <br>
@@ -437,8 +437,8 @@ Module52Name=Запаси
Module52Desc=Управление на склад (продукти)
Module53Name=Услуги
Module53Desc=Управление на услуги
-Module54Name=Договори
-Module54Desc=Управлението на договорите и услуги
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=Баркодове
Module55Desc=Управление на баркод
Module56Name=Телефония
@@ -475,8 +475,8 @@ Module320Name=RSS емисия
Module320Desc=Добавяне на RSS емисия в страниците на Dolibarr
Module330Name=Отметки
Module330Desc=Управление на отметки
-Module400Name=Проекти
-Module400Desc=Управление на проекти вътре в други модули
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=Webcalendar
Module410Desc=Webcalendar интеграция
Module500Name=Special expenses (tax, social contributions, dividends)
@@ -484,7 +484,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di
Module510Name=Salaries
Module510Desc=Management of employees salaries and payments
Module600Name=Известия
-Module600Desc=Изпращане известия по имейл за някои бизнес събития в Dolibarr към трети лица
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Дарения
Module700Desc=Управление на дарения
Module1200Name=Богомолка
@@ -514,16 +514,16 @@ Module5000Name=Няколко фирми
Module5000Desc=Позволява ви да управлявате няколко фирми
Module6000Name=Workflow
Module6000Desc=Workflow management
-Module20000Name=Отпуски
-Module20000Desc=Управление на отпуските на служителите
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
Module39000Name=Product batch
Module39000Desc=Batch number, eat-by and sell-by date management on products
Module50000Name=Paybox
Module50000Desc=Модул предлага онлайн страница на плащане с кредитна карта с Paybox
Module50100Name=Точка на продажбите
Module50100Desc=Точка на продажбите модул
-Module50200Name= Paypal
-Module50200Desc= Модул предлага онлайн страница на плащане с кредитна карта с Paypal
+Module50200Name=Paypal
+Module50200Desc=Модул предлага онлайн страница на плащане с кредитна карта с Paypal
Module50400Name=Accounting (advanced)
Module50400Desc=Accounting management (double parties)
Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=Нареждания за периодични преводи
Permission152=Създаване / промяна на постоянни нареждания, искане
Permission153=Кутия постоянни нареждания разписки
Permission154=Кредит / отказват постоянни постъпления поръчки
-Permission161=Прочети договори
-Permission162=Създаване / промяна на договорите
-Permission163=Активиране на услугата на договор
-Permission164=Изключване услуга на договор
-Permission165=Изтриване на договори
-Permission171=Прочети пътувания
-Permission172=Създаване / промяна пътувания
-Permission173=Изтриване пътувания
-Permission178=Износ пътувания
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Read trips and expenses (own and his subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
Permission180=Прочети доставчици
Permission181=Доставчика поръчки
Permission182=Създаване / промяна на доставчика поръчки
@@ -671,7 +672,7 @@ Permission300=Баркодове
Permission301=Създаване / промяна на баркодове
Permission302=Изтриване на баркодове
Permission311=Прочети услуги
-Permission312=Присвояване услуга за сключване на договор
+Permission312=Assign service/subscription to contract
Permission331=Прочетете отметките
Permission332=Създаване / промяна на отметки
Permission333=Изтриване на отметки
@@ -701,8 +702,8 @@ Permission701=Прочети дарения
Permission702=Създаване / промяна на дарения
Permission703=Изтриване на дарения
Permission1001=Прочети запаси
-Permission1002=Създаване / промяна на запасите
-Permission1003=Изтриване на запасите
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=Движението на стоковите наличности
Permission1005=Създаване / промяна на движението на стоковите наличности
Permission1101=Поръчките за доставка
@@ -1038,7 +1039,6 @@ YesInSummer=Yes in summer
OnlyFollowingModulesAreOpenedToExternalUsers=Имайте впредвид, че само следните модули са отворени за външни потребители (каквито и да са правата на тези потребители):
SuhosinSessionEncrypt=Session storage encrypted by Suhosin
ConditionIsCurrently=Condition is currently %s
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
YouUseBestDriver=You use driver %s that is best driver available currently.
YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=Връщане счетоводна код, постр
ModuleCompanyCodePanicum=Връща празна код счетоводство.
ModuleCompanyCodeDigitaria=Счетоводството код зависи от код на трето лице. Код се състои от буквата "C" на първа позиция, следван от първите 5 символа на код на трета страна.
UseNotifications=Използвайте уведомления
-NotificationsDesc=Функцията за уведомления по имейл позволява тихо изпращане на автоматичен мейл, за някои събития в Dolibarr, на трети лица (клиенти и доставчици), които са конфигурирани. Избор на активно уведомяване и цели контакти е направен на една трета страна в момента.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
ModelModules=Документи шаблони
DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
WatermarkOnDraft=Воден знак върху проект на документ
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=Добавяне на способността дат
UseOptionLineIfNoQuantity=Линия на продукт / услуга с нулева сума се разглежда като вариант
FreeLegalTextOnProposal=Свободен текст на търговски предложения
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=Настройки за управление на поръчки
OrdersNumberingModules=Поръчки номериране модули
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list
ValidOrderAfterPropalClosed=Да се потвърди ред след предложението близо, това прави възможно да не се увеличат с временния ред
FreeLegalTextOnOrders=Свободен текст на поръчки
WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
##### Clicktodial #####
ClickToDialSetup=Кликнете, за да наберете настройка модул
ClickToDialUrlDesc=Адреса нарича, когато се извършва едно кликване на телефона пиктограма. URL, можете да използвате маркери <br> <b>__PHONETO__,</b> Които ще бъдат заменени с телефонния номер на лицето, да се обадите <br> <b>__PHONEFROM__,</b> Че ще бъде заменен с телефонния номер на повикващата лице (твое) <br> <b>__LOGIN__,</b> Които ще бъдат заменени с clicktodial вход (определено на вашето потребителско карта) <br> <b>__PASS__,</b> Които ще бъдат заменени с clicktodial вашата парола (определено на вашето потребителско карта).
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=Модули за намеса номериране
TemplatePDFInterventions=Намеса карти документи модели
WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
##### Contracts #####
-ContractsSetup=Договори модул за настройка
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=Договори за номериране модули
TemplatePDFContracts=Contracts documents models
FreeLegalTextOnContracts=Free text on contracts
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
CacheByServer=Cache by server
CacheByClient=Cache by browser
CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=Продукти модул за настройка
ServiceSetup=Услуги модул за настройка
@@ -1382,9 +1384,10 @@ MailingSetup=Настройка на модул Имейли
MailingEMailFrom=Изпращач (От) за имейли, изпратени от модула за електронна поща
MailingEMailError=Върнете имейл (грешки) за имейли с грешки
##### Notification #####
-NotificationSetup=Настройки на модул за уведомление по e-mail
+NotificationSetup=EMail notification module setup
NotificationEMailFrom=Изпращач (От) за имейли, изпратени за уведомления
-ListOfAvailableNotifications=Списък на наличните уведомления (Този списък зависи от активирани модули)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
##### Sendings #####
SendingsSetup=Изпращане модул за настройка
SendingsReceiptModel=Изпращане получаване модел
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=Връзка към "%s" сървър на "%s&q
OSCommerceTestKo1=Свързване към сървър "%s успее, но база данни" %s "не може да бъде постигнато.
OSCommerceTestKo2=Връзка към сървъра "%s" с потребителя %s "се провали.
##### Stock #####
-StockSetup=Наличност модулна конфигурация
-UserWarehouse=Използване на потребителски поименни акции
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=Меню заличават
TreeMenu=Tree менюта
@@ -1478,11 +1482,14 @@ ClickToDialDesc=Този модул позволява да добавите и
##### Point Of Sales (CashDesk) #####
CashDesk=Точка на продажбите
CashDeskSetup=Точка на продажбите модул за настройка
-CashDeskThirdPartyForSell=Generic трета страна да използва за продава
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Акаунт по подразбиране да се използва за получаване на парични плащания
CashDeskBankAccountForCheque= Акаунт по подразбиране да се използва за получаване на плащания с чек
CashDeskBankAccountForCB= Акаунт по подразбиране да се използва за получаване на парични плащания с кредитни карти
-CashDeskIdWareHouse=Склад да се използва за продава
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Bookmark настройка модул
BookmarkDesc=Този модул ви позволява да управлявате отметките. Можете да добавяте преки пътища към страници на Dolibarr или външни уеб сайтове в лявото меню.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Delete fiscal year
ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
Opened=Opened
Closed=Closed
-
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
diff --git a/htdocs/langs/bg_BG/agenda.lang b/htdocs/langs/bg_BG/agenda.lang
index 33d388b055f4389911b2d3a6b22fe8bd19a3083b..b97d5a8658d9e6dd42c1b8a09983d173fc504c71 100644
--- a/htdocs/langs/bg_BG/agenda.lang
+++ b/htdocs/langs/bg_BG/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= Автоматично попълване
AgendaAutoActionDesc= Определете тук събития, за които искате Dolibarr да създадете автоматично събитие в дневния ред. Ако нищо не се проверява (по подразбиране), само ръчни действия ще бъдат включени в дневния ред.
AgendaSetupOtherDesc= Тази страница предоставя възможности да се допусне износ на вашите събития Dolibarr в външен календар (Thunderbird, Google Calendar, ...)
AgendaExtSitesDesc=Тази страница позволява да се обяви външните източници на календари, за да видят своите събития в дневния ред Dolibarr.
-ActionsEvents= Събития, за които Dolibarr ще създаде действие в дневния ред автоматично
-PropalValidatedInDolibarr= Proposal %s validated
-InvoiceValidatedInDolibarr= Фактура %s валидирани
+ActionsEvents=Събития, за които Dolibarr ще създаде действие в дневния ред автоматично
+PropalValidatedInDolibarr=Proposal %s validated
+InvoiceValidatedInDolibarr=Фактура %s валидирани
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=Фактура %s се върнете в състояние на чернова
InvoiceDeleteDolibarr=Invoice %s deleted
OrderValidatedInDolibarr= Поръчка %s валидирани
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Поръчка %s одобрен
OrderRefusedInDolibarr=Order %s refused
OrderBackToDraftInDolibarr=Поръчка %s се върне в състояние на чернова
OrderCanceledInDolibarr=Поръчка %s отменен
-InterventionValidatedInDolibarr=Намеса %s валидирани
ProposalSentByEMail=Търговски %s предложението, изпратено по електронна поща
OrderSentByEMail=, Изпратени по електронната поща %s поръчка на клиента
InvoiceSentByEMail=, Изпратени по електронната поща %s клиенти фактура
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=%s доставчик реда, изпратени по
SupplierInvoiceSentByEMail=, Изпратени по електронната поща %s доставчик фактура
ShippingSentByEMail=Доставка %s изпращат по електронна поща
ShippingValidated= Shipping %s validated
-InterventionSentByEMail=Намеса %s изпращат по електронна поща
-InterventionClassifiedBilled=Intervention %s classified as Billed
NewCompanyToDolibarr= Създадено от трета страна
DateActionPlannedStart= Планирана начална дата
DateActionPlannedEnd= Планирана крайна дата
@@ -70,9 +68,9 @@ DateActionStart= Начална дата
DateActionEnd= Крайна дата
AgendaUrlOptions1=Можете да добавите и следните параметри, за да филтрирате изход:
AgendaUrlOptions2=<b>вход = %s</b> да ограничи изход към действия, създадени от засегнати или направено от потребителя <b>%s.</b>
-AgendaUrlOptions3=<b>logina = %s</b> да се ограничи производството на действията, създадени от потребителя <b>%s.</b>
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
AgendaUrlOptions4=<b>logint = %s</b> да се ограничи производството на действията, засегнати на потребителските <b>%s.</b>
-AgendaUrlOptions5=<b>logind = %s</b> да се ограничи производството за действия, извършени от потребителя <b>%s.</b>
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
AgendaShowBirthdayEvents=Показване на контактите, които имат рожден ден
AgendaHideBirthdayEvents=Скриване на контактите, които имат рожден ден
Busy=Зает
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=URL адрес за достъп до файла .Ical
ExtSiteNoLabel=Няма описание
WorkingTimeRange=Working time range
WorkingDaysRange=Working days range
-AddEvent=Add event
+AddEvent=Create event
MyAvailability=My availability
diff --git a/htdocs/langs/bg_BG/bills.lang b/htdocs/langs/bg_BG/bills.lang
index ab562b577abca04dd9819891caf5fbbe6c071f8d..35f5d89a4cdd47f9371c7d91fd467d8cba90289c 100644
--- a/htdocs/langs/bg_BG/bills.lang
+++ b/htdocs/langs/bg_BG/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Кредитно известие
InvoiceAvoirAsk=Кредитно известие за коригиране на фактура
InvoiceAvoirDesc=<b>Кредитно известие</b> е отрицателна фактура, използвани за решаване на факта, че фактурата е сумата, която се различава от сумата, наистина са платени (защото платил твърде много от грешка, или няма да се изплаща напълно, тъй като той се върна някои продукти, например).
invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
-invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
ReplaceInvoice=Сменете фактура %s
ReplacementInvoice=Подмяна фактура
ReplacedByInvoice=Заменен с фактура %s
@@ -87,7 +87,7 @@ ClassifyCanceled=Класифициране 'Изоставено'
ClassifyClosed=Класифициране 'Затворено'
ClassifyUnBilled=Classify 'Unbilled'
CreateBill=Създаване на фактура
-AddBill=Добави фактура или кредитно известие
+AddBill=Create invoice or credit note
AddToDraftInvoices=Add to draft invoice
DeleteBill=Изтриване на фактура
SearchACustomerInvoice=Търсене за клиент фактура
@@ -99,7 +99,7 @@ DoPaymentBack=Направете плащане със задна дата
ConvertToReduc=Конвертиране в бъдеще отстъпка
EnterPaymentReceivedFromCustomer=Въведете получено плащане от клиент
EnterPaymentDueToCustomer=Дължимото плащане на клиента
-DisabledBecauseRemainderToPayIsZero=Хора с увреждания, тъй като остатъка за плащане е равна на нула
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
Amount=Размер
PriceBase=Цена база
BillStatus=Състояние на фактурата
@@ -137,8 +137,6 @@ BillFrom=От
BillTo=За
ActionsOnBill=Действия по фактура
NewBill=Нова фактура
-Prélèvements=Постоянния цел
-Prélèvements=Постоянния цел
LastBills=Последните %s фактури
LastCustomersBills=Последните %s фактури на клиенти
LastSuppliersBills=Последните %s фактури на доставчици
@@ -156,9 +154,9 @@ ConfirmCancelBill=Сигурен ли сте, че искате да отмен
ConfirmCancelBillQuestion=Защо искате да класифицирате тази фактура като "изоставена"?
ConfirmClassifyPaidPartially=Сигурен ли сте, че искате да промените фактура <b>%s</b> до статута на платен?
ConfirmClassifyPaidPartiallyQuestion=Тази фактура не е платена изцяло. Какви са причините за да се затвори тази фактура?
-ConfirmClassifyPaidPartiallyReasonAvoir=Остатък за плащане <b>(%s %s)</b> е отстъпка, предоставена, тъй като плащането е направено преди термина. Нормализира ДДС кредитно известие.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Остатък за плащане <b>(%s %s)</b> е отстъпка, предоставена, тъй като плащането е направено преди термина. Приемам да губят ДДС върху тази отстъпка.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Остатък за плащане <b>(%s %s)</b> е отстъпка, предоставена, тъй като плащането е направено преди термина. Възстановяване на ДДС върху тази отстъпка, без кредитно известие.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad клиента
ConfirmClassifyPaidPartiallyReasonProductReturned=Продукти частично се завръща
ConfirmClassifyPaidPartiallyReasonOther=Сума, изоставен за друга причина
@@ -191,9 +189,9 @@ AlreadyPaid=Вече е платена
AlreadyPaidBack=Already paid back
AlreadyPaidNoCreditNotesNoDeposits=Вече е платена (без кредитни известия и депозити)
Abandoned=Изоставен
-RemainderToPay=Остатък за плащане
-RemainderToTake=Остатък да предприеме
-RemainderToPayBack=Remainder to pay back
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
Rest=Pending
AmountExpected=Претендираната сума
ExcessReceived=Превишение получи
@@ -219,19 +217,18 @@ NoInvoice=Липса на фактура
ClassifyBill=Класифициране на фактурата
SupplierBillsToPay=Доставчици фактури за плащане
CustomerBillsUnpaid=Неплатени фактури на клиентите
-DispenseMontantLettres=Законопроектът, изготвен от механографски са освободени от реда, в писма
-DispenseMontantLettres=Законопроектът, изготвен от механографски са освободени от реда, в писма
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=Невъзстановими
SetConditions=Задайте условията за плащане
SetMode=Задайте режим на плащане
Billed=Таксува
-RepeatableInvoice=Предварително дефиниран фактура
-RepeatableInvoices=Предварително дефинирани фактури
-Repeatable=Предварително дефинирани
-Repeatables=Предварително дефинирани
-ChangeIntoRepeatableInvoice=Конвертиране в предварително определен
-CreateRepeatableInvoice=Създаване на предварително определен фактура
-CreateFromRepeatableInvoice=Създаване на предварително определен фактура
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
CustomersInvoicesAndInvoiceLines=Клиенти фактури и фактури линии
CustomersInvoicesAndPayments=Фактури и плащания на клиентите
ExportDataset_invoice_1=Фактури списък с клиенти и фактура линии
diff --git a/htdocs/langs/bg_BG/categories.lang b/htdocs/langs/bg_BG/categories.lang
index 3fab48d08570322758f7ce97d88d244ecc21f3d5..a6142468ddf48ba200b4c9913d80b827b1a8e15f 100644
--- a/htdocs/langs/bg_BG/categories.lang
+++ b/htdocs/langs/bg_BG/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories
CatCusLinks=Links between customers/prospects and categories
CatProdLinks=Links between products/services and categories
CatMemberLinks=Links between members and categories
-CatProdLinks=Links between products/services and categories
-CatCusLinks=Links between customers/prospects and categories
-CatSupLinks=Links between suppliers and categories
DeleteFromCat=Премахване от категорията
DeletePicture=Picture delete
ConfirmDeletePicture=Confirm picture deletion?
@@ -112,3 +109,4 @@ CategoriesSetup=Categories setup
CategorieRecursiv=Link with parent category automatically
CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category
diff --git a/htdocs/langs/bg_BG/compta.lang b/htdocs/langs/bg_BG/compta.lang
index b4930ceba6dd50f0786b554a7b7674e40ac7d012..9aa1fa854174ea9faa9b2e488ae28add0103d8e5 100644
--- a/htdocs/langs/bg_BG/compta.lang
+++ b/htdocs/langs/bg_BG/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad код отчетност за клие
SuppliersProductsSellSalesTurnover=Генерираният оборот от продажбите на продуктите на доставчика.
CheckReceipt=Проверете депозит
CheckReceiptShort=Проверете депозит
+LastCheckReceiptShort=Last %s check receipts
NewCheckReceipt=Нов отстъпка
NewCheckDeposit=Нова проверка депозит
NewCheckDepositOn=Създаване на разписка за депозит по сметка: %s
@@ -199,11 +200,11 @@ AccountancyJournal=Accountancy code journal
ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
-ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Счетоводен код по подразбиране за продажба на услуги
+ACCOUNTING_VAT_ACCOUNT=Счетоводен код по подразбиране за начисляване на ДДС
+ACCOUNTING_VAT_BUY_ACCOUNT=Счетоводен код по подразбиране за плащане на ДДС
ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
-CloneTaxForNextMonth=Clone it for next month
+CloneTax=Клониране на социално-осигурителни вноски
+ConfirmCloneTax=Потвърдете клонирането на социално-осигурителните вноски
+CloneTaxForNextMonth=Клониране за следващ месец
diff --git a/htdocs/langs/bg_BG/contracts.lang b/htdocs/langs/bg_BG/contracts.lang
index 1c28e5333033922382dd9058ea640ca8ed3a7448..b78304394ed0505cb82f132d59e6f25c8aca3362 100644
--- a/htdocs/langs/bg_BG/contracts.lang
+++ b/htdocs/langs/bg_BG/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Договори област
ListOfContracts=Списък на договорите
-LastContracts=Последните %s променени договори
+LastModifiedContracts=Last %s modified contracts
AllContracts=Всички договори
ContractCard=Карта на договор
ContractStatus=Договор статус
@@ -27,7 +27,7 @@ MenuRunningServices=Текущи услуги
MenuExpiredServices=Изтекли услуги
MenuClosedServices=Затворени услуги
NewContract=Нов договор
-AddContract=Добави договор
+AddContract=Create contract
SearchAContract=Търсене на договора
DeleteAContract=Изтриване на договора
CloseAContract=Затваряне на договора
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Списък на линиите на движени
ListOfRunningServices=Списък на стартираните услуги
NotActivatedServices=Неактивни услуги (сред валидирани договори)
BoardNotActivatedServices=Услуги за да активирате сред утвърдени договори
-LastContracts=Последните %s променени договори
+LastContracts=Last % contracts
LastActivatedServices=Последните %s активирани услуги
LastModifiedServices=Последните %s променени услуги
EditServiceLine=Редактиране на сервизна линия
diff --git a/htdocs/langs/bg_BG/cron.lang b/htdocs/langs/bg_BG/cron.lang
index d7de40fd4ae2d4f022df51fc8292389044780b9c..ac2ba5edc0a6a75e07ec8a95e1ff949f9cec95ae 100644
--- a/htdocs/langs/bg_BG/cron.lang
+++ b/htdocs/langs/bg_BG/cron.lang
@@ -1,10 +1,8 @@
# Dolibarr language file - Source file is en_US - cron
-#
# About page
About = За
CronAbout = About Cron
CronAboutPage = Cron about page
-
# Right
Permission23101 = Read Scheduled task
Permission23102 = Create/update Scheduled task
@@ -20,9 +18,8 @@ CronExplainHowToRunUnix=On Unix environment you should use crontab to run Comman
CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
# Menu
CronJobs=Scheduled jobs
-CronListActive= List of active jobs
-CronListInactive= List of disabled jobs
-CronListActive= List of active jobs
+CronListActive=List of active/scheduled jobs
+CronListInactive=List of disabled jobs
# Page list
CronDateLastRun=Last run
CronLastOutput=Last run output
@@ -77,13 +74,13 @@ CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dol
CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is <i>fecth</i>
CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-CronCommandHelp=The system command line to execute.
+CronCommandHelp=Системния команден ред за стартиране.
# Info
-CronInfoPage=Information
+CronInfoPage=Информация
# Common
-CronType=Task type
+CronType=Тип на задачата
CronType_method=Call method of a Dolibarr Class
-CronType_command=Shell command
-CronMenu=Cron
-CronCannotLoadClass=Cannot load class %s or object %s
+CronType_command=Терминална команда
+CronMenu=Крон (софтуер за изпънение на автоматични задачи)
+CronCannotLoadClass=Неможе да се зареди класа %s или обекта %s
UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
diff --git a/htdocs/langs/bg_BG/donations.lang b/htdocs/langs/bg_BG/donations.lang
index b080f9ba743cab78d8b43991bf29dcd32644a63c..e64cf417e46d3df3a2340e44908cd674d03d4584 100644
--- a/htdocs/langs/bg_BG/donations.lang
+++ b/htdocs/langs/bg_BG/donations.lang
@@ -4,7 +4,7 @@ Donations=Дарения
DonationRef=Дарение
Donor=Дарител
Donors=Дарители
-AddDonation=Добавяне на дарение
+AddDonation=Create a donation
NewDonation=Ново дарение
ShowDonation=Показване на дарение
DonationPromise=Обещано дарение
@@ -30,4 +30,9 @@ SearchADonation=Търсене на дарение
DonationRecipient=Получател на дарението
ThankYou=Благодарим Ви!
IConfirmDonationReception=Получателят декларира, че е получил дарение на стойност
-MinimumAmount=Minimum amount is %s
+MinimumAmount=Минималното количество е %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/bg_BG/externalsite.lang b/htdocs/langs/bg_BG/externalsite.lang
index 88b4ac6bd796c9a87af878de86d58844900a6cab..b8235c9d6c27cc1636163cdb6babb148a24c2e10 100644
--- a/htdocs/langs/bg_BG/externalsite.lang
+++ b/htdocs/langs/bg_BG/externalsite.lang
@@ -2,3 +2,4 @@
ExternalSiteSetup=Настройка на линк към външен сайт
ExternalSiteURL=Външен URL адрес на сайта
ExternalSiteModuleNotComplete=Модула Външен сайт не е конфигуриран правилно.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/bg_BG/holiday.lang b/htdocs/langs/bg_BG/holiday.lang
index 9bf06f7c047a8429bb0ec1463e3144eaff079a3c..f3d9c9dcba97faf62af797300692779123e8fd4d 100644
--- a/htdocs/langs/bg_BG/holiday.lang
+++ b/htdocs/langs/bg_BG/holiday.lang
@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
CantCreateCP=You don't have the right to make leave requests.
InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=Актуализация
CantUpdate=You cannot update this leave request.
NoDateDebut=Трябва да изберете началната дата.
NoDateFin=Трябва да изберете крайна дата.
-ErrorDureeCP=Вашето искане за почивка не съдържа работен ден.
-TitleValidCP=Утвърждава искането за отпуск
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
ConfirmValidCP=Are you sure you want to approve the leave request?
DateValidCP=Дата на утвърждаване
TitleToValidCP=Send leave request
ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Отхвърляне на заявлението за отпуск
+TitleRefuseCP=Refuse the leave request
ConfirmRefuseCP=Are you sure you want to refuse the leave request?
NoMotifRefuseCP=Вие трябва да изберете причина за отказ на искането.
-TitleCancelCP=Анулира заявката празници
+TitleCancelCP=Cancel the leave request
ConfirmCancelCP=Are you sure you want to cancel the leave request?
DetailRefusCP=Причина за отказа
DateRefusCP=Дата на отказ
@@ -78,7 +77,7 @@ ActionByCP=В изпълнение на
UserUpdateCP=За потребителя
PrevSoldeCP=Предишен баланс
NewSoldeCP=Нов баланс
-alreadyCPexist=Вече е направено искане за отпуск за този период.
+alreadyCPexist=A leave request has already been done on this period.
UserName=Име
Employee=Служители
FirstDayOfHoliday=First day of vacation
@@ -88,25 +87,25 @@ ManualUpdate=Manual update
HolidaysCancelation=Leave request cancelation
## Configuration du Module ##
-ConfCP=Настройки на модула за отпуски
+ConfCP=Configuration of leave request module
DescOptionCP=Описание на опцията
ValueOptionCP=Стойност
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
ConfirmConfigCP=Потвърждаване на конфигурацията
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
UpdateConfCPOK=Актуализира се успешно.
ErrorUpdateConfCP=Възникна грешка по време на актуализацията, моля опитайте отново.
-AddCPforUsers=Моля, добавете баланса на празниците на потребителите, като <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">кликнете тук</a> .
-DelayForSubmitCP=Краен срок за кандидатстване за отпуск
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
Module27130Name= Management of leave requests
Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
TitleOptionEventCP=Settings of leave requets for events
ValidEventCP=Проверка на
UpdateEventCP=Актуализиране на събития
diff --git a/htdocs/langs/bg_BG/interventions.lang b/htdocs/langs/bg_BG/interventions.lang
index 583d7a4ea02f48865a16a675384350f91b1cee5e..b283f32ebe46360bdaefcda26abb7dbdd12818a7 100644
--- a/htdocs/langs/bg_BG/interventions.lang
+++ b/htdocs/langs/bg_BG/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Намеса
Interventions=Интервенциите
InterventionCard=Интервенция карта
NewIntervention=Нов намеса
-AddIntervention=Добави намеса
+AddIntervention=Create intervention
ListOfInterventions=Списък на интервенциите
EditIntervention=Редактиране намеса
ActionsOnFicheInter=Действия на интервенцията
@@ -24,12 +24,21 @@ NameAndSignatureOfInternalContact=Име и подпис на намеса:
NameAndSignatureOfExternalContact=Име и подпис на клиента:
DocumentModelStandard=Стандартен документ модел за интервенции
InterventionCardsAndInterventionLines=Interventions and lines of interventions
-InterventionClassifyBilled=Classify "Billed"
-InterventionClassifyUnBilled=Classify "Unbilled"
+InterventionClassifyBilled=Класифицирай като "Таксувани"
+InterventionClassifyUnBilled=Класифицирай като "Нетаксувани"
StatusInterInvoiced=Таксува
RelatedInterventions=Подобни интервенции
ShowIntervention=Покажи намеса
SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Представител проследяване намеса
TypeContact_fichinter_internal_INTERVENING=Намеса
diff --git a/htdocs/langs/bg_BG/mails.lang b/htdocs/langs/bg_BG/mails.lang
index 855a4099262f547872935b50b3274870e60d020c..186205e9b8b84089d2555745cf74e4eefb56c791 100644
--- a/htdocs/langs/bg_BG/mails.lang
+++ b/htdocs/langs/bg_BG/mails.lang
@@ -115,7 +115,7 @@ SentBy=Изпратено от
MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
MailingNeedCommand2=Все пак можете да ги изпратите онлайн чрез добавяне на параметър MAILING_LIMIT_SENDBYWEB със стойност на максимален брой на имейлите, които искате да изпратите от сесията. За това, отидете на дома - Setup - Други.
ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=Изчисти списъка
ToClearAllRecipientsClickHere=Щракнете тук, за да изчистите списъка на получателите за този електронната поща
ToAddRecipientsChooseHere=Добавяне на получатели, като изберете от списъците
@@ -133,6 +133,9 @@ Notifications=Известия
NoNotificationsWillBeSent=Не са планирани за това събитие и компания известия по имейл
ANotificationsWillBeSent=1 уведомление ще бъде изпратено по имейл
SomeNotificationsWillBeSent=%s уведомления ще бъдат изпратени по имейл
-AddNewNotification=Активиране на ново искане за уведомяване имейл
-ListOfActiveNotifications=Списък на всички активни заявки за уведомяване имейл
+AddNewNotification=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
ListOfNotificationsDone=Списък на всички имейли, изпратени уведомления
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang
index 24d3d638aca65bc451ca8124e806ac8f1f27d6b0..29482f0c53e6b45d0d18738d76565434d83cd57d 100644
--- a/htdocs/langs/bg_BG/main.lang
+++ b/htdocs/langs/bg_BG/main.lang
@@ -34,7 +34,7 @@ ErrorFailedToOpenFile=Файла %s не може да се отвори
ErrorCanNotCreateDir=Не може да се създаде папка %s
ErrorCanNotReadDir=Не може да се прочете директорията %s
ErrorConstantNotDefined=Параметъра %s не е дефиниран
-ErrorUnknown=Unknown error
+ErrorUnknown=Непозната грешка
ErrorSQL=SQL грешка
ErrorLogoFileNotFound=Файла '%s' с логото не е открит
ErrorGoToGlobalSetup=Отидете на настройките 'Фирма/Организация' за да настроите параметъра
@@ -55,15 +55,15 @@ ErrorDuplicateField=Дублирана стойност в поле с уник
ErrorSomeErrorWereFoundRollbackIsDone=Някои бяха открити грешки. Ние намаление на цените промени.
ErrorConfigParameterNotDefined=Параметъра <b>%s</b> не е дефиниран в конфигурационния файл на Dolibarr <b>conf.php</b>.
ErrorCantLoadUserFromDolibarrDatabase=Не можа да се намери потребител <b>%s</b> в базата данни на Dolibarr.
-ErrorNoVATRateDefinedForSellerCountry=Грешка, без ДДС ставки, определени за "%s" страна.
+ErrorNoVATRateDefinedForSellerCountry=Грешка, няма дефинирани ДДС ставки, за държавата '%s'.
ErrorNoSocialContributionForSellerCountry=Грешка, не е социален тип участие, определено за "%s" страна.
ErrorFailedToSaveFile=Грешка, файла не е записан.
-ErrorOnlyPngJpgSupported=Грешка, поддържат се само PNG и JPG формати на изображението.
-ErrorImageFormatNotSupported=Вашият PHP не поддържа функции за конвертиране на изображения от този формат.
SetDate=Set date
SelectDate=Select a date
SeeAlso=Вижте също %s
BackgroundColorByDefault=Подразбиращ се цвят на фона
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
FileWasNotUploaded=Файлът е избран за прикачане, но все още не е качен. Кликнете върху "Прикачи файл".
NbOfEntries=Брой на записите
GoToWikiHelpPage=Прочетете онлайн помощта (Нуждаете се от достъп до интернет)
@@ -266,6 +266,7 @@ Afternoon=Afternoon
Quadri=Quadri
MonthOfDay=Month of the day
HourShort=H
+MinuteShort=Минута
Rate=Процент
UseLocalTax=с данък
Bytes=Байта
@@ -340,6 +341,7 @@ FullList=Пълен списък
Statistics=Статистика
OtherStatistics=Други статистически данни
Status=Състояние
+Favorite=Favorite
ShortInfo=Инфо.
Ref=Реф.
RefSupplier=Реф. снабдител
@@ -365,6 +367,7 @@ ActionsOnCompany=Събития за тази трета страна
ActionsOnMember=Събития за този член
NActions=%s събития
NActionsLate=%s със забавено плащане
+RequestAlreadyDone=Request already recorded
Filter=Филтър
RemoveFilter=Премахване на филтъра
ChartGenerated=Графиката е генерирана
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Допълнителни атрибути за настро
URLPhoto=URL на снимка/лого
SetLinkToThirdParty=Връзка към друга трета страна
CreateDraft=Създаване на проект
+SetToDraft=Back to draft
ClickToEdit=Кликнете, за да редактирате
ObjectDeleted=Обекта %s е изтрит
ByCountry=По държава
@@ -678,7 +682,7 @@ ViewPrivateNote=View notes
XMoreLines=%s line(s) hidden
PublicUrl=Public URL
AddBox=Add box
-
+SelectElementAndClickRefresh=Изберете елемент и натиснете Презареждане
# Week day
Monday=Понеделник
Tuesday=Вторник
diff --git a/htdocs/langs/bg_BG/margins.lang b/htdocs/langs/bg_BG/margins.lang
index 982506dd363ffb052bb3435e10d27c747047ab8e..8687a982af22df7d5c2a22a099ea99d7ea47a82a 100644
--- a/htdocs/langs/bg_BG/margins.lang
+++ b/htdocs/langs/bg_BG/margins.lang
@@ -38,4 +38,7 @@ BuyingCost=Cost price
UnitCharges=Unit charges
Charges=Charges
AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/bg_BG/orders.lang b/htdocs/langs/bg_BG/orders.lang
index 4078b1f6a97434ce060bfd4845574a35713c620d..cf43524bd3d562d4a8d24ce8e779341c3a603b0f 100644
--- a/htdocs/langs/bg_BG/orders.lang
+++ b/htdocs/langs/bg_BG/orders.lang
@@ -53,7 +53,7 @@ ShippingExist=Пратка съществува
DraftOrWaitingApproved=Проект или одобрен, все още не е осъден
DraftOrWaitingShipped=Проект или потвърдено все още не са изпратени
MenuOrdersToBill=Доставени поръчки
-MenuOrdersToBill2=Orders to bill
+MenuOrdersToBill2=Billable orders
SearchOrder=Търсене за
SearchACustomerOrder=Search a customer order
ShipProduct=Кораб продукт
@@ -65,7 +65,7 @@ ValidateOrder=Валидиране за
UnvalidateOrder=Unvalidate за
DeleteOrder=Изтрий заявка
CancelOrder=Отказ за
-AddOrder=Добави за
+AddOrder=Create order
AddToMyOrders=Добави към моите заповеди
AddToOtherOrders=Добави към други поръчки
AddToDraftOrders=Add to draft order
@@ -154,7 +154,6 @@ OrderByPhone=Телефон
CreateInvoiceForThisCustomer=Bill orders
NoOrdersToInvoice=No orders billable
CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-MenuOrdersToBill2=Orders to bill
OrderCreation=Order creation
Ordered=Ordered
OrderCreated=Your orders have been created
diff --git a/htdocs/langs/bg_BG/oscommerce.lang b/htdocs/langs/bg_BG/oscommerce.lang
deleted file mode 100644
index f586190d21b14eb1da4a4df165c29e3e816e6352..0000000000000000000000000000000000000000
--- a/htdocs/langs/bg_BG/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=OS Commerce модул за настройка
-OSCommerceSetupSaved=OS Commerce настройка спаси
-OSCommerceServer=OS Commerce хост сървъра / IP
-OSCommerceDatabaseName=OS Commerce името на базата данни
-OSCommercePrefix=OS Commerce таблици префикс
-OSCommerceUser=OS Commerce база данни за вход
diff --git a/htdocs/langs/bg_BG/other.lang b/htdocs/langs/bg_BG/other.lang
index fc0d4504cd0ee110f2feb7fb37973ef7510559f1..0e650cb6d81cf4ce1e5f0e6dadc5b07a90a0307b 100644
--- a/htdocs/langs/bg_BG/other.lang
+++ b/htdocs/langs/bg_BG/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=Код за сигурност
Calendar=Календар
-AddTrip=Добави пътуване
Tools=Инструменти
ToolsDesc=Тази област е посветена на група разни инструменти, достъпни в други вписвания в менюто. <br><br> Тези инструменти могат да бъдат достигнати от менюто на страната.
Birthday=Рожден ден
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation
Notify_TASK_CREATE=Task created
Notify_TASK_MODIFY=Task modified
Notify_TASK_DELETE=Task deleted
+SeeModuleSetup=See module setup
NbOfAttachedFiles=Брой на прикачените файлове/документи
TotalSizeOfAttachedFiles=Общ размер на прикачените файлове/документи
MaxSize=Максимален размер
@@ -80,6 +80,16 @@ ModifiedBy=Променено от %s
ValidatedBy=Потвърдено от %s
CanceledBy=Анулирано от %s
ClosedBy=Затворен от %s
+CreatedById=User id who created
+ModifiedById=User id who made last change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made last change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
FileWasRemoved=Файла %s беше премахнат
DirWasRemoved=Директорията %s беше премахната
FeatureNotYetAvailableShort=Предлага се в следващата версия
@@ -193,25 +203,26 @@ ForgetIfNothing=Ако не сте заявили промяната, прост
##### Calendar common #####
AddCalendarEntry=Добави запис в календара %s
-NewCompanyToDolibarr=Фирмата %s е добавена в Dolibarr
-ContractValidatedInDolibarr=Поръчки %s заверени в Dolibarr
-ContractCanceledInDolibarr=Поръчки %s анулирани през Dolibarr
-ContractClosedInDolibarr=Поръчки %s затворен в Dolibarr
-PropalClosedSignedInDolibarr=Предложение %s подписан в Dolibarr
-PropalClosedRefusedInDolibarr=Предложение %s отказва Dolibarr
-PropalValidatedInDolibarr=Предложение %s заверени в Dolibarr
-InvoiceValidatedInDolibarr=Фактура %s заверени в Dolibarr
-InvoicePaidInDolibarr=Фактура променени %s на платен в Dolibarr
-InvoiceCanceledInDolibarr=Фактура %s, анулирани през Dolibarr
-PaymentDoneInDolibarr=Плащане %s направено в Dolibarr
-CustomerPaymentDoneInDolibarr=Клиентско плащане %s направено в Dolibarr
-SupplierPaymentDoneInDolibarr=Доставчик на платежни %s направи в Dolibarr
-MemberValidatedInDolibarr=Държавите-%s, заверени в Dolibarr
-MemberResiliatedInDolibarr=%s изключени членове в Dolibarr
-MemberDeletedInDolibarr=Държавите-%s изтрит от Dolibarr
-MemberSubscriptionAddedInDolibarr=Абонамент за държавите %s добави Dolibarr
-ShipmentValidatedInDolibarr=Превоз %s валидирани в Dolibarr
-ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
##### Export #####
Export=Износ
ExportsArea=Износът площ
diff --git a/htdocs/langs/bg_BG/paybox.lang b/htdocs/langs/bg_BG/paybox.lang
index a1f339d5baaa4361c803c734e65a083eb4ccbb93..b7dcd3ee0cc22bc116b3b90635a95d6b1300906c 100644
--- a/htdocs/langs/bg_BG/paybox.lang
+++ b/htdocs/langs/bg_BG/paybox.lang
@@ -35,3 +35,6 @@ MessageKO=Съобщение за анулиране страница плаща
NewPayboxPaymentReceived=New Paybox payment received
NewPayboxPaymentFailed=New Paybox payment tried but failed
PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/bg_BG/resource.lang b/htdocs/langs/bg_BG/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..d64075dfbf595897a63e3eebf19194d8f71030dd
--- /dev/null
+++ b/htdocs/langs/bg_BG/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
diff --git a/htdocs/langs/bg_BG/sendings.lang b/htdocs/langs/bg_BG/sendings.lang
index be5354d131011f649f8ec8442f8f0c0b6e347241..9f5a8b85470b06dac5d160f8e0ab4bfa9e9cbfec 100644
--- a/htdocs/langs/bg_BG/sendings.lang
+++ b/htdocs/langs/bg_BG/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=За момента се извършва от
RelatedShippings=Свързани shippings
ShipmentLine=Shipment line
CarrierList=List of transporters
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
# Sending methods
SendingMethodCATCH=Улов от клиента
@@ -74,5 +76,5 @@ SumOfProductVolumes=Sum of product volumes
SumOfProductWeights=Sum of product weights
# warehouse details
-DetailWarehouseNumber= Warehouse details
-DetailWarehouseFormat= W:%s (Qty : %d)
+DetailWarehouseNumber= Склад детайли
+DetailWarehouseFormat= Тегло:%s (Количество : %d)
diff --git a/htdocs/langs/bg_BG/stocks.lang b/htdocs/langs/bg_BG/stocks.lang
index 32f94bc24eea366d0c3fbabbd971037194565570..8c7a397a104bfa4d84f84a2873713d634db8d670 100644
--- a/htdocs/langs/bg_BG/stocks.lang
+++ b/htdocs/langs/bg_BG/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Изисква се етикет на склада
CorrectStock=Промяна на наличност
ListOfWarehouses=Списък на складовете
ListOfStockMovements=Списък на движението на стоковите наличности
-StocksArea=Наличности
+StocksArea=Warehouses area
Location=Място
LocationSummary=Кратко наименование на място
NumberOfDifferentProducts=Брой различни продукти
diff --git a/htdocs/langs/bg_BG/users.lang b/htdocs/langs/bg_BG/users.lang
index 7b314b4b01dde8869f59909d6a9c5ac0534c0b53..cd53dfb8c2c2f286a3be7cd5bdf2ff4d80e7e8f6 100644
--- a/htdocs/langs/bg_BG/users.lang
+++ b/htdocs/langs/bg_BG/users.lang
@@ -63,7 +63,6 @@ ShowGroup=Показване на групата
ShowUser=Покажи потребителя
NonAffectedUsers=За засегнатите потребители
UserModified=Потребителя е променен успешно
-GroupModified=Групата е променена успешно
PhotoFile=Снимка
UserWithDolibarrAccess=Потребител с Dolibarr достъп
ListOfUsersInGroup=Списък на потребителите в групата
@@ -103,7 +102,7 @@ UserDisabled=Потребителя %s е забранен
UserEnabled=Потребителя %s е активиран
UserDeleted=Потребителя %s е премахнат
NewGroupCreated=Групата %s е създадена
-GroupModified=Групата е променена успешно
+GroupModified=Group %s modified
GroupDeleted=Групата %s е премахната
ConfirmCreateContact=Сигурни ли сте, че желаете да създадете Dolibarr акаунт за този контакт ?
ConfirmCreateLogin=Сигурни ли сте, че желаете да създадете Dolibarr акаунт за този член ?
@@ -114,8 +113,10 @@ YourRole=Вашите роли
YourQuotaOfUsersIsReached=Вашата квота за активни потребители е достигната!
NbOfUsers=Брой потребители
DontDowngradeSuperAdmin=Само истинска черна нинджа може да убие друга черна нинджа
-HierarchicalResponsible=Hierarchical responsible
+HierarchicalResponsible=Supervisor
HierarchicView=Йерархичен изглед
UseTypeFieldToChange=Use field Type to change
OpenIDURL=OpenID URL
LoginUsingOpenID=Use OpenID to login
+WeeklyHours=Weekly hours
+ColorUser=Color of the user
diff --git a/htdocs/langs/bg_BG/withdrawals.lang b/htdocs/langs/bg_BG/withdrawals.lang
index 703e5483714de3c341eefc75f48dc356b76460b9..cf10ed077467a2336d70cdcb43efd1f6df54060b 100644
--- a/htdocs/langs/bg_BG/withdrawals.lang
+++ b/htdocs/langs/bg_BG/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=Получаване
LastWithdrawalReceipts=Last %s withdrawal receipts
WithdrawedBills=Изтеглените фактури
WithdrawalsLines=Отнемане линии
-RequestStandingOrderToTreat=Искане за постоянни нареждания за лечение
-RequestStandingOrderTreated=Искане за нареждания за периодични преводи третират
+RequestStandingOrderToTreat=Request for standing orders to process
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=Клиентски поръчки постоянни
CustomerStandingOrder=Заявка на клиента състояние
NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
@@ -40,14 +41,13 @@ TransMetod=Метод Предаване
Send=Изпращам
Lines=Линии
StandingOrderReject=Издаде отхвърли
-InvoiceRefused=Фактура отказа
WithdrawalRefused=Оттегляне Отказ
WithdrawalRefusedConfirm=Сигурен ли сте, че искате да въведете изтегляне отказ за обществото
RefusedData=Дата на отхвърляне
RefusedReason=Причина за отхвърляне
RefusedInvoicing=Фактуриране отхвърлянето
NoInvoiceRefused=Не зареждайте отхвърляне
-InvoiceRefused=Фактура отказа
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=Статус
StatusUnknown=Неизвестен
StatusWaiting=Чакане
@@ -76,7 +76,7 @@ WithBankUsingRIB=За банкови сметки с помощта на RIB
WithBankUsingBANBIC=За банкови сметки с IBAN / BIC / SWIFT
BankToReceiveWithdraw=Банкова сметка за получаване оттегли
CreditDate=Кредит за
-WithdrawalFileNotCapable=Не може да се генерира файл за изтегляне разписка за вашата страна
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
ShowWithdraw=Покажи Теглене
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Въпреки това, ако фактурата не е все още най-малко една оттегляне плащане обработват, не се определя като плаща, за да се даде възможност да управляват оттеглянето им преди.
DoStandingOrdersBeforePayments=Това разделите ви позволява да изисквате за постоянно нареждане. След като той ще бъде завършен, можете да въведете плащането, за да затворите фактура.
diff --git a/htdocs/langs/bs_BA/accountancy.lang b/htdocs/langs/bs_BA/accountancy.lang
index 8cab9d2b651d75b0721d76fda619e2034e4509b4..39c2732ec29852cf93d41614ed1812c2a4c1ce4f 100644
--- a/htdocs/langs/bs_BA/accountancy.lang
+++ b/htdocs/langs/bs_BA/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts
Validate=Validate
Addanaccount=Add an accounting account
AccountAccounting=Accounting account
-Ventilation=Ventilation
+Ventilation=Breakdown
ToDispatch=To dispatch
Dispatched=Dispatched
-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
TradeMargin=Trade margin
Reports=Reports
ByCustomerInvoice=By invoices customers
@@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger
Bookkeeping=General ledger
AccountBalanceByMonth=Account balance by month
-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
Line=Line
CAHTF=Total purchase supplier HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice
IntoAccount=In the accounting account
Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
+VentilationAuto=Automatic breakdown
Processing=Processing
EndProcessing=The end of processing
@@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account
ACCOUNTING_SEPARATORCSV=Separator CSV
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
@@ -140,14 +140,14 @@ Active=Statement
NewFiscalYear=New fiscal year
-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
TotalVente=Total turnover HT
TotalMarge=Total sales margin
DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
ChangeAccount=Change the accounting account for lines selected by the account:
Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
@@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically
ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index baf85be7ab33ff1d23884e86ed12e240e1be7270..8e1c91270efce58e146c0d043e526ca44c647308 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -437,8 +437,8 @@ Module52Name=Stocks
Module52Desc=Stock management (products)
Module53Name=Services
Module53Desc=Service management
-Module54Name=Contracts
-Module54Desc=Contract and service management
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=Barcodes
Module55Desc=Barcode management
Module56Name=Telephony
@@ -475,8 +475,8 @@ Module320Name=RSS Feed
Module320Desc=Add RSS feed inside Dolibarr screen pages
Module330Name=Bookmarks
Module330Desc=Bookmark management
-Module400Name=Projects
-Module400Desc=Project management inside other modules
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=Webcalendar
Module410Desc=Webcalendar integration
Module500Name=Special expenses (tax, social contributions, dividends)
@@ -484,7 +484,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di
Module510Name=Salaries
Module510Desc=Management of employees salaries and payments
Module600Name=Notifications
-Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Donations
Module700Desc=Donation management
Module1200Name=Mantis
@@ -514,16 +514,16 @@ Module5000Name=Multi-company
Module5000Desc=Allows you to manage multiple companies
Module6000Name=Workflow - Tok rada
Module6000Desc=Upravljanje workflow-om - tokom rada
-Module20000Name=Holidays
-Module20000Desc=Declare and follow employees holidays
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
Module39000Name=Product batch
Module39000Desc=Batch number, eat-by and sell-by date management on products
Module50000Name=PayBox
Module50000Desc=Module to offer an online payment page by credit card with PayBox
Module50100Name=Point of sales
Module50100Desc=Point of sales module
-Module50200Name= Paypal
-Module50200Desc= Module to offer an online payment page by credit card with Paypal
+Module50200Name=Paypal
+Module50200Desc=Module to offer an online payment page by credit card with Paypal
Module50400Name=Accounting (advanced)
Module50400Desc=Accounting management (double parties)
Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=Read standing orders
Permission152=Create/modify a standing orders request
Permission153=Transmission standing orders receipts
Permission154=Credit/refuse standing orders receipts
-Permission161=Read contracts
-Permission162=Create/modify contracts
-Permission163=Activate a service of a contract
-Permission164=Disable a service of a contract
-Permission165=Delete contracts
-Permission171=Read trips
-Permission172=Create/modify trips
-Permission173=Delete trips
-Permission178=Export trips
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Read trips and expenses (own and his subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
Permission180=Read suppliers
Permission181=Read supplier orders
Permission182=Create/modify supplier orders
@@ -671,7 +672,7 @@ Permission300=Read bar codes
Permission301=Create/modify bar codes
Permission302=Delete bar codes
Permission311=Read services
-Permission312=Assign service to contract
+Permission312=Assign service/subscription to contract
Permission331=Read bookmarks
Permission332=Create/modify bookmarks
Permission333=Delete bookmarks
@@ -701,8 +702,8 @@ Permission701=Read donations
Permission702=Create/modify donations
Permission703=Delete donations
Permission1001=Read stocks
-Permission1002=Create/modify stocks
-Permission1003=Delete stocks
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=Read stock movements
Permission1005=Create/modify stock movements
Permission1101=Read delivery orders
@@ -1038,7 +1039,6 @@ YesInSummer=Yes in summer
OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
SuhosinSessionEncrypt=Session storage encrypted by Suhosin
ConditionIsCurrently=Condition is currently %s
-TestNotPossibleWithCurrentBrowsers=Automatska detekcija nije moguća
YouUseBestDriver=Možete koristiti driver %s koji je trenutno najbolji.
YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
NbOfProductIsLowerThanNoPb=Imate samo %s proizvoda/usluga u bazu podataka. To ne zahtijeva posebne optimizacije.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by
ModuleCompanyCodePanicum=Return an empty accountancy code.
ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
UseNotifications=Use notifications
-NotificationsDesc=Notifikacije E-mailovima omogućavaju vam da pošaljete automatski mail, za neke Dolibarr događaje, trećim strankama (kupci ili dobavljači) koji su prethodno konfigurirani. Izbor aktivnih notifikacija i viljanih kontakata se radi posebno za svaku treću stranku.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
ModelModules=Documents templates
DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
WatermarkOnDraft=Watermark on draft document
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=Add delivery date ability
UseOptionLineIfNoQuantity=A line of product/service with a zero amount is considered as an option
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Vodeni žig na nacrte komercijalnih prijedloga (ništa, ako je prazno)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list
ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order
FreeLegalTextOnOrders=Free text on orders
WatermarkOnDraftOrders=Vodeni žig na nacrte naloga (ništa, ako je prazno)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
##### Clicktodial #####
ClickToDialSetup=Click To Dial module setup
ClickToDialUrlDesc=Url called when a click on phone picto is done. In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=Intervention numbering models
TemplatePDFInterventions=Intervention card documents models
WatermarkOnDraftInterventionCards=Vodeni žig na nacrte kartica za intervencije (ništa, ako je prazno)
##### Contracts #####
-ContractsSetup=Contracts module setup
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=Contracts numbering modules
TemplatePDFContracts=Modeli za dokumente ugovora
FreeLegalTextOnContracts=Slobodni tekst na ugovorima
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Fajlovi tipa %s nisu kompresovani od strane HTTP server
CacheByServer=Keširanje na serveru
CacheByClient=Keširanje u browser-u
CompressionOfResources=Kompresija HTTP odgovora
-TestNotPossibleWithCurrentBrowsers=Automatska detekcija nije moguća
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=Products module setup
ServiceSetup=Services module setup
@@ -1382,9 +1384,10 @@ MailingSetup=EMailing module setup
MailingEMailFrom=Sender EMail (From) for emails sent by emailing module
MailingEMailError=Return EMail (Errors-to) for emails with errors
##### Notification #####
-NotificationSetup=Notification bu email module setup
+NotificationSetup=EMail notification module setup
NotificationEMailFrom=Sender EMail (From) for emails sent for notifications
-ListOfAvailableNotifications=List of available notifications (This list depends on activated modules)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
##### Sendings #####
SendingsSetup=Sending module setup
SendingsReceiptModel=Sending receipt model
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe
OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
##### Stock #####
-StockSetup=Configuration module stock
-UserWarehouse=Use user personal stocks
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=Menu deleted
TreeMenu=Tree menus
@@ -1478,11 +1482,14 @@ ClickToDialDesc=This module allows to add an icon after phone numbers. A click o
##### Point Of Sales (CashDesk) #####
CashDesk=Point of sales
CashDeskSetup=Point of sales module setup
-CashDeskThirdPartyForSell=Generic third party to use for sells
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Default account to use to receive cash payments
CashDeskBankAccountForCheque= Default account to use to receive payments by cheque
CashDeskBankAccountForCB= Default account to use to receive payments by credit cards
-CashDeskIdWareHouse=Warehouse to use for sells
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Bookmark module setup
BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Delete fiscal year
ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
Opened=Opened
Closed=Closed
-
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
diff --git a/htdocs/langs/bs_BA/agenda.lang b/htdocs/langs/bs_BA/agenda.lang
index 131f21d749c3e5c2162277fa816e08ab529d42af..5059966f54a5377975ff5f6ac1b6e6f5d8ade251 100644
--- a/htdocs/langs/bs_BA/agenda.lang
+++ b/htdocs/langs/bs_BA/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= Automatsko popunjavanje
AgendaAutoActionDesc= Ovdje definirajte događaje za koje želite da Dolibarr automatski kreira događaj u agendi. Ukoliko se ništa ne provjerava (po defaultu), samo manualne akcije će biti uključeni u dnevni red.
AgendaSetupOtherDesc= Ova stranica pruža mogućnosti izvoza svojih Dolibarr događaja u eksterni kalendar (Thunderbird, Google Calendar, ...)
AgendaExtSitesDesc=Ova stranica omogućava definisanje eksternih izvora kalendara da vidite svoje događaje u Dolibarr agendi.
-ActionsEvents= Događaji za koje će Dolibarr stvoriti akciju u dnevni red automatski
-PropalValidatedInDolibarr= Prijedlog %s potvrđen
-InvoiceValidatedInDolibarr= Faktura %s potvrđena
+ActionsEvents=Događaji za koje će Dolibarr stvoriti akciju u dnevni red automatski
+PropalValidatedInDolibarr=Prijedlog %s potvrđen
+InvoiceValidatedInDolibarr=Faktura %s potvrđena
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=Faktura %s vraćena u status izrade
InvoiceDeleteDolibarr=Faktura %s obrisana
OrderValidatedInDolibarr= Narudžba %s potvrđena
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Narudžba %s odobrena
OrderRefusedInDolibarr=Order %s refused
OrderBackToDraftInDolibarr=NArudžbu %s vratiti u status izrade
OrderCanceledInDolibarr=Narudžba %s otkazana
-InterventionValidatedInDolibarr=Intervencija %s potvrđena
ProposalSentByEMail=Poslovni prijedlog %s poslan putem e-maila
OrderSentByEMail=Narudžba za kupca %s poslana putem e-maila
InvoiceSentByEMail=Fakture za kupca %s poslana putem e-maila
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=Narudžba za dobavljača %s poslan putem e-maila
SupplierInvoiceSentByEMail=Predračun dobavljača %s poslan putem e-maila
ShippingSentByEMail=Dostava %s poslana putem e-maila
ShippingValidated= Shipping %s validated
-InterventionSentByEMail=Intervencija %s poslana putem e-maila
-InterventionClassifiedBilled=Intervention %s classified as Billed
NewCompanyToDolibarr= Trća stranka kreirana
DateActionPlannedStart= Planirani datum početka
DateActionPlannedEnd= Planirani datum završetka
@@ -70,9 +68,9 @@ DateActionStart= Datum početka
DateActionEnd= Datum završetka
AgendaUrlOptions1=Također možete dodati sljedeće parametre za filtriranje prikazanog:
AgendaUrlOptions2=<b>login =%s</b> da se ograniči prikaz na akcije kreiranje, dodiljene ili završene od strane korisnika <b>%s.</b>
-AgendaUrlOptions3=<b>logina=%s</b> da se ograniči prikaz na akcije kreirane od strane korisnika <b>%s.</b>
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
AgendaUrlOptions4=<b>logint=%s</b> da se ograniči prikaz na akcije dodijeljene korisniku <b>%s.</b>
-AgendaUrlOptions5=<b>logind=%s</b> da se ograniči prikaz na akcije završene os strane korisnika <b>%s.</b>
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
AgendaShowBirthdayEvents=Prikaži rođendane kontakata
AgendaHideBirthdayEvents=Sakrij rođendane kontakata
Busy=Zauzet
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=URL za pristup .ical fajla
ExtSiteNoLabel=Nema opisa
WorkingTimeRange=Working time range
WorkingDaysRange=Working days range
-AddEvent=Add event
+AddEvent=Create event
MyAvailability=My availability
diff --git a/htdocs/langs/bs_BA/bills.lang b/htdocs/langs/bs_BA/bills.lang
index 4891062bdc8b050c14e91468a6b1ff676ff7b77d..c61f13b157fe40fa79750b545550bf5ab6ab9ae7 100644
--- a/htdocs/langs/bs_BA/bills.lang
+++ b/htdocs/langs/bs_BA/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Credit note
InvoiceAvoirAsk=Credit note to correct invoice
InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example).
invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
-invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
ReplaceInvoice=Zamijeni fakturu %s
ReplacementInvoice=Zamjenska faktura
ReplacedByInvoice=Zamijenjeno sa fakturom %s
@@ -87,7 +87,7 @@ ClassifyCanceled=Označi kao 'Otkazano'
ClassifyClosed=Označi kao 'Zaključeno'
ClassifyUnBilled=Classify 'Unbilled'
CreateBill=Kreiraj predračun
-AddBill=Add invoice or credit note
+AddBill=Create invoice or credit note
AddToDraftInvoices=Dodaj na uzorak fakture
DeleteBill=Obriši fakturu
SearchACustomerInvoice=Traži fakturu kupca
@@ -99,7 +99,7 @@ DoPaymentBack=Izvrši povrat uplate
ConvertToReduc=Pretvori u budući popust
EnterPaymentReceivedFromCustomer=Unesi uplate primljene od kupca
EnterPaymentDueToCustomer=Make payment due to customer
-DisabledBecauseRemainderToPayIsZero=Onemogućeno, jer je ostatak za plaćanje nula
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
Amount=Iznos
PriceBase=Price base
BillStatus=Status fakture
@@ -137,8 +137,6 @@ BillFrom=Od
BillTo=Račun za
ActionsOnBill=Aktivnosti na fakturi
NewBill=Nova faktura
-Prélèvements=Trajni nalog
-Prélèvements=Trajni nalog
LastBills=Zadnjih %s faktura
LastCustomersBills=Zadnjih %s faktura kupca
LastSuppliersBills=Zadnjih %s faktura dobavljača
@@ -156,9 +154,9 @@ ConfirmCancelBill=Jeste li sigurni da želite otkazati fakturu <b>%s</b> ?
ConfirmCancelBillQuestion=Zašto želite da se ova faktura označi kao 'otkazano'?
ConfirmClassifyPaidPartially=Jeste li sigurni da želite promijeniti fakturu <b>%s</b> na status plaćeno?
ConfirmClassifyPaidPartiallyQuestion=Ova faktura nije u potpunosti plaćena. Koji su razlozi za zatvaranje fakture?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
ConfirmClassifyPaidPartiallyReasonBadCustomer=Loš kupac
ConfirmClassifyPaidPartiallyReasonProductReturned=Proizvodi djelomično vraćeni
ConfirmClassifyPaidPartiallyReasonOther=Iznos otkazan zbog drugog razloga
@@ -191,9 +189,9 @@ AlreadyPaid=Već plaćeno
AlreadyPaidBack=Već izvršen povrat uplate
AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposits)
Abandoned=Otkazano
-RemainderToPay=Ostatak za platiti
-RemainderToTake=Ostatak za uzeti
-RemainderToPayBack=Ostatak za povrat uplate
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
Rest=Čekanje
AmountExpected=Iznos za potraživati
ExcessReceived=Višak primljen
@@ -219,19 +217,18 @@ NoInvoice=Nema fakture
ClassifyBill=Označi fakturu
SupplierBillsToPay=Fakture dobavljača za platiti
CustomerBillsUnpaid=NEplaćene fakture kupaca
-DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters
-DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=Nepovratno
SetConditions=Postaviti uslova plaćanja
SetMode=Postaviti način plaćanja
Billed=Fakturisano
-RepeatableInvoice=Predefinisana faktura
-RepeatableInvoices=Predefinisane fakture
-Repeatable=Predefinisano
-Repeatables=Predefinisano
-ChangeIntoRepeatableInvoice=Pretvori u predefinisano
-CreateRepeatableInvoice=Kreiraj predefinisanu fakturu
-CreateFromRepeatableInvoice=Kreiraj na osnovu predefinisane fakture
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
CustomersInvoicesAndInvoiceLines=Fakture kupaca i tekstovi faktura
CustomersInvoicesAndPayments=Faktura kupaca i uplate
ExportDataset_invoice_1=Lista faktura kupaca i tekstovi faktura
diff --git a/htdocs/langs/bs_BA/categories.lang b/htdocs/langs/bs_BA/categories.lang
index 85e1c9cdccbda0e5e0cc473038bf65816a6750ae..76e3aeecdc319c3e2734c4ba569b2268098f847c 100644
--- a/htdocs/langs/bs_BA/categories.lang
+++ b/htdocs/langs/bs_BA/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Veze između dobavljača i kategorija
CatCusLinks=Links between customers/prospects and categories
CatProdLinks=Veze između proizvoda/usluga i kategorija
CatMemberLinks=Veze između članova i kategorija
-CatProdLinks=Veze između proizvoda/usluga i kategorija
-CatCusLinks=Links between customers/prospects and categories
-CatSupLinks=Veze između dobavljača i kategorija
DeleteFromCat=Ukloni iz kategorije
DeletePicture=Picture delete
ConfirmDeletePicture=Confirm picture deletion?
@@ -112,3 +109,4 @@ CategoriesSetup=Categories setup
CategorieRecursiv=Link with parent category automatically
CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category
diff --git a/htdocs/langs/bs_BA/compta.lang b/htdocs/langs/bs_BA/compta.lang
index 9f17662db0c699fb81d9076e9bfb4df76a49cd5f..98aa9a4e39524b81f6d8a3df7815b00dceeabdf2 100644
--- a/htdocs/langs/bs_BA/compta.lang
+++ b/htdocs/langs/bs_BA/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s
SuppliersProductsSellSalesTurnover=The generated turnover by the sales of supplier's products.
CheckReceipt=Check deposit
CheckReceiptShort=Check deposit
+LastCheckReceiptShort=Last %s check receipts
NewCheckReceipt=New discount
NewCheckDeposit=New check deposit
NewCheckDepositOn=Create receipt for deposit on account: %s
diff --git a/htdocs/langs/bs_BA/contracts.lang b/htdocs/langs/bs_BA/contracts.lang
index 873955f970762a0361b9f535a318fd22a9a5fd5b..272cd202ef8fa6016231149a8fdf8e93eac0f133 100644
--- a/htdocs/langs/bs_BA/contracts.lang
+++ b/htdocs/langs/bs_BA/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Područje za ugovore
ListOfContracts=Lista ugovora
-LastContracts=Zadnji %s izmijenjeni ugovori
+LastModifiedContracts=Last %s modified contracts
AllContracts=Svi ugovori
ContractCard=Kartica ugovora
ContractStatus=Status ugovora
@@ -27,7 +27,7 @@ MenuRunningServices=Aktivne usluge
MenuExpiredServices=Istekle usluge
MenuClosedServices=Završene usluge
NewContract=Novi ugovor
-AddContract=Dodaj ugovor
+AddContract=Create contract
SearchAContract=Traži kontakt
DeleteAContract=Obrisati ugovor
CloseAContract=Zatvori ugovor
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Lista stavki aktivnih ugovora
ListOfRunningServices=Lista aktivnih usluga
NotActivatedServices=Nekativne usluge (među potvrđenim ugovorima)
BoardNotActivatedServices=Usluge za aktiviranje među potvrđenim ugovorima
-LastContracts=Zadnji %s izmijenjeni ugovori
+LastContracts=Last % contracts
LastActivatedServices=Zadnjih $s aktiviranih usluga
LastModifiedServices=Zadnjih %s izmijenjenih usluga
EditServiceLine=Izmijeni stavku usluge
diff --git a/htdocs/langs/bs_BA/cron.lang b/htdocs/langs/bs_BA/cron.lang
index a54ee84a1ba33cd0e16922b9f39d4acd77cf56c7..95d35389d87cfbed633a4eca53599deb7c9cb5ac 100644
--- a/htdocs/langs/bs_BA/cron.lang
+++ b/htdocs/langs/bs_BA/cron.lang
@@ -1,10 +1,8 @@
# Dolibarr language file - Source file is en_US - cron
-#
# About page
About = O programu
CronAbout = O Cron-u
CronAboutPage = Stranica o Cron-u
-
# Right
Permission23101 = Pročitaj redovne zadatke
Permission23102 = Kreiraj/Ažuriraj redovni zadatak
@@ -20,9 +18,8 @@ CronExplainHowToRunUnix=On Unix environment you should use crontab to run Comman
CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
# Menu
CronJobs=Scheduled jobs
-CronListActive= Lista aktivnih poslova
-CronListInactive= Lista onemogućenih poslova
-CronListActive= Lista aktivnih poslova
+CronListActive=List of active/scheduled jobs
+CronListInactive=Lista onemogućenih poslova
# Page list
CronDateLastRun=Zadnje pokretanje
CronLastOutput=Izvještaj o zadnjem pokretanju
diff --git a/htdocs/langs/bs_BA/donations.lang b/htdocs/langs/bs_BA/donations.lang
index 6700369f388d61fbc930ee10602cf279b3fbbf64..53b847f7c5a00d943f2c5cb0b13e3a3c63a4db29 100644
--- a/htdocs/langs/bs_BA/donations.lang
+++ b/htdocs/langs/bs_BA/donations.lang
@@ -4,7 +4,7 @@ Donations=Donacije
DonationRef=Donacija ref.
Donor=Donator
Donors=Donatori
-AddDonation=Dodaj donaciju
+AddDonation=Create a donation
NewDonation=Nova donacija
ShowDonation=Prikaži donaciju
DonationPromise=Obećanje za poklon
@@ -31,3 +31,8 @@ DonationRecipient=Primalac donacije
ThankYou=Hvala Vam
IConfirmDonationReception=Primalac potvrđuje prijem, kao donacija, slijedeći iznos
MinimumAmount=Minimum amount is %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/bs_BA/externalsite.lang b/htdocs/langs/bs_BA/externalsite.lang
index 82cc682a42dccd4902fb3f5fe7bacb846cf3db51..70845e9ccba89e178675833c6f79cb9d323f223c 100644
--- a/htdocs/langs/bs_BA/externalsite.lang
+++ b/htdocs/langs/bs_BA/externalsite.lang
@@ -2,3 +2,4 @@
ExternalSiteSetup=Podesi link za eksterni web sajt
ExternalSiteURL=Link do eksternog web sajta
ExternalSiteModuleNotComplete=Modul ExternalSite nije konfigurisan kako treba.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/bs_BA/holiday.lang b/htdocs/langs/bs_BA/holiday.lang
index ab2993195de789462e5426a2a20111946bdf77cc..23d4c100a2f5feeab49384a5ac2fd777e198edcc 100644
--- a/htdocs/langs/bs_BA/holiday.lang
+++ b/htdocs/langs/bs_BA/holiday.lang
@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
CantCreateCP=You don't have the right to make leave requests.
InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=Ažuriranje
CantUpdate=You cannot update this leave request.
NoDateDebut=Morate odabrati datum početka.
NoDateFin=Morate odabrati datum završetka.
-ErrorDureeCP=Vaš zahtjev za godišnji odmor ne sadrži radni dan.
-TitleValidCP=Odobri zahtjev za godišnji odmor
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
ConfirmValidCP=Are you sure you want to approve the leave request?
DateValidCP=Datum odobrenja
TitleToValidCP=Send leave request
ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Odbiti zahtjev za godišnji odmor
+TitleRefuseCP=Refuse the leave request
ConfirmRefuseCP=Are you sure you want to refuse the leave request?
NoMotifRefuseCP=Morate odabrati razlog za odbijanje zahtjeva.
-TitleCancelCP=Poništi zahtjev za godišnji odmor
+TitleCancelCP=Cancel the leave request
ConfirmCancelCP=Are you sure you want to cancel the leave request?
DetailRefusCP=Razlog za odbijanje
DateRefusCP=Datum odbijanja
@@ -78,7 +77,7 @@ ActionByCP=Izvršeno od strane
UserUpdateCP=Za korisnika
PrevSoldeCP=Prethodno stanje
NewSoldeCP=Novo stanje
-alreadyCPexist=Zahtjev za godišnji odmor je vec završen za ovaj period.
+alreadyCPexist=A leave request has already been done on this period.
UserName=Naziv
Employee=Zaposlenik
FirstDayOfHoliday=First day of vacation
@@ -88,25 +87,25 @@ ManualUpdate=Ručno ažuriranje
HolidaysCancelation=Leave request cancelation
## Configuration du Module ##
-ConfCP=Konfiguracija modula za godišnje odmore
+ConfCP=Configuration of leave request module
DescOptionCP=Opis opcije
ValueOptionCP=Vrijednost
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
ConfirmConfigCP=Potvrdite konfiguraciju
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
UpdateConfCPOK=Uspješno ažuriranje.
ErrorUpdateConfCP=Došlo je do greške prilikom ažuriranja, molimo pokušajte ponovo.
-AddCPforUsers=Molimo dodajte stanje godišnjih odmora za korisnika <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">klikom ovdje</a>.
-DelayForSubmitCP=Rok za prijavu za godišnji odmor
-AlertapprobatortorDelayCP=Spriječi osobu koja odobrava godišnji odmor u slučaju da se ne poklapa sa rokovima
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
Module27130Name= Management of leave requests
Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
TitleOptionEventCP=Settings of leave requets for events
ValidEventCP=Potvrdi
UpdateEventCP=Ažuriraj događaje
diff --git a/htdocs/langs/bs_BA/interventions.lang b/htdocs/langs/bs_BA/interventions.lang
index 06f4edc8354a4e8edd85d868a716c01f7880f051..5f340d0b6c46b107f7af612237dc5e8e2c8ec746 100644
--- a/htdocs/langs/bs_BA/interventions.lang
+++ b/htdocs/langs/bs_BA/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Intervencija
Interventions=Intervencije
InterventionCard=Kartica intervencija
NewIntervention=Nova intervencija
-AddIntervention=Dodaj intervenciju
+AddIntervention=Create intervention
ListOfInterventions=Lista intervencija
EditIntervention=Izimijeni intervenciju
ActionsOnFicheInter=Akcije na intervencijama
@@ -30,6 +30,15 @@ StatusInterInvoiced=Fakturisano
RelatedInterventions=Povezane intervencije
ShowIntervention=Prikaži intervenciju
SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Predstavnik koji kontroliše intervenciju
TypeContact_fichinter_internal_INTERVENING=Serviser
diff --git a/htdocs/langs/bs_BA/mails.lang b/htdocs/langs/bs_BA/mails.lang
index 138d6b88d39464bb34464d70c1ac81d844946a5a..6ce54e5dbd9c745ffe2a05c96e4d486d6fed9f84 100644
--- a/htdocs/langs/bs_BA/mails.lang
+++ b/htdocs/langs/bs_BA/mails.lang
@@ -115,7 +115,7 @@ SentBy=Poslano od
MailingNeedCommand=Iz sigurnosnih razloga, slanje e-pošte je bolje kada se vrši sa komandne lnije. Ako imate pristup, pitajte vašeg server administratora da pokrene slijedeću liniju za slanje e-pošte svim primaocima:
MailingNeedCommand2=Možete ih poslati online dodavanjem parametra MAILING_LIMIT_SENDBYWEB sa vrijednosti za maksimalni broj e-mailova koje želite poslati po sesiji. Za ovo idite na Početna - Postavke - Ostalo
ConfirmSendingEmailing=Ako ne možete ili preferirate slanje preko www pretraživača, molim potvrdite da ste sigurni da želite poslati e-poštu sa vašeg pretraživača?
-LimitSendingEmailing=Napomena: Slanje e-pošte preko interneta je ograničeno iz sigurnosnih razloga i timeout razloga primaocima <b>%s</b> od strane sesije za slanje.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=Očisti listu
ToClearAllRecipientsClickHere=Klikni ovdje da očistite listu primaoca za ovu e-poštu
ToAddRecipientsChooseHere=Odaberi primaoce biranjem sa liste
@@ -133,6 +133,9 @@ Notifications=Notifikacije
NoNotificationsWillBeSent=Nema planiranih email notifikacija za ovaj događaj i kompaniju
ANotificationsWillBeSent=1 notifikacija će biti poslana emailom
SomeNotificationsWillBeSent=%s notifikacija će biti poslane emailom
-AddNewNotification=Aktivirati novi zahtjev za notifikacije o slanje emaila
-ListOfActiveNotifications=Lista svih aktivnih zahtjeva za notifikacije slanja emaila
+AddNewNotification=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
ListOfNotificationsDone=Lista svih notifikacija o slanju emaila
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/bs_BA/main.lang b/htdocs/langs/bs_BA/main.lang
index 180cc0a7e7810a7fd216af200d262fdbfd8a419c..6d3fa6abd67e7bba4fef2553281eea92497ce66c 100644
--- a/htdocs/langs/bs_BA/main.lang
+++ b/htdocs/langs/bs_BA/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr
ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'.
ErrorFailedToSaveFile=Error, failed to save file.
-ErrorOnlyPngJpgSupported=Error, only .png and .jpg image format file are supported.
-ErrorImageFormatNotSupported=Your PHP does not support functions to convert images of this format.
SetDate=Set date
SelectDate=Select a date
SeeAlso=See also %s
BackgroundColorByDefault=Default background color
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
NbOfEntries=Nb of entries
GoToWikiHelpPage=Read online help (need Internet access)
@@ -266,6 +266,7 @@ Afternoon=Afternoon
Quadri=Quadri
MonthOfDay=Month of the day
HourShort=H
+MinuteShort=mn
Rate=Rate
UseLocalTax=Include tax
Bytes=Bytes
@@ -340,6 +341,7 @@ FullList=Full list
Statistics=Statistics
OtherStatistics=Other statistics
Status=Status
+Favorite=Favorite
ShortInfo=Info.
Ref=Ref.
RefSupplier=Ref. supplier
@@ -365,6 +367,7 @@ ActionsOnCompany=Events about this third party
ActionsOnMember=Events about this member
NActions=%s events
NActionsLate=%s late
+RequestAlreadyDone=Request already recorded
Filter=Filter
RemoveFilter=Remove filter
ChartGenerated=Chart generated
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Extra attributes setup
URLPhoto=URL of photo/logo
SetLinkToThirdParty=Link to another third party
CreateDraft=Create draft
+SetToDraft=Back to draft
ClickToEdit=Click to edit
ObjectDeleted=Object %s deleted
ByCountry=By country
@@ -678,7 +682,7 @@ ViewPrivateNote=View notes
XMoreLines=%s line(s) hidden
PublicUrl=Public URL
AddBox=Add box
-
+SelectElementAndClickRefresh=Select an element and click Refresh
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/langs/bs_BA/margins.lang b/htdocs/langs/bs_BA/margins.lang
index e8d5fed1af9a379298973a5c33a511cf77ea3706..606d5e5053a25855631a7d6ee61b6c392c1fe32c 100644
--- a/htdocs/langs/bs_BA/margins.lang
+++ b/htdocs/langs/bs_BA/margins.lang
@@ -10,24 +10,18 @@ MarkRate=Mark rate
DisplayMarginRates=Display margin rates
DisplayMarkRates=Display mark rates
InputPrice=Input price
-
margin=Profit margins management
margesSetup=Profit margins management setup
-
MarginDetails=Margin details
-
ProductMargins=Product margins
CustomerMargins=Customer margins
SalesRepresentativeMargins=Sales representative margins
-
ProductService=Product or Service
AllProducts=All products and services
ChooseProduct/Service=Choose product or service
-
StartDate=Start date
EndDate=End date
Launch=Start
-
ForceBuyingPriceIfNull=Force buying price if null
ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0)
MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
@@ -35,16 +29,16 @@ UseDiscountAsProduct=As a product
UseDiscountAsService=As a service
UseDiscountOnTotal=On subtotal
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
-
MARGIN_TYPE=Margin type
MargeBrute=Raw margin
MargeNette=Net margin
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - Cost price
-
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
Charges=Charges
-
AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/bs_BA/orders.lang b/htdocs/langs/bs_BA/orders.lang
index 42444f0ec1c52173f7e7c94b58792d7b03f11de4..6ee9c19fa95f45044b7466cc0fdcbf21819ef13a 100644
--- a/htdocs/langs/bs_BA/orders.lang
+++ b/htdocs/langs/bs_BA/orders.lang
@@ -1,168 +1,162 @@
# Dolibarr language file - Source file is en_US - orders
-# OrdersArea=Customers orders area
-# SuppliersOrdersArea=Suppliers orders area
-# OrderCard=Order card
-# OrderId=Order Id
-# Order=Order
-# Orders=Orders
-# OrderLine=Order line
-# OrderFollow=Follow up
-# OrderDate=Order date
-# OrderToProcess=Order to process
-# NewOrder=New order
-# ToOrder=Make order
-# MakeOrder=Make order
-# SupplierOrder=Supplier order
-# SuppliersOrders=Suppliers orders
-# SuppliersOrdersRunning=Current suppliers orders
-# CustomerOrder=Customer order
-# CustomersOrders=Customer's orders
-# CustomersOrdersRunning=Current customer's orders
-# CustomersOrdersAndOrdersLines=Customer orders and order's lines
-# OrdersToValid=Customer's orders to validate
-# OrdersToBill=Customer's orders delivered
-# OrdersInProcess=Customer's orders in process
-# OrdersToProcess=Customer's orders to process
-# SuppliersOrdersToProcess=Supplier's orders to process
-# StatusOrderCanceledShort=Canceled
-# StatusOrderDraftShort=Draft
-# StatusOrderValidatedShort=Validated
-# StatusOrderSentShort=In process
-# StatusOrderSent=Shipment in process
-# StatusOrderOnProcessShort=Reception
-# StatusOrderProcessedShort=Processed
-# StatusOrderToBillShort=Delivered
-# StatusOrderToBill2Short=To bill
-# StatusOrderApprovedShort=Approved
-# StatusOrderRefusedShort=Refused
-# StatusOrderToProcessShort=To process
-# StatusOrderReceivedPartiallyShort=Partially received
-# StatusOrderReceivedAllShort=Everything received
-# StatusOrderCanceled=Canceled
-# StatusOrderDraft=Draft (needs to be validated)
-# StatusOrderValidated=Validated
-# StatusOrderOnProcess=Waiting to receive
-# StatusOrderProcessed=Processed
-# StatusOrderToBill=Delivered
-# StatusOrderToBill2=To bill
-# StatusOrderApproved=Approved
-# StatusOrderRefused=Refused
-# StatusOrderReceivedPartially=Partially received
-# StatusOrderReceivedAll=Everything received
-# ShippingExist=A shipment exists
-# DraftOrWaitingApproved=Draft or approved not yet ordered
-# DraftOrWaitingShipped=Draft or validated not yet shipped
-# MenuOrdersToBill=Orders delivered
-# MenuOrdersToBill2=Orders to bill
-# SearchOrder=Search order
-# SearchACustomerOrder=Search a customer order
-# ShipProduct=Ship product
-# Discount=Discount
-# CreateOrder=Create Order
-# RefuseOrder=Refuse order
-# ApproveOrder=Accept order
-# ValidateOrder=Validate order
-# UnvalidateOrder=Unvalidate order
-# DeleteOrder=Delete order
-# CancelOrder=Cancel order
-# AddOrder=Add order
-# AddToMyOrders=Add to my orders
-# AddToOtherOrders=Add to other orders
-# AddToDraftOrders=Add to draft order
-# ShowOrder=Show order
-# NoOpenedOrders=No opened orders
-# NoOtherOpenedOrders=No other opened orders
-# NoDraftOrders=No draft orders
-# OtherOrders=Other orders
-# LastOrders=Last %s orders
-# LastModifiedOrders=Last %s modified orders
-# LastClosedOrders=Last %s closed orders
-# AllOrders=All orders
-# NbOfOrders=Number of orders
-# OrdersStatistics=Order's statistics
-# OrdersStatisticsSuppliers=Supplier order's statistics
-# NumberOfOrdersByMonth=Number of orders by month
-# AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
-# ListOfOrders=List of orders
-# CloseOrder=Close order
-# ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed.
-# ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done.
-# ConfirmDeleteOrder=Are you sure you want to delete this order ?
-# ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b> ?
-# ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> to draft status ?
-# ConfirmCancelOrder=Are you sure you want to cancel this order ?
-# ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b> ?
-# GenerateBill=Generate invoice
-# ClassifyShipped=Classify delivered
-# ClassifyBilled=Classify billed
-# ComptaCard=Accountancy card
-# DraftOrders=Draft orders
-# RelatedOrders=Related orders
-# OnProcessOrders=In process orders
-# RefOrder=Ref. order
-# RefCustomerOrder=Ref. customer order
-# CustomerOrder=Customer order
-# RefCustomerOrderShort=Ref. cust. order
-# SendOrderByMail=Send order by mail
-# ActionsOnOrder=Events on order
-# NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
-# OrderMode=Order method
-# AuthorRequest=Request author
-# UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address
-# RunningOrders=Orders on process
-# UserWithApproveOrderGrant=Users granted with "approve orders" permission.
-# PaymentOrderRef=Payment of order %s
-# CloneOrder=Clone order
-# ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b> ?
-# DispatchSupplierOrder=Receiving supplier order %s
+OrdersArea=Customers orders area
+SuppliersOrdersArea=Suppliers orders area
+OrderCard=Order card
+OrderId=Order Id
+Order=Order
+Orders=Orders
+OrderLine=Order line
+OrderFollow=Follow up
+OrderDate=Order date
+OrderToProcess=Order to process
+NewOrder=New order
+ToOrder=Make order
+MakeOrder=Make order
+SupplierOrder=Supplier order
+SuppliersOrders=Suppliers orders
+SuppliersOrdersRunning=Current suppliers orders
+CustomerOrder=Customer order
+CustomersOrders=Customer's orders
+CustomersOrdersRunning=Current customer's orders
+CustomersOrdersAndOrdersLines=Customer orders and order's lines
+OrdersToValid=Customer's orders to validate
+OrdersToBill=Customer's orders delivered
+OrdersInProcess=Customer's orders in process
+OrdersToProcess=Customer's orders to process
+SuppliersOrdersToProcess=Supplier's orders to process
+StatusOrderCanceledShort=Canceled
+StatusOrderDraftShort=Draft
+StatusOrderValidatedShort=Validated
+StatusOrderSentShort=In process
+StatusOrderSent=Shipment in process
+StatusOrderOnProcessShort=Reception
+StatusOrderProcessedShort=Processed
+StatusOrderToBillShort=Delivered
+StatusOrderToBill2Short=To bill
+StatusOrderApprovedShort=Approved
+StatusOrderRefusedShort=Refused
+StatusOrderToProcessShort=To process
+StatusOrderReceivedPartiallyShort=Partially received
+StatusOrderReceivedAllShort=Everything received
+StatusOrderCanceled=Canceled
+StatusOrderDraft=Draft (needs to be validated)
+StatusOrderValidated=Validated
+StatusOrderOnProcess=Waiting to receive
+StatusOrderProcessed=Processed
+StatusOrderToBill=Delivered
+StatusOrderToBill2=To bill
+StatusOrderApproved=Approved
+StatusOrderRefused=Refused
+StatusOrderReceivedPartially=Partially received
+StatusOrderReceivedAll=Everything received
+ShippingExist=A shipment exists
+DraftOrWaitingApproved=Draft or approved not yet ordered
+DraftOrWaitingShipped=Draft or validated not yet shipped
+MenuOrdersToBill=Orders delivered
+MenuOrdersToBill2=Billable orders
+SearchOrder=Search order
+SearchACustomerOrder=Search a customer order
+ShipProduct=Ship product
+Discount=Discount
+CreateOrder=Create Order
+RefuseOrder=Refuse order
+ApproveOrder=Accept order
+ValidateOrder=Validate order
+UnvalidateOrder=Unvalidate order
+DeleteOrder=Delete order
+CancelOrder=Cancel order
+AddOrder=Create order
+AddToMyOrders=Add to my orders
+AddToOtherOrders=Add to other orders
+AddToDraftOrders=Add to draft order
+ShowOrder=Show order
+NoOpenedOrders=No opened orders
+NoOtherOpenedOrders=No other opened orders
+NoDraftOrders=No draft orders
+OtherOrders=Other orders
+LastOrders=Last %s orders
+LastModifiedOrders=Last %s modified orders
+LastClosedOrders=Last %s closed orders
+AllOrders=All orders
+NbOfOrders=Number of orders
+OrdersStatistics=Order's statistics
+OrdersStatisticsSuppliers=Supplier order's statistics
+NumberOfOrdersByMonth=Number of orders by month
+AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
+ListOfOrders=List of orders
+CloseOrder=Close order
+ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed.
+ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done.
+ConfirmDeleteOrder=Are you sure you want to delete this order ?
+ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b> ?
+ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> to draft status ?
+ConfirmCancelOrder=Are you sure you want to cancel this order ?
+ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b> ?
+GenerateBill=Generate invoice
+ClassifyShipped=Classify delivered
+ClassifyBilled=Classify billed
+ComptaCard=Accountancy card
+DraftOrders=Draft orders
+RelatedOrders=Related orders
+OnProcessOrders=In process orders
+RefOrder=Ref. order
+RefCustomerOrder=Ref. customer order
+RefCustomerOrderShort=Ref. cust. order
+SendOrderByMail=Send order by mail
+ActionsOnOrder=Events on order
+NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
+OrderMode=Order method
+AuthorRequest=Request author
+UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address
+RunningOrders=Orders on process
+UserWithApproveOrderGrant=Users granted with "approve orders" permission.
+PaymentOrderRef=Payment of order %s
+CloneOrder=Clone order
+ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b> ?
+DispatchSupplierOrder=Receiving supplier order %s
##### Types de contacts #####
-# TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
-# TypeContact_commande_internal_SHIPPING=Representative following-up shipping
-# TypeContact_commande_external_BILLING=Customer invoice contact
-# TypeContact_commande_external_SHIPPING=Customer shipping contact
-# TypeContact_commande_external_CUSTOMER=Customer contact following-up order
-# TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order
-# TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
-# TypeContact_order_supplier_external_BILLING=Supplier invoice contact
-# TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact
-# TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order
-
-# Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
-# Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
-# Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s'
-# Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s'
-# Error_OrderNotChecked=No orders to invoice selected
-
+TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
+TypeContact_commande_internal_SHIPPING=Representative following-up shipping
+TypeContact_commande_external_BILLING=Customer invoice contact
+TypeContact_commande_external_SHIPPING=Customer shipping contact
+TypeContact_commande_external_CUSTOMER=Customer contact following-up order
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order
+TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
+TypeContact_order_supplier_external_BILLING=Supplier invoice contact
+TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order
+Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
+Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
+Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s'
+Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s'
+Error_OrderNotChecked=No orders to invoice selected
# Sources
-# OrderSource0=Commercial proposal
-# OrderSource1=Internet
-# OrderSource2=Mail campaign
-# OrderSource3=Phone compaign
-# OrderSource4=Fax campaign
-# OrderSource5=Commercial
-# OrderSource6=Store
-# QtyOrdered=Qty ordered
-# AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order
-
+OrderSource0=Commercial proposal
+OrderSource1=Internet
+OrderSource2=Mail campaign
+OrderSource3=Phone compaign
+OrderSource4=Fax campaign
+OrderSource5=Commercial
+OrderSource6=Store
+QtyOrdered=Qty ordered
+AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order
# Documents models
-# PDFEinsteinDescription=A complete order model (logo...)
-# PDFEdisonDescription=A simple order model
-# PDFProformaDescription=A complete proforma invoice (logo…)
+PDFEinsteinDescription=A complete order model (logo...)
+PDFEdisonDescription=A simple order model
+PDFProformaDescription=A complete proforma invoice (logo…)
# Orders modes
-# OrderByMail=Mail
-# OrderByFax=Fax
-# OrderByEMail=EMail
-# OrderByWWW=Online
-# OrderByPhone=Phone
-
-# CreateInvoiceForThisCustomer=Bill orders
-# NoOrdersToInvoice=No orders billable
-# CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-# MenuOrdersToBill2=Orders to bill
-# OrderCreation=Order creation
-# Ordered=Ordered
-# OrderCreated=Your orders have been created
-# OrderFail=An error happened during your orders creation
-# CreateOrders=Create orders
-# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+OrderByMail=Mail
+OrderByFax=Fax
+OrderByEMail=EMail
+OrderByWWW=Online
+OrderByPhone=Phone
+CreateInvoiceForThisCustomer=Bill orders
+NoOrdersToInvoice=No orders billable
+CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
+OrderCreation=Order creation
+Ordered=Ordered
+OrderCreated=Your orders have been created
+OrderFail=An error happened during your orders creation
+CreateOrders=Create orders
+ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
diff --git a/htdocs/langs/bs_BA/oscommerce.lang b/htdocs/langs/bs_BA/oscommerce.lang
deleted file mode 100644
index e7532487d48142edaafadfe5ade75dd95bb14d1d..0000000000000000000000000000000000000000
--- a/htdocs/langs/bs_BA/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=OS Commerce podešavanje modula
-OSCommerceSetupSaved=OS Commerce postavke snimljene
-OSCommerceServer=OS Commerce server host / IP
-OSCommerceDatabaseName=OS Commerce ime baze podataka
-OSCommercePrefix=OS Commerce prefiks tabela
-OSCommerceUser=OS Commerce login baze podataka
diff --git a/htdocs/langs/bs_BA/other.lang b/htdocs/langs/bs_BA/other.lang
index b56ef2944951b7c0d44d285b1e7a02ad6077a579..889918881838dcbc59b7a031b8af656cec175167 100644
--- a/htdocs/langs/bs_BA/other.lang
+++ b/htdocs/langs/bs_BA/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=Security code
Calendar=Calendar
-AddTrip=Add trip
Tools=Tools
ToolsDesc=This area is dedicated to group miscellaneous tools not available into other menu entries.<br><br>Those tools can be reached from menu on the side.
Birthday=Birthday
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation
Notify_TASK_CREATE=Task created
Notify_TASK_MODIFY=Task modified
Notify_TASK_DELETE=Task deleted
+SeeModuleSetup=See module setup
NbOfAttachedFiles=Number of attached files/documents
TotalSizeOfAttachedFiles=Total size of attached files/documents
MaxSize=Maximum size
@@ -80,6 +80,16 @@ ModifiedBy=Modified by %s
ValidatedBy=Validated by %s
CanceledBy=Canceled by %s
ClosedBy=Closed by %s
+CreatedById=User id who created
+ModifiedById=User id who made last change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made last change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
FileWasRemoved=File %s was removed
DirWasRemoved=Directory %s was removed
FeatureNotYetAvailableShort=Available in a next version
@@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your
##### Calendar common #####
AddCalendarEntry=Add entry in calendar %s
-NewCompanyToDolibarr=Company %s added into Dolibarr
-ContractValidatedInDolibarr=Contract %s validated in Dolibarr
-ContractCanceledInDolibarr=Contract %s canceled in Dolibarr
-ContractClosedInDolibarr=Contract %s closed in Dolibarr
-PropalClosedSignedInDolibarr=Proposal %s signed in Dolibarr
-PropalClosedRefusedInDolibarr=Proposal %s refused in Dolibarr
-PropalValidatedInDolibarr=Proposal %s validated in Dolibarr
-InvoiceValidatedInDolibarr=Invoice %s validated in Dolibarr
-InvoicePaidInDolibarr=Invoice %s changed to paid in Dolibarr
-InvoiceCanceledInDolibarr=Invoice %s canceled in Dolibarr
-PaymentDoneInDolibarr=Payment %s done in Dolibarr
-CustomerPaymentDoneInDolibarr=Customer payment %s done in Dolibarr
-SupplierPaymentDoneInDolibarr=Supplier payment %s done in Dolibarr
-MemberValidatedInDolibarr=Member %s validated in Dolibarr
-MemberResiliatedInDolibarr=Member %s resiliated in Dolibarr
-MemberDeletedInDolibarr=Member %s deleted from Dolibarr
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added in Dolibarr
-ShipmentValidatedInDolibarr=Shipment %s validated in Dolibarr
-ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
##### Export #####
Export=Export
ExportsArea=Exports area
diff --git a/htdocs/langs/bs_BA/paybox.lang b/htdocs/langs/bs_BA/paybox.lang
index b689bb6cebff21b067564cffd144aa4a6aaa2e98..aced32a49440a9ff7a1b1e0279522ff49cec7821 100644
--- a/htdocs/langs/bs_BA/paybox.lang
+++ b/htdocs/langs/bs_BA/paybox.lang
@@ -1,37 +1,40 @@
# Dolibarr language file - Source file is en_US - paybox
-# PayBoxSetup=PayBox module setup
-# PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
-# FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
-# PaymentForm=Payment form
-# WelcomeOnPaymentPage=Welcome on our online payment service
-# ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
-# ThisIsInformationOnPayment=This is information on payment to do
-# ToComplete=To complete
-# YourEMail=Email to receive payment confirmation
-# Creditor=Creditor
-# PaymentCode=Payment code
-# PayBoxDoPayment=Go on payment
-# YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
-# PleaseBePatient=Please, be patient
-# Continue=Next
-# ToOfferALinkForOnlinePayment=URL for %s payment
-# ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
-# ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
-# ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
-# ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
-# ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
-# YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
-# SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> to have payment created automatically when validated by paybox.
-# YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-# YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
-# AccountParameter=Account parameters
-# UsageParameter=Usage parameters
-# InformationToFindParameters=Help to find your %s account information
-# PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment
-# VendorName=Name of vendor
-# CSSUrlForPaymentForm=CSS style sheet url for payment form
-# MessageOK=Message on validated payment return page
-# MessageKO=Message on canceled payment return page
-# NewPayboxPaymentReceived=New Paybox payment received
-# NewPayboxPaymentFailed=New Paybox payment tried but failed
-# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PayBoxSetup=PayBox module setup
+PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
+FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
+PaymentForm=Payment form
+WelcomeOnPaymentPage=Welcome on our online payment service
+ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
+ThisIsInformationOnPayment=This is information on payment to do
+ToComplete=To complete
+YourEMail=Email to receive payment confirmation
+Creditor=Creditor
+PaymentCode=Payment code
+PayBoxDoPayment=Go on payment
+YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
+PleaseBePatient=Please, be patient
+Continue=Next
+ToOfferALinkForOnlinePayment=URL for %s payment
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
+ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
+YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> to have payment created automatically when validated by paybox.
+YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
+YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
+AccountParameter=Account parameters
+UsageParameter=Usage parameters
+InformationToFindParameters=Help to find your %s account information
+PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment
+VendorName=Name of vendor
+CSSUrlForPaymentForm=CSS style sheet url for payment form
+MessageOK=Message on validated payment return page
+MessageKO=Message on canceled payment return page
+NewPayboxPaymentReceived=New Paybox payment received
+NewPayboxPaymentFailed=New Paybox payment tried but failed
+PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/bs_BA/resource.lang b/htdocs/langs/bs_BA/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..d64075dfbf595897a63e3eebf19194d8f71030dd
--- /dev/null
+++ b/htdocs/langs/bs_BA/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
diff --git a/htdocs/langs/bs_BA/sendings.lang b/htdocs/langs/bs_BA/sendings.lang
index 9bdc4e0100c05dd0290117b2b5eec98cff9f0034..60d641fecdc791cf175ff1820db0b3daa6918803 100644
--- a/htdocs/langs/bs_BA/sendings.lang
+++ b/htdocs/langs/bs_BA/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=U ovom trenutku, nova pošiljka se kreira sa kar
RelatedShippings=Povezana otpremanja
ShipmentLine=Tekst pošiljke
CarrierList=Lista transportera
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
# Sending methods
SendingMethodCATCH=Catch by customer
diff --git a/htdocs/langs/bs_BA/stocks.lang b/htdocs/langs/bs_BA/stocks.lang
index a5372800bf680f279b8189a1d325c3ed697354ef..59e621fff2d6e4f9a6bee1cd4b3f3200de9abef0 100644
--- a/htdocs/langs/bs_BA/stocks.lang
+++ b/htdocs/langs/bs_BA/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Naziv za skladište je potreban
CorrectStock=Ispravi zalihu
ListOfWarehouses=Lista skladišta
ListOfStockMovements=Lista kretanja zaliha
-StocksArea=Dio za zalihe
+StocksArea=Warehouses area
Location=Lokacija
LocationSummary=Skraćeni naziv lokacije
NumberOfDifferentProducts=Broj različitih proizvoda
diff --git a/htdocs/langs/bs_BA/users.lang b/htdocs/langs/bs_BA/users.lang
index b2508ca774230a2dda41c8e10a79258c9306dd5c..97d04af3c0ae1d496624fa942b17182a751b24c8 100644
--- a/htdocs/langs/bs_BA/users.lang
+++ b/htdocs/langs/bs_BA/users.lang
@@ -63,7 +63,6 @@ ShowGroup=Prikaži grupu
ShowUser=Prikaži korisnika
NonAffectedUsers=Nedodijeljen korisnici
UserModified=Korisnik uspješno izmijenjen
-GroupModified=Grupa uspješno izmijenjena
PhotoFile=Foto fajl
UserWithDolibarrAccess=Korisnik sa Dolibarr pristupom
ListOfUsersInGroup=Lista korisnika u ovoj grupi
@@ -103,7 +102,7 @@ UserDisabled=Korisnik %s isključen
UserEnabled=Korisnik %s aktiviran
UserDeleted=Korisnik %s uklonjen
NewGroupCreated=Grupa %s kreirana
-GroupModified=Grupa uspješno izmijenjena
+GroupModified=Group %s modified
GroupDeleted=Grupa %s uklonjena
ConfirmCreateContact=Jeste li sigurni da želite kreirati Dolibarr račun za ovaj kontakt?
ConfirmCreateLogin=Jeste li sigurni da želite stvoriti Dolibarr račun za ovog člana?
@@ -114,8 +113,10 @@ YourRole=Vaše uloga
YourQuotaOfUsersIsReached=Vaša kvota aktivnih korisnika je postignuta!
NbOfUsers=Broj korisnika
DontDowngradeSuperAdmin=Samo superadmin može unazaditi superadmina
-HierarchicalResponsible=Hijerarhijska odgovornost
+HierarchicalResponsible=Supervisor
HierarchicView=Hijerarhijski prikaz
UseTypeFieldToChange=Koristite polja Tip za promjene
OpenIDURL=OpenID URL
LoginUsingOpenID=Koristiti OpenID za login
+WeeklyHours=Weekly hours
+ColorUser=Color of the user
diff --git a/htdocs/langs/bs_BA/withdrawals.lang b/htdocs/langs/bs_BA/withdrawals.lang
index d4c8547adfb3e41447b3f76768e924b631f26651..bbc20358aeb007a06e81a0ffe384742136d98273 100644
--- a/htdocs/langs/bs_BA/withdrawals.lang
+++ b/htdocs/langs/bs_BA/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=Priznanica
LastWithdrawalReceipts=Posljednjih %s priznanica podizanja
WithdrawedBills=Podignute fakture
WithdrawalsLines=Tekst podizanja
-RequestStandingOrderToTreat=Zahtjev za razmatranje trajnim naloga
-RequestStandingOrderTreated=Zahtjev za razmatrene trajne naloge
+RequestStandingOrderToTreat=Request for standing orders to process
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=Trajnih nalozi kupca
CustomerStandingOrder=Trajni nalog kupca
NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
@@ -40,14 +41,13 @@ TransMetod=Transmission method
Send=Poslati
Lines=Tekst
StandingOrderReject=Issue a rejection
-InvoiceRefused=Faktura odbijena
WithdrawalRefused=Withdrawal refused
WithdrawalRefusedConfirm=Jeste li sigurni da želite da unesete odbijenicu povlačenja za društvo
RefusedData=Datum odbacivanja
RefusedReason=Razlog za odbijanje
RefusedInvoicing=Naplate odbijanja
NoInvoiceRefused=Ne naplatiti odbijanje
-InvoiceRefused=Faktura odbijena
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=Status
StatusUnknown=Nepoznato
StatusWaiting=Čekanje
@@ -76,7 +76,7 @@ WithBankUsingRIB=For bank accounts using RIB
WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
BankToReceiveWithdraw=Bank account to receive withdraws
CreditDate=Credit on
-WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
ShowWithdraw=Show Withdraw
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
DoStandingOrdersBeforePayments=Ova kartica vam omogućava da zatražite trajni nalog. Kada je potpuna, možete izvršiti plaćanje za zatvaranje računa.
diff --git a/htdocs/langs/ca_ES/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang
index 8cab9d2b651d75b0721d76fda619e2034e4509b4..39c2732ec29852cf93d41614ed1812c2a4c1ce4f 100644
--- a/htdocs/langs/ca_ES/accountancy.lang
+++ b/htdocs/langs/ca_ES/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts
Validate=Validate
Addanaccount=Add an accounting account
AccountAccounting=Accounting account
-Ventilation=Ventilation
+Ventilation=Breakdown
ToDispatch=To dispatch
Dispatched=Dispatched
-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
TradeMargin=Trade margin
Reports=Reports
ByCustomerInvoice=By invoices customers
@@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger
Bookkeeping=General ledger
AccountBalanceByMonth=Account balance by month
-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
Line=Line
CAHTF=Total purchase supplier HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice
IntoAccount=In the accounting account
Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
+VentilationAuto=Automatic breakdown
Processing=Processing
EndProcessing=The end of processing
@@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account
ACCOUNTING_SEPARATORCSV=Separator CSV
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
@@ -140,14 +140,14 @@ Active=Statement
NewFiscalYear=New fiscal year
-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
TotalVente=Total turnover HT
TotalMarge=Total sales margin
DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
ChangeAccount=Change the accounting account for lines selected by the account:
Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
@@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically
ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index e7a3ca5446471ebcd4313bd20969264c4f1e2eb2..262ca3919fce82e058d72b361c900f84fcb85682 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -437,8 +437,8 @@ Module52Name=Stocks de productes
Module52Desc=Gestió de stocks de productes
Module53Name=Serveis
Module53Desc=Gestió de serveis
-Module54Name=Contractes
-Module54Desc=Gestió de contractes
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=Codis de barra
Module55Desc=Gestió dels codis de barra
Module56Name=Telefonia
@@ -475,8 +475,8 @@ Module320Name=Fils RSS
Module320Desc=Addició de fils d'informació RSS en les pantalles Dolibarr
Module330Name=Bookmarks
Module330Desc=Gestió de bookmarks
-Module400Name=Projectes
-Module400Desc=Gestió dels projectes en els altres mòduls
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=Webcalendar
Module410Desc=Interface amb el calendari webcalendar
Module500Name=Special expenses (tax, social contributions, dividends)
@@ -484,7 +484,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di
Module510Name=Salaries
Module510Desc=Management of employees salaries and payments
Module600Name=Notificacions
-Module600Desc=Enviament de notificacions (per correu electrònic) sobre els esdeveniments de treball Dolibarr
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Donacions
Module700Desc=Gestió de donacions
Module1200Name=Mantis
@@ -514,16 +514,16 @@ Module5000Name=Multi-empresa
Module5000Desc=Permet gestionar diverses empreses
Module6000Name=Workflow
Module6000Desc=Workflow management
-Module20000Name=Dies lliures
-Module20000Desc=Gestió dels dies lliures dels empleats
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
Module39000Name=Product batch
Module39000Desc=Batch number, eat-by and sell-by date management on products
Module50000Name=PayBox
Module50000Desc=Mòdul per a proporcionar un pagament en línia amb targeta de crèdit mitjançant Paybox
Module50100Name=TPV
Module50100Desc=Terminal Punt de Venda per a la venda al taulell
-Module50200Name= Paypal
-Module50200Desc= Mòdul per a proporcionar un pagament en línia amb targeta de crèdit mitjançant Paypal
+Module50200Name=Paypal
+Module50200Desc=Mòdul per a proporcionar un pagament en línia amb targeta de crèdit mitjançant Paypal
Module50400Name=Accounting (advanced)
Module50400Desc=Accounting management (double parties)
Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=Consultar domiciliacions
Permission152=Crear/modificar domiciliacions
Permission153=Enviar domiciliacions
Permission154=Abonar/tornar domiciliacions
-Permission161=Consultar contractes de servei
-Permission162=Crear/modificar contractes de servei
-Permission163=Activar els serveis d'un contracte
-Permission164=Desactivar els serveis d'un contracte
-Permission165=Eliminar contractes
-Permission171=Llegir els desplaçaments
-Permission172=Crear/modificar els desplaçaments
-Permission173=Eliminar desplaçaments
-Permission178=Exportar desplaçaments
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Read trips and expenses (own and his subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
Permission180=Consultar proveïdors
Permission181=Consultar comandes a proveïdors
Permission182=Crear/modificar comandes a proveïdors
@@ -671,7 +672,7 @@ Permission300=Consultar codis de barra
Permission301=Crear/modificar codis de barra
Permission302=Eliminar codi de barra
Permission311=Consultar serveis
-Permission312=Assignar serveis a un contracte
+Permission312=Assign service/subscription to contract
Permission331=Consultar bookmarks
Permission332=Crear/modificar bookmarks
Permission333=Eliminar bookmarks
@@ -701,8 +702,8 @@ Permission701=Consultar donacions
Permission702=Crear/modificar donacions
Permission703=Eliminar donacions
Permission1001=Consultar stocks
-Permission1002=Crear/modificar stocks
-Permission1003=Eliminar stocks
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=Consultar moviments de stock
Permission1005=Crear/modificar moviments de stock
Permission1101=Consultar ordres d'enviament
@@ -1038,7 +1039,6 @@ YesInSummer=Sí a l'estiu
OnlyFollowingModulesAreOpenedToExternalUsers=Recordeu que només els mòduls següents estan oberts a usuaris externs (siguin quins siguin els permisos dels usuaris):
SuhosinSessionEncrypt=Emmagatzematge de sessions xifrades per Suhosin
ConditionIsCurrently=Actualment la condició és %s
-TestNotPossibleWithCurrentBrowsers=La detecció automàtica no és possible amb el navegador actual
YouUseBestDriver=Està utilitzant el driver %s, actualment és el millor driver disponible.
YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
NbOfProductIsLowerThanNoPb=Té %s productes/serveis a la base de dades. No és necessària cap optimització en particular.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=Retorna un codi comptable compost de<br>%s seguit del
ModuleCompanyCodePanicum=Retorna un codi comptable buit.
ModuleCompanyCodeDigitaria=Retorna un codi comptable compost seguint el codi de tercer. El codi està format per caràcter 'C' en primera posició seguit dels 5 primers caràcters del codi tercer.
UseNotifications=Utilitza notificacions
-NotificationsDesc=La funció de les notificacions permet enviar automàticament un correu electrònic per a un determinat esdeveniment Dolibarr en les empreses configurades per a això
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
ModelModules=Models de documents
DocumentModelOdt=Generació des dels documents amb format OpenDocument (Arxiu .ODT OpenOffice, KOffice, TextEdit,...)
WatermarkOnDraft=Marca d'aigua en els documents esborrany
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=Possibilitat de seleccionar una adreça d'enviament
UseOptionLineIfNoQuantity=Una línia de producte/servei que té una quantitat nul·la es considera com una opció
FreeLegalTextOnProposal=Text lliure en pressupostos
WatermarkOnDraftProposal=Marca d'aigua en pressupostos esborrany (en cas d'estar buit)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=Configuració del mòdul comandes
OrdersNumberingModules=Mòduls de numeració de les comandes
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list
ValidOrderAfterPropalClosed=Validar la comanda després del tancament del pressupost, permet no passar per la comanda provisional
FreeLegalTextOnOrders=Text lliure en comandes
WatermarkOnDraftOrders=Marca d'aigua en comandes esborrany (en cas d'estar buit)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
##### Clicktodial #####
ClickToDialSetup=Configuració del mòdul Click To Dial
ClickToDialUrlDesc=Url de trucada fent clic en la icona telèfon. Dans l'url, vous pouvez utiliser les balises<br><b>__PHONETO__</b> qui sera remplacé par le téléphone de l'appelé<br><b>__PHONEFROM__</b> qui sera remplacé par le téléphone de l'appelant (le votre)<br><b>__LOGIN__</b> qui sera remplacé par votre login clicktodial (défini sur votre fiche utilisateur)<br><b>__PASS__</b> qui sera remplacé par votre mot de passe clicktodial (défini sur votre fiche utilisateur).
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=Mòduls de numeració de les fitxes d'intervenció
TemplatePDFInterventions=Model de documents de les fitxes d'intervenció
WatermarkOnDraftInterventionCards=Marca d'aigua en fitxes d'intervenció (en cas d'estar buit)
##### Contracts #####
-ContractsSetup=Configuració del mòdul contractes
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=Mòduls de numeració dels contratos
TemplatePDFContracts=Contracts documents models
FreeLegalTextOnContracts=Free text on contracts
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Fitxers de tipus %s no són comprimits pel servidor HTT
CacheByServer=Memòria cau amb el servidor
CacheByClient=Memòria cau mitjançant el navegador
CompressionOfResources=Compressió de les respostes HTTP
-TestNotPossibleWithCurrentBrowsers=La detecció automàtica no és possible amb el navegador actual
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=Configuració del mòdul Productes
ServiceSetup=Configuració del mòdul Serveis
@@ -1382,9 +1384,10 @@ MailingSetup=Configuració del mòdul E-Mailing
MailingEMailFrom=E-Mail emissor (From) dels correus enviats per E-Mailing
MailingEMailError=E-mail de resposta (Errors-to) per a les respostes sobre enviaments per e-mailing amb error.
##### Notification #####
-NotificationSetup=Configuració del mòdul notificacions
+NotificationSetup=EMail notification module setup
NotificationEMailFrom=E-Mail emissor (From) dels correus enviats a través de notificacions
-ListOfAvailableNotifications=Llistat de notificacions disponibles (depèn dels mòduls activats)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
##### Sendings #####
SendingsSetup=Configuració del mòdul Expedicions
SendingsReceiptModel=Model de notes de lliurament
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=La connexió al servidor '%s' sobre la base '%s' per l'usuari '
OSCommerceTestKo1=La connexió al servidor '%s' sobre la base '%s' per l'usuari '%s' no s'ha pogut fer.
OSCommerceTestKo2=La connexió al servidor '%s' per l'usuari '%s' ha fallat.
##### Stock #####
-StockSetup=Configuració del mòdul Stock
-UserWarehouse=Utilitzar els stocks personals d'usuaris
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=Menú eliminat
TreeMenu=Estructura dels menús
@@ -1478,11 +1482,14 @@ ClickToDialDesc=Aquest mòdul permet afegir una icona després del número de te
##### Point Of Sales (CashDesk) #####
CashDesk=TPV
CashDeskSetup=Mòdul de configuració Terminal Punt de Venda
-CashDeskThirdPartyForSell=Tercer genéric a utilitzar per a les vendes
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Compte per defecte a utilitzar per als cobraments en efectiu (caixa)
CashDeskBankAccountForCheque= Compte per defecte a utilitzar per als cobraments amb xecs
CashDeskBankAccountForCB= Compte per defecte a utilitzar per als cobraments amb targeta de crèdit
-CashDeskIdWareHouse=Magatzem a ultilitzar per a les vendes
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Configuració del mòdul Bookmark
BookmarkDesc=Aquest mòdul li permet gestionar els enllaços i accessos directes. També permet afegir qualsevol pàgina de Dolibarr o enllaç web al menú d'accés ràpid de l'esquerra.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Delete fiscal year
ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
Opened=Opened
Closed=Closed
-
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
diff --git a/htdocs/langs/ca_ES/agenda.lang b/htdocs/langs/ca_ES/agenda.lang
index 6a2347b2cf8b94cc384f066026e8b8c5845b2056..c66562e7c11691fd31ac9b06fd69072edc5e22d8 100644
--- a/htdocs/langs/ca_ES/agenda.lang
+++ b/htdocs/langs/ca_ES/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= Inclusió automàtica a l'agenda
AgendaAutoActionDesc= Indiqueu en aquesta pestanya els esdeveniments per els que desitja que Dolibarr creu automàticament una acció a l'agenda. Si no es marca cap cas (per defecte), només les accions manuals s'han d'incloure en l'agenda.
AgendaSetupOtherDesc= Aquesta pàgina permet configurar algunes opcions que permeten exportar una vista de la seva agenda Dolibar a un calendari extern (thunderbird, google calendar, ...)
AgendaExtSitesDesc=Aquesta pàgina permet configurar calendaris externs per a la seva visualització en l'agenda de Dolibarr.
-ActionsEvents= Esdeveniments per a què Dolibarr crei una acció de forma automàtica
-PropalValidatedInDolibarr= Pressupost %s validat
-InvoiceValidatedInDolibarr= Factura %s validada
+ActionsEvents=Esdeveniments per a què Dolibarr crei una acció de forma automàtica
+PropalValidatedInDolibarr=Pressupost %s validat
+InvoiceValidatedInDolibarr=Factura %s validada
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=Factura %s tornada a borrador
InvoiceDeleteDolibarr=Factura %s eliminada
OrderValidatedInDolibarr= Comanda %s validada
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Comanda %s aprovada
OrderRefusedInDolibarr=Order %s refused
OrderBackToDraftInDolibarr=Comanda %s tordada a borrador
OrderCanceledInDolibarr=Commanda %s anul·lada
-InterventionValidatedInDolibarr=Intervenció %s validada
ProposalSentByEMail=Pressupost %s enviat per e-mail
OrderSentByEMail=Comanda de client %s enviada per e-mail
InvoiceSentByEMail=Factura a client %s enviada per e-mail
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=Comanda a proveïdor %s enviada per e-mail
SupplierInvoiceSentByEMail=Factura de proveïdor %s enviada per e-mail
ShippingSentByEMail=Expedició %s enviada per e-mail
ShippingValidated= Shipping %s validated
-InterventionSentByEMail=Intervenció %s enviada per e-mail
-InterventionClassifiedBilled=Intervention %s classified as Billed
NewCompanyToDolibarr= Tercer creat
DateActionPlannedStart= Data d'inici prevista
DateActionPlannedEnd= Data fi prevista
@@ -70,9 +68,9 @@ DateActionStart= Data d'inici
DateActionEnd= Data finalització
AgendaUrlOptions1=Podeu també afegir aquests paràmetres al filtre de sortida:
AgendaUrlOptions2=<b>login=%s</b> per a restringir insercions a accions creades, que afectin o realitzades per l'usuari <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> per a restringir insercions a accciones creades per l'usuari <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
AgendaUrlOptions4=<b>logint=%s</b> per a restringir insercions a accions que afectin a l'usuari <b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> per a restringir insercions a accions realitzades per l'usuari <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
AgendaShowBirthdayEvents=Mostra aniversari dels contactes
AgendaHideBirthdayEvents=Amaga aniversari dels contacte
Busy=Ocupat
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=Url d'accés a l'arxiu. ical
ExtSiteNoLabel=Sense descripció
WorkingTimeRange=Working time range
WorkingDaysRange=Working days range
-AddEvent=Add event
+AddEvent=Create event
MyAvailability=My availability
diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang
index 33a1facd88db2b6687b0d76cd7587452b6b37819..a6103e5a9d14192d12077860d5e9650ad7a1691c 100644
--- a/htdocs/langs/ca_ES/bills.lang
+++ b/htdocs/langs/ca_ES/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Abonament
InvoiceAvoirAsk=Abonament per corregir la factura
InvoiceAvoirDesc=El <b>abonament</ b> és una factura negativa destinada a compensar un import de factura que difereix de l'import realment pagat (per haver pagat de més o per devolució de productes, per exemple).
invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
-invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
ReplaceInvoice=Rectificar la factura %s
ReplacementInvoice=Rectificació factura
ReplacedByInvoice=Rectificada per la factura %s
@@ -87,7 +87,7 @@ ClassifyCanceled=Classificar 'Abandonat'
ClassifyClosed=Classificar 'Tancat'
ClassifyUnBilled=Classify 'Unbilled'
CreateBill=Crear factura
-AddBill=Crear factura o abonament
+AddBill=Create invoice or credit note
AddToDraftInvoices=Afegir a factura esborrany
DeleteBill=Eliminar factura
SearchACustomerInvoice=Cercar una factura a client
@@ -99,7 +99,7 @@ DoPaymentBack=Emetre reembossament
ConvertToReduc=Convertir en reducció futura
EnterPaymentReceivedFromCustomer=Afegir pagament rebut de client
EnterPaymentDueToCustomer=Fer pagament d'abonaments al client
-DisabledBecauseRemainderToPayIsZero=Desactivar ja que la resta a pagar és 0
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
Amount=Import
PriceBase=Preu base
BillStatus=Estat de la factura
@@ -137,8 +137,6 @@ BillFrom=Emissor
BillTo=Enviar a
ActionsOnBill=Eventos sobre la factura
NewBill=Nova factura
-Prélèvements=Domiciliacions
-Prélèvements=Domiciliacions
LastBills=Les %s últimes factures
LastCustomersBills=Les %s últimes factures a clients
LastSuppliersBills=Les %s últimes factures de proveïdors
@@ -156,9 +154,9 @@ ConfirmCancelBill=Esteu segur de voler anul·lar la factura <b>%s</b>?
ConfirmCancelBillQuestion=Per quina raó vol abandonar la factura?
ConfirmClassifyPaidPartially=Esteu segur de voler classificar la factura <b>%s</b> com pagada?
ConfirmClassifyPaidPartiallyQuestion=Aquesta factura no ha estat totalment pagada. Per què vol classificar-la com a pagada?
-ConfirmClassifyPaidPartiallyReasonAvoir=La resta a pagar <b>(%s %s)</b> s'ha regularitzat (ja que article s'ha tornat, oblidat lliurar, descompte no definit ...) mitjançant un abonament
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=La resta a pagar <b>(%s %s)</b> és un descompte acordat després de la facturació. Accepto perdre l'IVA d'aquest descompte
-ConfirmClassifyPaidPartiallyReasonDiscountVat=La resta a pagar <b>(%s %s)</b> és un descompte
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
ConfirmClassifyPaidPartiallyReasonBadCustomer=Client morós
ConfirmClassifyPaidPartiallyReasonProductReturned=Productes retornats en part
ConfirmClassifyPaidPartiallyReasonOther=D'altra raó
@@ -191,9 +189,9 @@ AlreadyPaid=Ja pagat
AlreadyPaidBack=Ja reemborsat
AlreadyPaidNoCreditNotesNoDeposits=Ja pagat (exclosos els abonaments i bestretes)
Abandoned=Abandonada
-RemainderToPay=Queda per pagar
-RemainderToTake=Queda per cobrar
-RemainderToPayBack=Queda per reemborsar
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
Rest=Pendent
AmountExpected=Import reclamat
ExcessReceived=Rebut en excés
@@ -219,19 +217,18 @@ NoInvoice=Cap factura
ClassifyBill=Classificar la factura
SupplierBillsToPay=Factures de proveïdors a pagar
CustomerBillsUnpaid=Factures a clients pendents de cobrament
-DispenseMontantLettres=Les factures redactactades per processos mecànics estan exemptes de l'ordre en lletres
-DispenseMontantLettres=Les factures redactactades per processos mecànics estan exemptes de l'ordre en lletres
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=No percebut recuperable
SetConditions=Definir condicions de pagament
SetMode=Definir mode de pagament
Billed=Facturat
-RepeatableInvoice=Factura recurrent
-RepeatableInvoices=Factures recurrents
-Repeatable=Recurrent
-Repeatables=Recurrents
-ChangeIntoRepeatableInvoice=Convertir en recurrent
-CreateRepeatableInvoice=Crear factura recurrent
-CreateFromRepeatableInvoice=Crear desde factura recurrent
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
CustomersInvoicesAndInvoiceLines=Factures a clients i línies de factures
CustomersInvoicesAndPayments=Factures a clients i pagaments
ExportDataset_invoice_1=Factures a clients i línies de factura
diff --git a/htdocs/langs/ca_ES/categories.lang b/htdocs/langs/ca_ES/categories.lang
index 84f2b0eef27a0690d48c579eeb8acc34362fee71..c6e5221d79e55e32d6fa6f5688b87d2cc5a105a9 100644
--- a/htdocs/langs/ca_ES/categories.lang
+++ b/htdocs/langs/ca_ES/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Proveïdors
CatCusLinks=Clients/Clients potencials
CatProdLinks=Productes
CatMemberLinks=Membres
-CatProdLinks=Productes
-CatCusLinks=Clients/Clients potencials
-CatSupLinks=Proveïdors
DeleteFromCat=Eliminar de la categoria
DeletePicture=Picture delete
ConfirmDeletePicture=Confirm picture deletion?
@@ -112,3 +109,4 @@ CategoriesSetup=Categories setup
CategorieRecursiv=Link with parent category automatically
CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category
diff --git a/htdocs/langs/ca_ES/compta.lang b/htdocs/langs/ca_ES/compta.lang
index 0fd90f71cf46546302437d07ca06a1bdf9a91739..fc6efa906e0ba882f4ae568a18921436a00687b8 100644
--- a/htdocs/langs/ca_ES/compta.lang
+++ b/htdocs/langs/ca_ES/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Codi comptable incorrecte per a %s
SuppliersProductsSellSalesTurnover=Volum de vendes generat per la venda dels productes dels proveïdors
CheckReceipt=Llista de remeses
CheckReceiptShort=Remeses
+LastCheckReceiptShort=Last %s check receipts
NewCheckReceipt=Nova remesa
NewCheckDeposit=Nou ingrés
NewCheckDepositOn=Crear nova remesa al compte: %s
diff --git a/htdocs/langs/ca_ES/contracts.lang b/htdocs/langs/ca_ES/contracts.lang
index 3fb7712ca6b15d03ae63389855cddbb74680aeda..bd31f48ce5db7cddf68d9161db730672db870e0a 100644
--- a/htdocs/langs/ca_ES/contracts.lang
+++ b/htdocs/langs/ca_ES/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Àrea contractes
ListOfContracts=Llistat de contractes
-LastContracts=Els % darrers contractes
+LastModifiedContracts=Last %s modified contracts
AllContracts=Tots els contractes
ContractCard=Fitxa contracte
ContractStatus=Estat del contracte
@@ -27,7 +27,7 @@ MenuRunningServices=Serveis actius
MenuExpiredServices=Serveis expirats
MenuClosedServices=Serveis tancats
NewContract=Nou contracte
-AddContract=Crear contracte
+AddContract=Create contract
SearchAContract=Cercar un contracte
DeleteAContract=Eliminar un contracte
CloseAContract=Tancar un contracte
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Llistat de línies de contractes en servei
ListOfRunningServices=Llistat de serveis actius
NotActivatedServices=Serveis no activats (amb els contractes validats)
BoardNotActivatedServices=Serveis a activar amb els contractes validats
-LastContracts=Els % darrers contractes
+LastContracts=Last % contracts
LastActivatedServices=Els %s darrers serveis activats
LastModifiedServices=Els %s darrers serveis modificats
EditServiceLine=Edició línia del servei
diff --git a/htdocs/langs/ca_ES/cron.lang b/htdocs/langs/ca_ES/cron.lang
index 2e72b0e027e0a17a46e03ac7c5ec16ddb06d148b..c2c93bdb4f9fe22159b2e420ac52d39cd1cd13eb 100644
--- a/htdocs/langs/ca_ES/cron.lang
+++ b/htdocs/langs/ca_ES/cron.lang
@@ -1,10 +1,8 @@
# Dolibarr language file - Source file is en_US - cron
-#
# About page
About = Sobre
CronAbout = Sobre Cron
CronAboutPage = Sobre Cron
-
# Right
Permission23101 = Veure les tasques programades
Permission23102 = Crear/Modificar les tasques programades
@@ -20,9 +18,8 @@ CronExplainHowToRunUnix=En un entorn Unix pot parametritzar crontab per executar
CronExplainHowToRunWin=En un entorn Microsoft (tm) Windows pot utilitzar el planificador de tasques per llançar aquesta comanda cada minut
# Menu
CronJobs=Tasques programades
-CronListActive= Llistat de tasques planificades actives
-CronListInactive= Llistat de tasques planificades inactives
-CronListActive= Llistat de tasques planificades actives
+CronListActive=List of active/scheduled jobs
+CronListInactive=Llistat de tasques planificades inactives
# Page list
CronDateLastRun=Últim llançament
CronLastOutput=Última sortida
diff --git a/htdocs/langs/ca_ES/donations.lang b/htdocs/langs/ca_ES/donations.lang
index acb0fb19fe9a565f25ac283df81533748e2a98c5..66d683b5b629e7f536993fe24b82dac83381f210 100644
--- a/htdocs/langs/ca_ES/donations.lang
+++ b/htdocs/langs/ca_ES/donations.lang
@@ -4,7 +4,7 @@ Donations=Donacións
DonationRef=Ref. donació
Donor=Donant
Donors=Donants
-AddDonation=Afegir donació
+AddDonation=Create a donation
NewDonation=Nova donació
ShowDonation=Mostrar donació
DonationPromise=Promesa de donació
@@ -31,3 +31,8 @@ DonationRecipient=Beneficiari
ThankYou=Moltes gràcies
IConfirmDonationReception=El beneficiari confirma la recepció, com a donació, de la següent quantitat
MinimumAmount=Minimum amount is %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/ca_ES/externalsite.lang b/htdocs/langs/ca_ES/externalsite.lang
index d7c5e94190e15979e232483f26114db29b599c24..7a2345109133b4468db1d38fc3313b1b3d7ee120 100644
--- a/htdocs/langs/ca_ES/externalsite.lang
+++ b/htdocs/langs/ca_ES/externalsite.lang
@@ -2,3 +2,4 @@
ExternalSiteSetup=Configuració de l'enllaç al lloc web extern
ExternalSiteURL=URL del lloc extern
ExternalSiteModuleNotComplete=El mòdul Lloc web extern no ha estat configurat correctament.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/ca_ES/holiday.lang b/htdocs/langs/ca_ES/holiday.lang
index ecb44efd04347c0ba371017ac44c2a79a3a95667..873095619465c1171c425907c21f4e453a3501cc 100644
--- a/htdocs/langs/ca_ES/holiday.lang
+++ b/htdocs/langs/ca_ES/holiday.lang
@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
CantCreateCP=You don't have the right to make leave requests.
InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=Actualitzar
CantUpdate=You cannot update this leave request.
NoDateDebut=Ha d'indicar una data d'inici.
NoDateFin=Ha d'indicar una data de fi.
-ErrorDureeCP=La seva petició de vacances no conté cap dia hàbil.
-TitleValidCP=Validar la petició de vacances
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
ConfirmValidCP=Are you sure you want to approve the leave request?
DateValidCP=Data de validació
TitleToValidCP=Send leave request
ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Rebutjar la petició de vacances
+TitleRefuseCP=Refuse the leave request
ConfirmRefuseCP=Are you sure you want to refuse the leave request?
NoMotifRefuseCP=Ha de seleccionar un motiu per rebutjar aquesta petició.
-TitleCancelCP=Anul·lar la petició de vacances
+TitleCancelCP=Cancel the leave request
ConfirmCancelCP=Are you sure you want to cancel the leave request?
DetailRefusCP=Motiu del rebuig
DateRefusCP=Data del rebuig
@@ -78,7 +77,7 @@ ActionByCP=Realitzat per
UserUpdateCP=Per a l'usuari
PrevSoldeCP=Saldo anterior
NewSoldeCP=Nou saldo
-alreadyCPexist=Ja s'ha efectuat una petició de vacances per a aquest període.
+alreadyCPexist=A leave request has already been done on this period.
UserName=Nom Cognoms
Employee=Empleat
FirstDayOfHoliday=First day of vacation
@@ -88,25 +87,25 @@ ManualUpdate=Actualització manual
HolidaysCancelation=Leave request cancelation
## Configuration du Module ##
-ConfCP=Configuració del mòdul Vacacions
+ConfCP=Configuration of leave request module
DescOptionCP=Descripció de l'opció
ValueOptionCP=Valor
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
ConfirmConfigCP=Validar la configuració
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
UpdateConfCPOK=Actualització efectuada correctament.
ErrorUpdateConfCP=S'ha produït un error durant l'actualització, torne a provar.
-AddCPforUsers=Afegiu els saldos de vacances dels usuaris <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">fent clic aquí</a>.
-DelayForSubmitCP=Antelació mínima per sol·licitar vacances
-AlertapprobatortorDelayCP=Advertir al validador si la petició no correspon a la data límit
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
Module27130Name= Management of leave requests
Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
TitleOptionEventCP=Settings of leave requets for events
ValidEventCP=Validar
UpdateEventCP=Actualitzar els esdeveniments
diff --git a/htdocs/langs/ca_ES/interventions.lang b/htdocs/langs/ca_ES/interventions.lang
index 2e5093731d3e8ed4f404d94fe954eab040b253a1..0bdcd01a5bf29fe62087179f120f46215c7f09e6 100644
--- a/htdocs/langs/ca_ES/interventions.lang
+++ b/htdocs/langs/ca_ES/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Intervenció
Interventions=Intervencions
InterventionCard=Fitxa intervenció
NewIntervention=Nova itervenció
-AddIntervention=Crear intervenció
+AddIntervention=Create intervention
ListOfInterventions=Llista d'intervencions
EditIntervention=Editar
ActionsOnFicheInter=Esdeveniments sobre l'intervenció
@@ -30,6 +30,15 @@ StatusInterInvoiced=Facturado
RelatedInterventions=Intervencions adjuntes
ShowIntervention=Mostrar intervenció
SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Responsable seguiment de la intervenció
TypeContact_fichinter_internal_INTERVENING=Interventor
diff --git a/htdocs/langs/ca_ES/mails.lang b/htdocs/langs/ca_ES/mails.lang
index 04b854775b4a45e4508e078d676a3300e3951fec..5983e04c208291a2d914648cd346e5bca2767be6 100644
--- a/htdocs/langs/ca_ES/mails.lang
+++ b/htdocs/langs/ca_ES/mails.lang
@@ -115,7 +115,7 @@ SentBy=Enviat por
MailingNeedCommand=Per raons de seguretat, l'enviament d'un E-Mailing en massa es pot fer en línia de comandes. Demani al seu administrador que llanci la comanda següent per per enviar la correspondència a tots els destinataris:
MailingNeedCommand2=Podeu enviar en línia afegint el paràmetre MAILING_LIMIT_SENDBYWEB amb un valor nombre que indica el màxim nombre d'e-mails enviats per sessió. Per això aneu a Inici - Configuració - Varis
ConfirmSendingEmailing=Confirma l'enviament de l'e-mailing?
-LimitSendingEmailing=L'enviament d'un e-mailing des de les pantalles està limitat per raons de seguretat i de timeout a <b>%s</b> destinataris per sessió d'enviament.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=Buidar llista
ToClearAllRecipientsClickHere=Per buidar la llista dels destinataris d'aquest E-Mailing, feu clic al botó
ToAddRecipientsChooseHere=Per afegir destinataris, escolliu els que figuren en les llistes a continuació
@@ -133,6 +133,9 @@ Notifications=Notificacions
NoNotificationsWillBeSent=Cap notificació per e-mail està prevista per a aquest esdeveniment i empresa
ANotificationsWillBeSent=1 notificació serà enviada per e-mail
SomeNotificationsWillBeSent=%s notificacions seran enviades per e-mail
-AddNewNotification=Activar una nova sol·licitud de notificació
-ListOfActiveNotifications=Llista de les sol·licituds de notificacions actives
+AddNewNotification=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
ListOfNotificationsDone=Llista de notificacions d'e-mails enviades
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index 4d0d7d3144e0adfa93ba328bcf0b9823df385985..3ca3d451105b960316141377675fce2aa3b92e7f 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Impossible trobar l'usuari <b>%s</b> a la
ErrorNoVATRateDefinedForSellerCountry=Error, cap tipus d'IVA definit per al país '%s'.
ErrorNoSocialContributionForSellerCountry=Error, cap tipus de càrrega social definida per al país '%s'.
ErrorFailedToSaveFile=Error, el registre del fitxer ha fallat.
-ErrorOnlyPngJpgSupported=Error, només estan suportats els formats d'imatge jpg i png.
-ErrorImageFormatNotSupported=El seu PHP no suporta les funcions de conversió d'aquest format d'imatge.
SetDate=Set date
SelectDate=Select a date
SeeAlso=Veure també %s
BackgroundColorByDefault=Color de fons
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
FileWasNotUploaded=Un arxiu ha estat seleccionat per adjuntar, però encara no ha estat pujat. Feu clic a "Adjuntar aquest arxiu" per a això.
NbOfEntries=Nº d'entrades
GoToWikiHelpPage=Consultar l'ajuda (pot requerir accés a Internet)
@@ -266,6 +266,7 @@ Afternoon=Afternoon
Quadri=Trimistre
MonthOfDay=Mes del dia
HourShort=H
+MinuteShort=mn
Rate=Tipus
UseLocalTax=Incloure taxes
Bytes=Bytes
@@ -340,6 +341,7 @@ FullList=Llista completa
Statistics=Estadístiques
OtherStatistics=Altres estadístiques
Status=Estat
+Favorite=Favorite
ShortInfo=Info.
Ref=Ref.
RefSupplier=Ref. proveïdor
@@ -365,6 +367,7 @@ ActionsOnCompany=Esdeveniments respecte aquest tercer
ActionsOnMember=Esdeveniments respecte aquest membre
NActions=%s esdeveniments
NActionsLate=%s en retard
+RequestAlreadyDone=Request already recorded
Filter=Filtre
RemoveFilter=Eliminar filtre
ChartGenerated=Gràfics generats
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Configuració dels atributs opcionals
URLPhoto=Url de la foto/logo
SetLinkToThirdParty=Vincular a un altre tercer
CreateDraft=Crea esborrany
+SetToDraft=Back to draft
ClickToEdit=Clic per a editar
ObjectDeleted=Objecte %s eliminat
ByCountry=Per país
@@ -678,7 +682,7 @@ ViewPrivateNote=View notes
XMoreLines=%s line(s) hidden
PublicUrl=Public URL
AddBox=Add box
-
+SelectElementAndClickRefresh=Select an element and click Refresh
# Week day
Monday=Dilluns
Tuesday=Dimarts
diff --git a/htdocs/langs/ca_ES/margins.lang b/htdocs/langs/ca_ES/margins.lang
index 9d9e17edf8030a07f15e59ec73da89fc4a4b98b8..3f31b5c8dffcbfb4b396d6392c725c59ab83cdf4 100644
--- a/htdocs/langs/ca_ES/margins.lang
+++ b/htdocs/langs/ca_ES/margins.lang
@@ -10,24 +10,18 @@ MarkRate=Marge sobre venda
DisplayMarginRates=Mostrar els marges sobre cost
DisplayMarkRates=Mostrar els marges sobre venda
InputPrice=Introduir un preu
-
margin=Gestió de marges
margesSetup=Configuració de la gestió de marges
-
MarginDetails=Detalls de marges realitzats
-
ProductMargins=Marges per producte
CustomerMargins=Marges per client
SalesRepresentativeMargins=Sales representative margins
-
ProductService=Producte o servei
AllProducts=Tots els productes i serveis
ChooseProduct/Service=Trieu el producte o servei
-
StartDate=Data d'inici
EndDate=Data de fi
Launch=Començar
-
ForceBuyingPriceIfNull=Forçar el preu de compra si no s'ha indicat
ForceBuyingPriceIfNullDetails=Amb "ON", la línia es considera un marge nul (es forçarà el preu de compra amb el preu de venda), amb ("OFF") el marge és igual al preu de venda (preu de compra a 0).
MARGIN_METHODE_FOR_DISCOUNT=Mètode de gestió de descomptes globals
@@ -35,16 +29,16 @@ UseDiscountAsProduct=Com un producte
UseDiscountAsService=Com un servei
UseDiscountOnTotal=Sobre el total
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Indica si un descompte global es pren en compte com un producte, servei o només en el total a l'hora de calcular els marges.
-
MARGIN_TYPE=Tipus de marge gestionat
MargeBrute=Marge brut
MargeNette=Marge net
MARGIN_TYPE_DETAILS=Marge brut: Preu de venda sense IVA - Preu de compra sense IVA <br/> Marge net: Preu de venda sense IVA - Costos
-
CostPrice=Preu de compra
BuyingCost=Costos
UnitCharges=Càrrega unitària
Charges=Càrreges
-
AgentContactType=Tipus de contacte comissionat
-AgentContactTypeDetails=Indica el tipus de contacte enllaçat a les factures que seran associats als agents comercials
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/ca_ES/orders.lang b/htdocs/langs/ca_ES/orders.lang
index 4f0f5757ca66b82d13d0a9a53878837eabd35008..ce45b85671b7bb1ae67b88dbf88194676ca7a3fc 100644
--- a/htdocs/langs/ca_ES/orders.lang
+++ b/htdocs/langs/ca_ES/orders.lang
@@ -53,9 +53,9 @@ ShippingExist=Existeix una expedició
DraftOrWaitingApproved=Esborrany o aprovat encara no controlat
DraftOrWaitingShipped=Esborrany o validada encara no expedida
MenuOrdersToBill=Comandes a facturar
-MenuOrdersToBill2=Comandes facturables
+MenuOrdersToBill2=Billable orders
SearchOrder=Cercar una comanda
-# SearchACustomerOrder=Search a customer order
+SearchACustomerOrder=Search a customer order
ShipProduct=Enviar producte
Discount=Descompte
CreateOrder=Crear comanda
@@ -65,7 +65,7 @@ ValidateOrder=Validar la comanda
UnvalidateOrder=Desvalidar la comanda
DeleteOrder=Eliminar la comanda
CancelOrder=Anul·lar la comanda
-AddOrder=Crear comanda
+AddOrder=Create order
AddToMyOrders=afegir a les meves comandes
AddToOtherOrders=Afegir a altres comandes
AddToDraftOrders=Afegir a comanda esborrany
@@ -101,7 +101,6 @@ RelatedOrders=Comandes adjuntes
OnProcessOrders=Comandes en procés
RefOrder=Ref. comanda
RefCustomerOrder=Ref. comanda client
-CustomerOrder=Comada de client
RefCustomerOrderShort=Ref. com. client
SendOrderByMail=Enviar comanda per e-mail
ActionsOnOrder=Esdeveniments sobre la comanda
@@ -132,8 +131,6 @@ Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON no definida
Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Error en la càrrega de l'arxiu mòdul '%s'
Error_FailedToLoad_COMMANDE_ADDON_File=Error en la càrrega de l'arxiu mòdul '%s'
Error_OrderNotChecked=No s'han seleccionat comandes a facturar
-
-
# Sources
OrderSource0=Pressupost
OrderSource1=Internet
@@ -144,25 +141,22 @@ OrderSource5=Comercial
OrderSource6=Revistes
QtyOrdered=Qt. demanda
AddDeliveryCostLine=Afegir una línia de despeses de ports indicant el pes de la comanda
-
# Documents models
PDFEinsteinDescription=Model de comanda complet (logo...)
PDFEdisonDescription=Model de comanda simple
-# PDFProformaDescription=A complete proforma invoice (logo…)
+PDFProformaDescription=A complete proforma invoice (logo…)
# Orders modes
OrderByMail=Correu
OrderByFax=Fax
OrderByEMail=E-Mail
OrderByWWW=En línia
OrderByPhone=Telèfon
-
CreateInvoiceForThisCustomer=Facturar comandes
NoOrdersToInvoice=Sense comandes facturables
CloseProcessedOrdersAutomatically=Classificar automàticament com "Processades" les comandes seleccionades.
-MenuOrdersToBill2=Comandes facturables
OrderCreation=Creació comanda
Ordered=Comandat
OrderCreated=Les seves comandes han estat creats
OrderFail=S'ha produït un error durant la creació de les seves comandes
CreateOrders=Crear comandes
-# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
diff --git a/htdocs/langs/ca_ES/oscommerce.lang b/htdocs/langs/ca_ES/oscommerce.lang
deleted file mode 100644
index 528d57c53d2cfe77de056bb9fe0e5ca35a9dd5c5..0000000000000000000000000000000000000000
--- a/htdocs/langs/ca_ES/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=Configuració del mòdul OS Commerce
-OSCommerceSetupSaved=Configuració OS Commerce desada
-OSCommerceServer=Nom/IP servidor de la base de dades OS commerce
-OSCommerceDatabaseName=Nom de la base de dades OS Commerce
-OSCommercePrefix=Prefix taules OS Commerce
-OSCommerceUser=Usuari de la base de dades OS Commerce
diff --git a/htdocs/langs/ca_ES/other.lang b/htdocs/langs/ca_ES/other.lang
index 8a44388eb17e76ca472da5b39267319470065412..ae25227403de677a7ea04af2506277211df462c0 100644
--- a/htdocs/langs/ca_ES/other.lang
+++ b/htdocs/langs/ca_ES/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=Codi de seguretat
Calendar=Calendari
-AddTrip=Crear honorari
Tools=Utilitats
ToolsDesc=Aquesta àrea està dedicada al reagrupament de diverses utilitats no disponibles a les altres entrades de menú.<br><br>La llista d'aquestes utilitats és accessible mitjançant el menú del costat.
Birthday=Aniversari
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation
Notify_TASK_CREATE=Task created
Notify_TASK_MODIFY=Task modified
Notify_TASK_DELETE=Task deleted
+SeeModuleSetup=See module setup
NbOfAttachedFiles=Número arxius/documents adjunts
TotalSizeOfAttachedFiles=Mida total dels arxius/documents adjunts
MaxSize=Tamany màxim
@@ -80,6 +80,16 @@ ModifiedBy=Modificat per %s
ValidatedBy=Validat per %s
CanceledBy=Anul·lat per %s
ClosedBy=Tancat per %s
+CreatedById=User id who created
+ModifiedById=User id who made last change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made last change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
FileWasRemoved=L'arxiu %s s'ha eliminat
DirWasRemoved=La carpeta %s s'ha eliminat
FeatureNotYetAvailableShort=Disponible en una propera versió
@@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your
##### Calendar common #####
AddCalendarEntry=Afegir entrada al calendari
-NewCompanyToDolibarr=Empresa %s inserida en Dolibarr
-ContractValidatedInDolibarr=Contracte %s validat en Dolibarr
-ContractCanceledInDolibarr=Contracte %s anul·lat en Dolibarr
-ContractClosedInDolibarr=Contracte %s tancat en Dolibarr
-PropalClosedSignedInDolibarr=Pressupost %s signat en Dolibarr
-PropalClosedRefusedInDolibarr=Pressupost %s signat en Dolibarr
-PropalValidatedInDolibarr=Pressupost %s validat en Dolibarr
-InvoiceValidatedInDolibarr=Factura %s validada en Dolibarr
-InvoicePaidInDolibarr=Factura %s passada a pagada en Dolibarr
-InvoiceCanceledInDolibarr=Factura %s anul·lada en Dolibarr
-PaymentDoneInDolibarr=Pagamat %s realitzat en Dolibarr
-CustomerPaymentDoneInDolibarr=Pagament de client %s en Dolibarr
-SupplierPaymentDoneInDolibarr=Pagament a proveïdor %s en Dolibarr
-MemberValidatedInDolibarr=Membre %s validat en Dolibarr
-MemberResiliatedInDolibarr=Membre %s donat de baixa en Dolibarr
-MemberDeletedInDolibarr=Membre %s eliminat de Dolibarr
-MemberSubscriptionAddedInDolibarr=Subscripció del membre %s afegida a Dolibarr
-ShipmentValidatedInDolibarr=Expedició %s validada en Dolibarr
-ShipmentDeletedInDolibarr=Expedició %s eliminada de Dolibarr
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
##### Export #####
Export=Exportació
ExportsArea=Àrea d'exportacions
diff --git a/htdocs/langs/ca_ES/paybox.lang b/htdocs/langs/ca_ES/paybox.lang
index 5cbfcf6b50653a4f54b36b408d63d5023346abb2..352b631f64689060d67c25f07b1c9e895f5de696 100644
--- a/htdocs/langs/ca_ES/paybox.lang
+++ b/htdocs/langs/ca_ES/paybox.lang
@@ -35,3 +35,6 @@ MessageKO=Missatge a la pàgina de retorn de pagament cancel·lat
NewPayboxPaymentReceived=Nou pagament Paybox rebut
NewPayboxPaymentFailed=Nou intent de pagament Paybox sense èxit
PAYBOX_PAYONLINE_SENDEMAIL=E-Mail a avisar en cas de pagament (amb èxit o no)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/ca_ES/resource.lang b/htdocs/langs/ca_ES/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..d64075dfbf595897a63e3eebf19194d8f71030dd
--- /dev/null
+++ b/htdocs/langs/ca_ES/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
diff --git a/htdocs/langs/ca_ES/sendings.lang b/htdocs/langs/ca_ES/sendings.lang
index ea18a7d79ba71bd3808368fab4a1b7b9ef90313e..1ccb69ba341ed43b5b7bf09ce9226028e8a41b87 100644
--- a/htdocs/langs/ca_ES/sendings.lang
+++ b/htdocs/langs/ca_ES/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=De moment, la creació d'una nova expedició es
RelatedShippings=Expedició(ns) associades
ShipmentLine=Línia d'expedició
CarrierList=Llistat de transportistes
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
# Sending methods
SendingMethodCATCH=Recollit pel client
diff --git a/htdocs/langs/ca_ES/stocks.lang b/htdocs/langs/ca_ES/stocks.lang
index 79c2f835aa8f0103425dbf9f32384465885f3d15..dda287703231fa39881621ca579a622e07b1f9f6 100644
--- a/htdocs/langs/ca_ES/stocks.lang
+++ b/htdocs/langs/ca_ES/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=L'etiqueta del magatzem és obligatòria
CorrectStock=Corregir estoc
ListOfWarehouses=Llistat de magatzems
ListOfStockMovements=Llistat de moviments de estoc
-StocksArea=Àrea estocs
+StocksArea=Warehouses area
Location=Lloc
LocationSummary=Nom curt del lloc
NumberOfDifferentProducts=Number of different products
diff --git a/htdocs/langs/ca_ES/users.lang b/htdocs/langs/ca_ES/users.lang
index e7a8b41db0a54f4c683de7b00173d09b95e7a785..9796f4d1115db6ef4b3d211441d93f251c2764b2 100644
--- a/htdocs/langs/ca_ES/users.lang
+++ b/htdocs/langs/ca_ES/users.lang
@@ -63,7 +63,6 @@ ShowGroup=Veure grup
ShowUser=Veure usuari
NonAffectedUsers=Usuaris no destinats al grup
UserModified=Usuari correctament modificat
-GroupModified=Grup %s modificat
PhotoFile=Arxiu foto
UserWithDolibarrAccess=Usuari amb accés a Dolibarr
ListOfUsersInGroup=Llista d'usuaris d'aquest grup
@@ -103,7 +102,7 @@ UserDisabled=Usuari %s deshabilitat
UserEnabled=Usuari %s activat
UserDeleted=Usuari %s eliminat
NewGroupCreated=Grup %s creat
-GroupModified=Grup %s modificat
+GroupModified=Group %s modified
GroupDeleted=Grup %s eliminat
ConfirmCreateContact=Esteu segur de voler crear un compte Dolibarr per a aquest contacte?
ConfirmCreateLogin=Esteu segur que voleu crear un compte Dolibarr per a aquest membre?
@@ -114,8 +113,10 @@ YourRole=Els seus rols
YourQuotaOfUsersIsReached=Ha arribat a la seva quota d'usuaris actius!
NbOfUsers=Nº d'usuaris
DontDowngradeSuperAdmin=Només un superadmin pot degradar un superadmin
-HierarchicalResponsible=Responsable jeràrquic
+HierarchicalResponsible=Supervisor
HierarchicView=Vista jeràrquica
UseTypeFieldToChange=Modificar el camp Tipus per canviar
OpenIDURL=OpenID URL
LoginUsingOpenID=Use OpenID to login
+WeeklyHours=Weekly hours
+ColorUser=Color of the user
diff --git a/htdocs/langs/ca_ES/withdrawals.lang b/htdocs/langs/ca_ES/withdrawals.lang
index 6ac3e2c738749f0bb803e15211ceb050e3d16079..bf3bbac2ebb674011fa98990247085eeb94e4208 100644
--- a/htdocs/langs/ca_ES/withdrawals.lang
+++ b/htdocs/langs/ca_ES/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=Ordre
LastWithdrawalReceipts=Les %s últimes ordres de domiciliacions
WithdrawedBills=Factures domiciliades
WithdrawalsLines=Línies de domiciliació
-RequestStandingOrderToTreat=Comandes de domiciliacions a tractar
-RequestStandingOrderTreated=Comandes de domiciliacions processats
+RequestStandingOrderToTreat=Request for standing orders to process
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=Domiciliacions de clients
CustomerStandingOrder=Domiciliació client
NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
@@ -40,14 +41,13 @@ TransMetod=Mètode enviament
Send=Enviar
Lines=línies
StandingOrderReject=Emetre una devolució
-InvoiceRefused=Factura tornada
WithdrawalRefused=Devolució de domiciliació
WithdrawalRefusedConfirm=¿Està segur de voler crear una devolució de domiciliació per a l'empresa
RefusedData=Data de devolució
RefusedReason=Motiu de devolució
RefusedInvoicing=Facturació de la devolució
NoInvoiceRefused=No facturar la devolució
-InvoiceRefused=Factura tornada
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=Estat
StatusUnknown=Desconegut
StatusWaiting=En espera
@@ -76,7 +76,7 @@ WithBankUsingRIB=Per als comptes bancaris que utilitzen CCC
WithBankUsingBANBIC=Per als comptes bancaris que utilitzen el codi BAN/BIC/SWIFT
BankToReceiveWithdraw=Compte bancari receptor de les domiciliacions
CreditDate=Abonada el
-WithdrawalFileNotCapable=No es possible generar fitxer bancari de domiciliacio per al seu pais
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
ShowWithdraw=Veure domiciliació
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=No obstant això, si la factura té pendent algun pagament per domiciliació, no serà tancada per a permetre la gestió de la domiciliació.
DoStandingOrdersBeforePayments=Aquesta pestanya us permet realitzar una petició de domiciliació. Un cop, podeu ingressar el pagament a la factura per procedir al seu tancament.
diff --git a/htdocs/langs/cs_CZ/accountancy.lang b/htdocs/langs/cs_CZ/accountancy.lang
index 8cab9d2b651d75b0721d76fda619e2034e4509b4..39c2732ec29852cf93d41614ed1812c2a4c1ce4f 100644
--- a/htdocs/langs/cs_CZ/accountancy.lang
+++ b/htdocs/langs/cs_CZ/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts
Validate=Validate
Addanaccount=Add an accounting account
AccountAccounting=Accounting account
-Ventilation=Ventilation
+Ventilation=Breakdown
ToDispatch=To dispatch
Dispatched=Dispatched
-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
TradeMargin=Trade margin
Reports=Reports
ByCustomerInvoice=By invoices customers
@@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger
Bookkeeping=General ledger
AccountBalanceByMonth=Account balance by month
-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
Line=Line
CAHTF=Total purchase supplier HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice
IntoAccount=In the accounting account
Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
+VentilationAuto=Automatic breakdown
Processing=Processing
EndProcessing=The end of processing
@@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account
ACCOUNTING_SEPARATORCSV=Separator CSV
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
@@ -140,14 +140,14 @@ Active=Statement
NewFiscalYear=New fiscal year
-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
TotalVente=Total turnover HT
TotalMarge=Total sales margin
DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
ChangeAccount=Change the accounting account for lines selected by the account:
Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
@@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically
ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index 74903e0caeb4b39e8fda5e970e61578b125f355f..bcbc227a151ac83a21918d3cdd9f3962555c9d9f 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -437,8 +437,8 @@ Module52Name=Zásoby
Module52Desc=Skladové hospodářství (výrobky)
Module53Name=Služby
Module53Desc=Správa služeb
-Module54Name=Smlouvy
-Module54Desc=Smlouva a řízení služeb
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=Čárové kódy
Module55Desc=Barcode řízení
Module56Name=Telefonie
@@ -475,8 +475,8 @@ Module320Name=RSS Feed
Module320Desc=Přidat RSS kanál uvnitř obrazovek Dolibarr
Module330Name=Záložky
Module330Desc=Správa záložek
-Module400Name=Projekty
-Module400Desc=Projektový management uvnitř jiných modulů
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=WebCalendar
Module410Desc=WebCalendar integrace
Module500Name=Zvláštní náklady (daně, sociální příspěvky a dividendy)
@@ -484,7 +484,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di
Module510Name=Salaries
Module510Desc=Management of employees salaries and payments
Module600Name=Upozornění
-Module600Desc=Zasílat upozornění e-mailem na některých firemních akcí Dolibarr třetích stran kontakty
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Dary
Module700Desc=Darování řízení
Module1200Name=Mantis
@@ -514,16 +514,16 @@ Module5000Name=Multi-společnost
Module5000Desc=Umožňuje spravovat více společností
Module6000Name=Workflow
Module6000Desc=Workflow management
-Module20000Name=Prázdniny
-Module20000Desc=Deklarovat a dodržovat zaměstnanci dovolenou
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
Module39000Name=Product batch
Module39000Desc=Batch number, eat-by and sell-by date management on products
Module50000Name=Paybox
Module50000Desc=Modul nabídnout on-line platby kreditní kartou stránku s Paybox
Module50100Name=Bod prodeje
Module50100Desc=Místě prodeje modulu
-Module50200Name= Paypal
-Module50200Desc= Modul nabídnout on-line platby kreditní kartou stránku s Paypal
+Module50200Name=Paypal
+Module50200Desc=Modul nabídnout on-line platby kreditní kartou stránku s Paypal
Module50400Name=Accounting (advanced)
Module50400Desc=Accounting management (double parties)
Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=Přečtěte si trvalé příkazy
Permission152=Vytvořit / upravit trvalých příkazů žádost
Permission153=Převodovka trvalých příkazů příjmy
Permission154=Kredit / odmítnout trvalých příkazů příjmy
-Permission161=Čtěte smlouvy
-Permission162=Vytvořit / upravit smlouvy
-Permission163=Aktivace služby smlouvy
-Permission164=Zakázat službu smlouvy
-Permission165=Odstranit smlouvy
-Permission171=Přečtěte si výlety
-Permission172=Vytvořit / upravit výlety
-Permission173=Odstranit výlety
-Permission178=Export výlety
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Read trips and expenses (own and his subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
Permission180=Přečtěte si dodavatele
Permission181=Přečtěte si dodavatelských objednávek
Permission182=Vytvořit / upravit dodavatelské objednávky
@@ -671,7 +672,7 @@ Permission300=Přečtěte čárových kódů
Permission301=Vytvořit / upravit čárových kódů
Permission302=Odstranit čárových kódů
Permission311=Přečtěte služby
-Permission312=Přiřadit službu smlouvy
+Permission312=Assign service/subscription to contract
Permission331=Přečtěte si záložky
Permission332=Vytvořit / upravit záložky
Permission333=Odstranění záložky
@@ -701,8 +702,8 @@ Permission701=Přečtěte si dary
Permission702=Vytvořit / upravit dary
Permission703=Odstranit dary
Permission1001=Přečtěte si zásoby
-Permission1002=Vytvořit / upravit zásoby
-Permission1003=Odstranit zásoby
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=Přečtěte skladové pohyby
Permission1005=Vytvořit / upravit skladové pohyby
Permission1101=Přečtěte si dodací
@@ -1038,7 +1039,6 @@ YesInSummer=Ano v létě
OnlyFollowingModulesAreOpenedToExternalUsers=Na vědomí, že pouze následující moduly otevřel externím uživatelům (ať jsou povolení těchto uživatelů):
SuhosinSessionEncrypt=Úložiště relace šifrována Suhosin
ConditionIsCurrently=Podmínkou je v současné době %s
-TestNotPossibleWithCurrentBrowsers=Automatická detekce není možné
YouUseBestDriver=Pomocí ovladače %s, že je nejlepší řidič současné době k dispozici.
YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
NbOfProductIsLowerThanNoPb=Máte jen %s produktů / služeb do databáze. To však není nutné žádné zvláštní optimalizace.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=Vrátit evidence kód postavený podle: <br> %s násle
ModuleCompanyCodePanicum=Zpět prázdný evidence kód.
ModuleCompanyCodeDigitaria=Účetnictví kód závisí na kódu třetích stran. Kód se skládá ze znaku "C" na prvním místě následuje prvních 5 znaků kódu třetích stran.
UseNotifications=Použití oznámení
-NotificationsDesc=E-maily oznámení vám umožňuje odesílat automatické tiše mail, na některé události Dolibarr, třetím stranám (zákazníků nebo dodavatelů), které jsou konfigurovány pro. Volba aktivního oznámení a terče kontaktů se provádí jedna třetina stran v čase.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
ModelModules=Dokumenty šablony
DocumentModelOdt=Generování dokumentů z OpenDocuments šablon (. ODT nebo ODS. Soubory OpenOffice, KOffice, TextEdit, ...)
WatermarkOnDraft=Vodoznak na návrhu dokumentu
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=Přidat dodací lhůta schopnost
UseOptionLineIfNoQuantity=Řada výrobků / služeb s nulové hodnoty je považován za možnost
FreeLegalTextOnProposal=Volný text o obchodních návrhů
WatermarkOnDraftProposal=Vodoznak na předloh návrhů komerčních (none-li prázdný)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=Objednat řízení nastavení
OrdersNumberingModules=Objednávky číslování modelů
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list
ValidOrderAfterPropalClosed=Pro potvrzení objednávky po návrhu užší, umožňuje, aby krok za prozatímní pořadí
FreeLegalTextOnOrders=Volný text o objednávkách
WatermarkOnDraftOrders=Vodoznak na konceptech objednávek (pokud žádný prázdný)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
##### Clicktodial #####
ClickToDialSetup=Klikněte pro Dial Nastavení modulu
ClickToDialUrlDesc=Url volána, když se provádí kliknutím na tel. Piktogram. Do pole URL můžete použít značky <br> <b>__PHONETO__</b> Který bude nahrazen s telefonním číslem osoby volat <br> <b>__PHONEFROM__</b> Který bude nahrazen tel. číslo volajícího (vaše) <br> <b>__LOGIN__</b> Který bude nahrazen s clicktodial přihlášení (definované na kartě uživatele) <br> <b>__PASS__</b> Který bude nahrazen s clicktodial heslo (definované na kartě uživatele).
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=Intervenční číslování modely
TemplatePDFInterventions=Intervenční karet dokumenty modely
WatermarkOnDraftInterventionCards=Vodoznak na dokumentech intervenčních karty (pokud žádný prázdný)
##### Contracts #####
-ContractsSetup=Zakázky modul nastavení
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=Zakázky číslování moduly
TemplatePDFContracts=Contracts documents models
FreeLegalTextOnContracts=Free text on contracts
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Soubory typu %s nekomprimuje serveru HTTP
CacheByServer=Cache serverem
CacheByClient=Cache v prohlížeči
CompressionOfResources=Komprese odpovědí HTTP
-TestNotPossibleWithCurrentBrowsers=Automatická detekce není možné
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=Produkty modul nastavení
ServiceSetup=Služby modul nastavení
@@ -1382,9 +1384,10 @@ MailingSetup=E-mailem Nastavení modulu
MailingEMailFrom=Odesílatele (From) pro emailů zasílaných e-mailem na modul
MailingEMailError=Zpět E-mail (chyby-do) e-maily s chybami
##### Notification #####
-NotificationSetup=Oznámení bu email modul nastavení
+NotificationSetup=EMail notification module setup
NotificationEMailFrom=Odesílatele (From) e-maily zaslané na oznámení
-ListOfAvailableNotifications=Seznam dostupných oznámení (Tento seznam závisí na aktivovaných modulů)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
##### Sendings #####
SendingsSetup=Odeslání Nastavení modulu
SendingsReceiptModel=Odeslání stvrzenky modelu
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=Připojení k serveru "%s" na databázi "%s"
OSCommerceTestKo1=Připojení k "%s" serveru úspěšná, ale databáze "%s" by nebylo možno dosáhnout.
OSCommerceTestKo2=Připojení k serveru "%s" s uživatelem "%s 'se nezdařilo.
##### Stock #####
-StockSetup=Konfigurace modulu sklad
-UserWarehouse=Používejte osobní uživatelské zásoby
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=Menu smazán
TreeMenu=Strom menu
@@ -1478,11 +1482,14 @@ ClickToDialDesc=Tento modul umožňuje přidat ikonu po telefonních čísel. Kl
##### Point Of Sales (CashDesk) #####
CashDesk=Bod prodeje
CashDeskSetup=Místě prodeje modulu nastavení
-CashDeskThirdPartyForSell=Generic třetí stranou použít pro prodává
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Výchozí účet použít pro příjem plateb v hotovosti
CashDeskBankAccountForCheque= Výchozí účet použít pro příjem plateb šekem
CashDeskBankAccountForCB= Výchozí účet použít pro příjem plateb prostřednictvím kreditní karty
-CashDeskIdWareHouse=Sklad použít pro prodává
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Záložka Nastavení modulu
BookmarkDesc=Tento modul umožňuje spravovat záložky. Můžete také přidat zástupce pro všechny Dolibarr stránky nebo externale webových stránek na vašem levém menu.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Delete fiscal year
ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
Opened=Opened
Closed=Closed
-
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
diff --git a/htdocs/langs/cs_CZ/agenda.lang b/htdocs/langs/cs_CZ/agenda.lang
index 7aa4baf3384c747345e3c1ef1bf5cff71ae8c203..08e0a3347268ad8040c80a81db1f9dabf58802c4 100644
--- a/htdocs/langs/cs_CZ/agenda.lang
+++ b/htdocs/langs/cs_CZ/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= Automatické plnění
AgendaAutoActionDesc= Definujte zde události, na které chcete Dolibarr vytvořit automaticky událost v programu. Pokud není zaškrtnutá (ve výchozím nastavení), bude pouze manuální činnosti být zahrnuty do pořadu jednání.
AgendaSetupOtherDesc= Tato stránka poskytuje možnosti, jak dát export vašich akcí Dolibarr do externího kalendáře (thunderbird, Google kalendář, ...)
AgendaExtSitesDesc=Tato stránka umožňuje deklarovat externí zdroje kalendářů vidět své akce do programu Dolibarr.
-ActionsEvents= Události, pro které Dolibarr vytvoří akci v programu automaticky
-PropalValidatedInDolibarr= Návrh %s ověřena
-InvoiceValidatedInDolibarr= Faktura %s ověřena
+ActionsEvents=Události, pro které Dolibarr vytvoří akci v programu automaticky
+PropalValidatedInDolibarr=Návrh %s ověřena
+InvoiceValidatedInDolibarr=Faktura %s ověřena
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=Faktura %s vrátit do stavu návrhu
InvoiceDeleteDolibarr=Faktura %s smazána
OrderValidatedInDolibarr= Objednat %s ověřena
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Objednat %s schválen
OrderRefusedInDolibarr=Order %s refused
OrderBackToDraftInDolibarr=Objednat %s vrátit do stavu návrhu
OrderCanceledInDolibarr=Objednat %s zrušen
-InterventionValidatedInDolibarr=Intervenční %s ověřena
ProposalSentByEMail=Komerční návrh %s zaslána e-mailem
OrderSentByEMail=%s zákazníků objednávka zaslána e-mailem
InvoiceSentByEMail=%s faktuře Zákazníka zaslána e-mailem
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=%s Dodavatel objednávka zaslána e-mailem
SupplierInvoiceSentByEMail=%s dodavatelské faktury zasílané e-mailem
ShippingSentByEMail=Přepravní %s zaslána e-mailem
ShippingValidated= Shipping %s validated
-InterventionSentByEMail=Intervenční %s zaslána e-mailem
-InterventionClassifiedBilled=Intervention %s classified as Billed
NewCompanyToDolibarr= Třetí strana vytvořena
DateActionPlannedStart= Plánované datum zahájení
DateActionPlannedEnd= Plánované datum ukončení
@@ -70,9 +68,9 @@ DateActionStart= Datum zahájení
DateActionEnd= Datum ukončení
AgendaUrlOptions1=Můžete také přidat následující parametry filtrování výstupu:
AgendaUrlOptions2=<b>login = %s</b> omezit výstup na akce vytvořené, přidělených nebo provést uživatele <b>%s.</b>
-AgendaUrlOptions3=<b>Logina = %s</b> omezit výstup na akce vytvořené uživatelem <b>%s.</b>
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
AgendaUrlOptions4=<b>logint = %s</b> omezit výstup na akce přiřazených uživatelských <b>%s.</b>
-AgendaUrlOptions5=<b>logind = %s</b> omezit výstup na akce provedené uživatelem <b>%s.</b>
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
AgendaShowBirthdayEvents=Zobrazit narozeniny kontaktů
AgendaHideBirthdayEvents=Skrýt narozeniny kontaktů
Busy=Zaneprázdněný
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=URL pro přístup. Soubor iCal
ExtSiteNoLabel=Ne Popis
WorkingTimeRange=Working time range
WorkingDaysRange=Working days range
-AddEvent=Add event
+AddEvent=Create event
MyAvailability=My availability
diff --git a/htdocs/langs/cs_CZ/bills.lang b/htdocs/langs/cs_CZ/bills.lang
index 30287679c90e8df099f5fd73ede355ab41bb74ee..69320cd4204cbc507a481a6a9d0a2483de99aba2 100644
--- a/htdocs/langs/cs_CZ/bills.lang
+++ b/htdocs/langs/cs_CZ/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Dobropis
InvoiceAvoirAsk=Dobropis opravit fakturu
InvoiceAvoirDesc=<b>Dobropis</b> je negativní faktura slouží k řešení skutečnost, že faktura je množství, které se liší než částka skutečně vyplacena (protože zákazník zaplatil příliš mnoho omylem, nebo nebude vyplacena úplně, protože on se vrátil některé produkty, například).
invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
-invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
ReplaceInvoice=Vyměňte faktury %s
ReplacementInvoice=Náhradní faktura
ReplacedByInvoice=Nahrazeno faktuře %s
@@ -87,7 +87,7 @@ ClassifyCanceled=Klasifikovat "Opuštěné"
ClassifyClosed=Klasifikaci "uzavřeným"
ClassifyUnBilled=Classify 'Unbilled'
CreateBill=Vytvořit fakturu
-AddBill=Přidat fakturu nebo dobropis
+AddBill=Create invoice or credit note
AddToDraftInvoices=Přidat k návrhu fakturu
DeleteBill=Odstranit fakturu
SearchACustomerInvoice=Hledat zákaznické faktuře
@@ -99,7 +99,7 @@ DoPaymentBack=Do platební záda
ConvertToReduc=Převod do budoucnosti slevou
EnterPaymentReceivedFromCustomer=Zadejte platby, které obdržel od zákazníka
EnterPaymentDueToCustomer=Provést platbu ze strany zákazníka
-DisabledBecauseRemainderToPayIsZero=Zakázáno, protože zbytek zaplatit, je nulová
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
Amount=Množství
PriceBase=Cena základní
BillStatus=Stav faktury
@@ -137,8 +137,6 @@ BillFrom=Z
BillTo=Na
ActionsOnBill=Akce na faktuře
NewBill=Nová faktura
-Prélèvements=Trvalý příkaz
-Prélèvements=Trvalý příkaz
LastBills=Poslední %s faktury
LastCustomersBills=Poslední %s zákazníkům faktury
LastSuppliersBills=Poslední %s dodavatelů faktury
@@ -156,9 +154,9 @@ ConfirmCancelBill=Jste si jisti, že chcete zrušit faktury <b>%s?</b>
ConfirmCancelBillQuestion=Proč chcete klasifikovat faktura "opuštěný"?
ConfirmClassifyPaidPartially=Jste si jisti, že chcete změnit fakturační <b>%s</b> do stavu placené?
ConfirmClassifyPaidPartiallyQuestion=Tato faktura nebyla zaplacena úplně. Jaké jsou důvody pro vás zavřít tuto fakturu?
-ConfirmClassifyPaidPartiallyReasonAvoir=Zbytek platit <b>(%s %s)</b> je sleva poskytnuta, protože platba byla provedena před horizontu. I zjednat DPH s dobropisu.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Zbytek platit <b>(%s %s)</b> je sleva poskytnuta, protože platba byla provedena před horizontu. Souhlasím ztratit DPH u této slevy.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Zbytek platit <b>(%s %s)</b> je sleva poskytnuta, protože platba byla provedena před horizontu. Jsem zpět DPH na této slevě bez dobropisu.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad zákazník
ConfirmClassifyPaidPartiallyReasonProductReturned=Produkty částečně vrátil
ConfirmClassifyPaidPartiallyReasonOther=Částka opuštěná jiného důvodu
@@ -191,9 +189,9 @@ AlreadyPaid=Již zaplacené
AlreadyPaidBack=Již vrátí
AlreadyPaidNoCreditNotesNoDeposits=Již zaplacena (bez dobropisů a vklady)
Abandoned=Opuštěný
-RemainderToPay=Zbytek platit
-RemainderToTake=Zbývající část, který se
-RemainderToPayBack=Zbytek splatit
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
Rest=Až do
AmountExpected=Nárokované částky
ExcessReceived=Nadbytek obdržel
@@ -219,19 +217,18 @@ NoInvoice=No faktura
ClassifyBill=Klasifikovat fakturu
SupplierBillsToPay=Dodavatelé faktury platit
CustomerBillsUnpaid=Nezaplacené faktury zákazníky
-DispenseMontantLettres=Návrhem zákona o mechanografickým jsou osvobozeni od pořadí, v dopisech
-DispenseMontantLettres=Návrhem zákona o mechanografickým jsou osvobozeni od pořadí, v dopisech
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=Nevratná
SetConditions=Nastavit platební podmínky
SetMode=Nastavit platební režim
Billed=Účtováno
-RepeatableInvoice=Přednastavená faktura
-RepeatableInvoices=Předdefinované faktury
-Repeatable=Předem definované
-Repeatables=Předem definované
-ChangeIntoRepeatableInvoice=Převod do předem definované
-CreateRepeatableInvoice=Vytvořte předdefinovanou fakturu
-CreateFromRepeatableInvoice=Vytvořit z předdefinovaných faktuře
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
CustomersInvoicesAndInvoiceLines=Zákazníků faktury a faktura je vedení
CustomersInvoicesAndPayments=Zákazníků faktury a platby
ExportDataset_invoice_1=Zákazník faktury a faktura je seznam linek
diff --git a/htdocs/langs/cs_CZ/categories.lang b/htdocs/langs/cs_CZ/categories.lang
index 4155db3b1be7f68fa000909d9897a093c85817a0..fe5121d4974099ae5a927c0ca5317999ee72dd49 100644
--- a/htdocs/langs/cs_CZ/categories.lang
+++ b/htdocs/langs/cs_CZ/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Vazby mezi dodavateli a kategorií
CatCusLinks=Vazby mezi zákazníky / vyhlídky a kategorií
CatProdLinks=Vazby mezi produktů / služeb a kategorií
CatMemberLinks=Vazby mezi členy a kategorií
-CatProdLinks=Vazby mezi produktů / služeb a kategorií
-CatCusLinks=Vazby mezi zákazníky / vyhlídky a kategorií
-CatSupLinks=Vazby mezi dodavateli a kategorií
DeleteFromCat=Odebrat z kategorie
DeletePicture=Picture delete
ConfirmDeletePicture=Confirm picture deletion?
@@ -112,3 +109,4 @@ CategoriesSetup=Nastavení kategorií
CategorieRecursiv=Link with parent category automatically
CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category
diff --git a/htdocs/langs/cs_CZ/compta.lang b/htdocs/langs/cs_CZ/compta.lang
index f2852d94d5cfd995a4144c84c17b515c1d641217..84074b96401966ad0e23bdd045dd920d735f0b7d 100644
--- a/htdocs/langs/cs_CZ/compta.lang
+++ b/htdocs/langs/cs_CZ/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad zákazník účetní kód pro %s
SuppliersProductsSellSalesTurnover=Celkový obrat z prodeje výrobků dodavatele.
CheckReceipt=Podívejte se vklad
CheckReceiptShort=Podívejte se vklad
+LastCheckReceiptShort=Last %s check receipts
NewCheckReceipt=Nová sleva
NewCheckDeposit=Nová kontrola záloha
NewCheckDepositOn=Vytvořte potvrzení o vkladu na účet: %s
diff --git a/htdocs/langs/cs_CZ/contracts.lang b/htdocs/langs/cs_CZ/contracts.lang
index cacd08de41b82882cde34ef6b17ae700fab40a42..e8a6754c08ebbfa5fb9bb637b222fc6e9bb0f238 100644
--- a/htdocs/langs/cs_CZ/contracts.lang
+++ b/htdocs/langs/cs_CZ/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Zakázky oblast
ListOfContracts=Přehled smluv
-LastContracts=Poslední %s upravené smlouvy
+LastModifiedContracts=Last %s modified contracts
AllContracts=Všechny smlouvy
ContractCard=Smlouva karty
ContractStatus=Stav smlouvy
@@ -27,7 +27,7 @@ MenuRunningServices=Spuštěné služby
MenuExpiredServices=Propadlé služby
MenuClosedServices=Uzavřené služby
NewContract=Nová smlouva
-AddContract=Přidat zakázku
+AddContract=Create contract
SearchAContract=Hledat smlouvu
DeleteAContract=Odstranění smlouvu
CloseAContract=Zavřít smlouvu
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Seznam běžících smluv linek
ListOfRunningServices=Seznam spuštěných služeb
NotActivatedServices=Neaktivní služby (u ověřených smluv)
BoardNotActivatedServices=Služby pro aktivaci u ověřených smluv
-LastContracts=Poslední %s upravené smlouvy
+LastContracts=Last % contracts
LastActivatedServices=Poslední %s aktivaci služby
LastModifiedServices=Poslední %s upravené služby
EditServiceLine=Upravit linka
diff --git a/htdocs/langs/cs_CZ/cron.lang b/htdocs/langs/cs_CZ/cron.lang
index 1d05ba43820bf2e857ae8f993c95bceccb6d9d79..b8b9956668e19b04b35d6d53f06a2757f96b80ff 100644
--- a/htdocs/langs/cs_CZ/cron.lang
+++ b/htdocs/langs/cs_CZ/cron.lang
@@ -1,49 +1,32 @@
# Dolibarr language file - Source file is en_US - cron
-#
# About page
-#
About = O
CronAbout = O Cron
CronAboutPage = Cron o stránce
-
-#
# Right
-#
Permission23101 = Přečtěte si naplánovaná úloha
Permission23102 = Vytvořit / aktualizovat naplánovanou úlohu
Permission23103 = Odstranit naplánovaná úloha
Permission23104 = Provést naplánované úlohy,
-
-#
# Admin
-#
-CronSetup= Naplánované úlohy správy Nastavení
-# URLToLaunchCronJobs=URL to check and launch cron jobs if required
-# OrToLaunchASpecificJob=Or to check and launch a specific job
+CronSetup= Nastavení naplánovaných úloh
+URLToLaunchCronJobs=URL to check and launch cron jobs if required
+OrToLaunchASpecificJob=Or to check and launch a specific job
KeyForCronAccess=Bezpečnostní klíč pro URL spustit cron
FileToLaunchCronJobs=Příkazový řádek spustit cron
CronExplainHowToRunUnix=V oblasti životního prostředí Unix, měli byste použít crontab spustit příkazový řádek pokaždé, minut
CronExplainHowToRunWin=Na Microsoft (tm) Windows environement můžete použít naplánovaná úloha nástroje spustit příkazový řádek pokaždé, minut
-
-
-#
# Menu
-#
CronJobs=Naplánované úlohy
-CronListActive= Seznam aktivních úloh
-CronListInactive= Seznam postižených míst
-CronListActive= Seznam aktivních úloh
-
-
-#
+CronListActive=List of active/scheduled jobs
+CronListInactive=Seznam postižených míst
# Page list
-#
CronDateLastRun=Poslední běh
CronLastOutput=Poslední běh výstup
CronLastResult=Poslední kód výsledku
CronListOfCronJobs=Seznam naplánovaných úloh
CronCommand=Příkaz
-# CronList=Jobs list
+CronList=Jobs list
CronDelete= Odstranit cron
CronConfirmDelete= Jste si jisti, že chcete smazat tento cron?
CronExecute=Zahájení práce
@@ -70,10 +53,7 @@ CronLabel=Popis
CronNbRun=Nb. zahájit
CronEach=Každý
JobFinished=Práce zahájena a dokončena
-
-#
#Page card
-#
CronAdd= Přidat pracovních míst
CronHourStart= Začněte hodinu a datum úkolu
CronEvery= A úkol provést každý
@@ -95,20 +75,12 @@ CronObjectHelp=Název objektu načíst. <BR> Např načíst metody objektu výro
CronMethodHelp=Objekt způsob startu. <BR> Např načíst metody objektu výrobku Dolibarr / htdocs / produktu / třída / product.class.php, hodnota metody je <i>fecth</i>
CronArgsHelp=Metoda argumenty. <BR> Např načíst metody objektu výrobku Dolibarr / htdocs / produktu / třída / product.class.php, může být hodnota paramters být <i>0, ProductRef</i>
CronCommandHelp=Systém příkazového řádku spustit.
-
-#
# Info
-#
CronInfoPage=Informace
-
-
-#
# Common
-#
CronType=Typ úlohy
CronType_method=Volání metody třídy Dolibarr
CronType_command=Shell příkaz
CronMenu=Cron
CronCannotLoadClass=Nelze načíst třídu nebo objekt %s %s
-
UseMenuModuleToolsToAddCronJobs=Jděte do menu "Home - Moduly nářadí - Seznam úloh" vidět a upravovat naplánované úlohy.
diff --git a/htdocs/langs/cs_CZ/donations.lang b/htdocs/langs/cs_CZ/donations.lang
index 98d0c964310db6dfdb62fb7b94c79bebbfc36cdd..ac953ea44870fc66ecec5b04fbb7e206cdb9160d 100644
--- a/htdocs/langs/cs_CZ/donations.lang
+++ b/htdocs/langs/cs_CZ/donations.lang
@@ -4,7 +4,7 @@ Donations=Dary
DonationRef=Darování čj.
Donor=Dárce
Donors=Dárci
-AddDonation=Přidat dar
+AddDonation=Create a donation
NewDonation=Nový dárcovství
ShowDonation=Zobrazit dar
DonationPromise=Dárkové slib
@@ -31,3 +31,8 @@ DonationRecipient=Darování příjemce
ThankYou=Děkuji
IConfirmDonationReception=Příjemce deklarovat příjem, jako dar, následující částky
MinimumAmount=Minimum amount is %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/cs_CZ/externalsite.lang b/htdocs/langs/cs_CZ/externalsite.lang
index aec6e3b448347465579410b0ccd2cec9adb49964..8bb9c5644a29dc20a016bcebf6cae6282d6b2a9a 100644
--- a/htdocs/langs/cs_CZ/externalsite.lang
+++ b/htdocs/langs/cs_CZ/externalsite.lang
@@ -2,3 +2,4 @@
ExternalSiteSetup=Nastavení odkaz na externí webové stránky
ExternalSiteURL=Externí URL stránek
ExternalSiteModuleNotComplete=Modul ExternalSite nebyl správně nakonfigurován.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/cs_CZ/holiday.lang b/htdocs/langs/cs_CZ/holiday.lang
index 7653b95e0449826b9e326e44d5ddf07743661d90..0c62056dd33e8bbef2c6376b54014666d2c12505 100644
--- a/htdocs/langs/cs_CZ/holiday.lang
+++ b/htdocs/langs/cs_CZ/holiday.lang
@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
CantCreateCP=You don't have the right to make leave requests.
InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=Aktualizovat
CantUpdate=You cannot update this leave request.
NoDateDebut=Musíte vybrat počáteční datum.
NoDateFin=Musíte vybrat datum ukončení.
-ErrorDureeCP=Vaše žádost o dovolenou neobsahuje pracovní den.
-TitleValidCP=Žádost odsouhlasí dovolenou
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
ConfirmValidCP=Are you sure you want to approve the leave request?
DateValidCP=Datum schválení
TitleToValidCP=Send leave request
ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Žádost odmítnout dovolenou
+TitleRefuseCP=Refuse the leave request
ConfirmRefuseCP=Are you sure you want to refuse the leave request?
NoMotifRefuseCP=Musíte si vybrat důvod pro odmítnutí žádosti.
-TitleCancelCP=Zrušit požadavek dovolenou
+TitleCancelCP=Cancel the leave request
ConfirmCancelCP=Are you sure you want to cancel the leave request?
DetailRefusCP=Důvod odmítnutí
DateRefusCP=Datum odmítnutí
@@ -78,7 +77,7 @@ ActionByCP=Účinkují
UserUpdateCP=Pro uživatele
PrevSoldeCP=Předchozí Balance
NewSoldeCP=New Balance
-alreadyCPexist=Žádost o dovolenou již bylo provedeno na toto období.
+alreadyCPexist=A leave request has already been done on this period.
UserName=Název
Employee=Zaměstnanec
FirstDayOfHoliday=First day of vacation
@@ -88,25 +87,25 @@ ManualUpdate=Ruční aktualizace
HolidaysCancelation=Leave request cancelation
## Configuration du Module ##
-ConfCP=Konfigurace modulu dovolenou
+ConfCP=Configuration of leave request module
DescOptionCP=Popis možnosti
ValueOptionCP=Hodnota
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
ConfirmConfigCP=Ověření konfigurace
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
UpdateConfCPOK=Aktualizováno úspěšně.
ErrorUpdateConfCP=Došlo k chybě při aktualizaci, zkuste to prosím znovu.
-AddCPforUsers=Prosím, přidejte rovnováhu prázdnin uživatelům <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">kliknutím zde</a> .
-DelayForSubmitCP=Uzávěrka žádat o dovolenou
-AlertapprobatortorDelayCP=Zabraňte approbator pokud svátek žádost neodpovídá lhůtu
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
Module27130Name= Management of leave requests
Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
TitleOptionEventCP=Settings of leave requets for events
ValidEventCP=Potvrdit
UpdateEventCP=Aktualizace akce
diff --git a/htdocs/langs/cs_CZ/interventions.lang b/htdocs/langs/cs_CZ/interventions.lang
index 46be1b4828310b48d6debba9f30b3d3060e65ddc..0e824e8fcef34c6292cc292298d6a4bedb5fab51 100644
--- a/htdocs/langs/cs_CZ/interventions.lang
+++ b/htdocs/langs/cs_CZ/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Intervence
Interventions=Intervence
InterventionCard=Intervence karty
NewIntervention=Nový zásah
-AddIntervention=Přidat zásah
+AddIntervention=Create intervention
ListOfInterventions=Seznam zásahů
EditIntervention=Upravit zásah
ActionsOnFicheInter=Akce zaměřené na intervenci
@@ -30,6 +30,15 @@ StatusInterInvoiced=Účtováno
RelatedInterventions=Související zákroky
ShowIntervention=Zobrazit zásah
SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Zástupce následující-up zásah
TypeContact_fichinter_internal_INTERVENING=Zásah
diff --git a/htdocs/langs/cs_CZ/mails.lang b/htdocs/langs/cs_CZ/mails.lang
index 3926e41a3ab493aa8894dac091744e8402a4d308..443430caaeaf88b81918955ee76956c6004742e6 100644
--- a/htdocs/langs/cs_CZ/mails.lang
+++ b/htdocs/langs/cs_CZ/mails.lang
@@ -115,7 +115,7 @@ SentBy=Odesílatel:
MailingNeedCommand=Z bezpečnostních důvodů, odesílání e-mailem, je lepší, když provádí z příkazového řádku. Máte-li jeden, požádejte správce serveru spustit následující příkaz pro odeslání e-mailem všem příjemcům:
MailingNeedCommand2=Však můžete zaslat on-line přidáním parametru MAILING_LIMIT_SENDBYWEB s hodnotou max počet e-mailů, které chcete poslat zasedání. K tomu, přejděte na doma - Nastavení - Ostatní.
ConfirmSendingEmailing=Pokud nemůžete nebo raději posílat je s www prohlížeče, prosím, potvrzujete, že jste jisti, že chcete poslat e-mailem teď z vašeho prohlížeče?
-LimitSendingEmailing=Poznámka: Na řádek odeslání emailings jsou omezeny na bezpečnost a časový limit důvody k <b>%s</b> příjemce zasláním relace.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=Vymazat seznam
ToClearAllRecipientsClickHere=Klikněte zde pro vymazání seznamu příjemců tohoto rozesílání
ToAddRecipientsChooseHere=Přidejte příjemce výběrem ze seznamu
@@ -133,6 +133,9 @@ Notifications=Upozornění
NoNotificationsWillBeSent=Žádné oznámení e-mailem jsou plánovány pro tuto událost a společnost
ANotificationsWillBeSent=1 bude zaslán e-mailem
SomeNotificationsWillBeSent=%s oznámení bude zasláno e-mailem
-AddNewNotification=Aktivace nové e-mailové oznámení žádosti
-ListOfActiveNotifications=Vypsat všechny aktivní požadavky oznamování e-mailů
+AddNewNotification=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
ListOfNotificationsDone=Vypsat všechny e-maily odesílané oznámení
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang
index d990ea1a8da216ae785186648711d053d35f819e..02a8a1c3fe98100af6d9414896f9dff5aa52b94c 100644
--- a/htdocs/langs/cs_CZ/main.lang
+++ b/htdocs/langs/cs_CZ/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Nepodařilo se najít uživatele <b>%s</b>
ErrorNoVATRateDefinedForSellerCountry=Chyba, pro zemi '%s' nejsou definovány žádné sazby DPH.
ErrorNoSocialContributionForSellerCountry=Chyba, žádný typ sociálních příspěvků není definován pro zemi '%s'.
ErrorFailedToSaveFile=Chyba, nepodařilo se uložit soubor.
-ErrorOnlyPngJpgSupported=Chyba, jsou podporovány pouze obrázkové formáty PNG a JPG.
-ErrorImageFormatNotSupported=Vaše PHP nepodporuje funkce pro převod obrázků tohoto formátu.
SetDate=Set date
SelectDate=Select a date
SeeAlso=Viz také %s
BackgroundColorByDefault=Výchozí barva pozadí
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
FileWasNotUploaded=Soubor vybrán pro připojení, ale ještě nebyl nahrán. Klikněte na "Přiložit soubor".
NbOfEntries=Počet záznamů
GoToWikiHelpPage=Online nápověda (vyžadován přístup k Internetu)
@@ -266,6 +266,7 @@ Afternoon=Afternoon
Quadri=Quadri
MonthOfDay=Měsíce ode dne
HourShort=H
+MinuteShort=mn
Rate=Sazba
UseLocalTax=Včetně DPH
Bytes=Bytů
@@ -340,6 +341,7 @@ FullList=Plný seznam
Statistics=Statistika
OtherStatistics=Další statistiky
Status=Postavení
+Favorite=Favorite
ShortInfo=Info.
Ref=Ref.
RefSupplier=Ref. dodavatel
@@ -365,6 +367,7 @@ ActionsOnCompany=Akce o této třetí osobě
ActionsOnMember=Akce o tomto členu
NActions=%s události
NActionsLate=%s pozdě
+RequestAlreadyDone=Request already recorded
Filter=Filtr
RemoveFilter=Vyjměte filtr
ChartGenerated=Graf generovaný
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Extra nastavení atributů
URLPhoto=URL of photo/logo
SetLinkToThirdParty=Odkaz na jiné třetí osobě
CreateDraft=Vytvořte návrh
+SetToDraft=Back to draft
ClickToEdit=Klepnutím lze upravit
ObjectDeleted=Objekt %s smazán
ByCountry=Podle země
@@ -678,7 +682,7 @@ ViewPrivateNote=View notes
XMoreLines=%s line(s) hidden
PublicUrl=Public URL
AddBox=Add box
-
+SelectElementAndClickRefresh=Select an element and click Refresh
# Week day
Monday=Pondělí
Tuesday=Úterý
diff --git a/htdocs/langs/cs_CZ/margins.lang b/htdocs/langs/cs_CZ/margins.lang
index 04ef754ab003bd1f174366ddc812858b5af7d526..32b8dc8144e8f23dba0690d3843e95bffc421358 100644
--- a/htdocs/langs/cs_CZ/margins.lang
+++ b/htdocs/langs/cs_CZ/margins.lang
@@ -10,24 +10,18 @@ MarkRate=Mark rychlost
DisplayMarginRates=Zobrazení okrajů ceny
DisplayMarkRates=Zobrazit ceny značek
InputPrice=Vstupní cena
-
margin=Ziskové marže řízení
margesSetup=Ziskové marže Nastavení řízení
-
MarginDetails=Margin detaily
-
ProductMargins=Produktové marže
CustomerMargins=Zákazníků marže
SalesRepresentativeMargins=Sales representative margins
-
ProductService=Produkt nebo služba
AllProducts=Všechny produkty a služby
ChooseProduct/Service=Zvolte produkt nebo službu
-
StartDate=Datum zahájení
EndDate=Datum ukončení
Launch=Začátek
-
ForceBuyingPriceIfNull=Force nákupu cena, pokud null
ForceBuyingPriceIfNullDetails=pokud je "ON", bude marže rovnat nule na lince (nákupní cena = prodejní cena), v opačném případě ("OFF"), bude Marge se rovná prodejní ceně (nákupní cena = 0)
MARGIN_METHODE_FOR_DISCOUNT=Marže metoda pro globální slevy
@@ -35,16 +29,16 @@ UseDiscountAsProduct=Jako produkt
UseDiscountAsService=Jako služba
UseDiscountOnTotal=Na mezisoučet
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Definuje, zda globální sleva je považován za výrobek, služba, nebo pouze na mezisoučet pro výpočet marže.
-
MARGIN_TYPE=Marže typ
MargeBrute=Raw marže
MargeNette=Čistá marže
MARGIN_TYPE_DETAILS=Raw margin: Konečná cena - nákupní cenou <br/> Čistá marže: Prodejní cena - pořizovací ceny,
-
CostPrice=Velkoobchodní cena
BuyingCost=Velkoobchodní cena
UnitCharges=Jednotkové náklady
Charges=Poplatky
-
AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/cs_CZ/orders.lang b/htdocs/langs/cs_CZ/orders.lang
index 2f5a268c70d5550792107487ed633062a836277b..308cfa75c8b41c9e2e5157a2c35bcd4eb3bf15e0 100644
--- a/htdocs/langs/cs_CZ/orders.lang
+++ b/htdocs/langs/cs_CZ/orders.lang
@@ -53,9 +53,9 @@ ShippingExist=Zásilka existuje
DraftOrWaitingApproved=Návrh nebo schválena ještě objednat
DraftOrWaitingShipped=Návrh nebo ověřeno dosud odesláno
MenuOrdersToBill=Objednávky dodáno
-MenuOrdersToBill2=Objednávky do účtu
+MenuOrdersToBill2=Billable orders
SearchOrder=Hledat účelem
-# SearchACustomerOrder=Search a customer order
+SearchACustomerOrder=Search a customer order
ShipProduct=Loď produkt
Discount=Sleva
CreateOrder=Vytvořit objednávku
@@ -65,7 +65,7 @@ ValidateOrder=Potvrzení objednávky
UnvalidateOrder=Unvalidate objednávku
DeleteOrder=Smazat objednávku
CancelOrder=Zrušení objednávky
-AddOrder=Objednané
+AddOrder=Create order
AddToMyOrders=Přidat do mých objednávek
AddToOtherOrders=Přidat do jiných objednávek
AddToDraftOrders=Přidat k předloze
@@ -101,7 +101,6 @@ RelatedOrders=Související objednávky
OnProcessOrders=V procesu objednávky
RefOrder=Ref. objednávka
RefCustomerOrder=Ref. objednávka zákazníka
-CustomerOrder=Zákazníka
RefCustomerOrderShort=Ref. zák. objednávka
SendOrderByMail=Objednávku zašlete poštou
ActionsOnOrder=Akce na objednávku
@@ -132,8 +131,6 @@ Error_COMMANDE_ADDON_NotDefined=Konstantní COMMANDE_ADDON není definováno
Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Nepodařilo se načíst soubor modulu "%s"
Error_FailedToLoad_COMMANDE_ADDON_File=Nepodařilo se načíst soubor modulu "%s"
Error_OrderNotChecked=Žádné objednávky do faktury vybrané
-
-
# Sources
OrderSource0=Komerční návrh
OrderSource1=Internet
@@ -144,7 +141,6 @@ OrderSource5=Obchodní
OrderSource6=Skladujte
QtyOrdered=Množství objednat
AddDeliveryCostLine=Přidat přepravné čáru označující hmotnost objednávky
-
# Documents models
PDFEinsteinDescription=Kompletní objednávka modelu (logo. ..)
PDFEdisonDescription=Jednoduchý model, aby
@@ -155,14 +151,12 @@ OrderByFax=Fax
OrderByEMail=EMail
OrderByWWW=Online
OrderByPhone=Telefon
-
CreateInvoiceForThisCustomer=Bill objednávky
NoOrdersToInvoice=Žádné objednávky zúčtovatelné
CloseProcessedOrdersAutomatically=Klasifikovat "zpracování" všechny vybrané příkazy.
-MenuOrdersToBill2=Objednávky do účtu
OrderCreation=Objednat tvorba
Ordered=Objednal
OrderCreated=Vaše objednávky byly vytvořeny
OrderFail=Došlo k chybě během vytváření objednávky
CreateOrders=Vytvoření objednávky
-# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
diff --git a/htdocs/langs/cs_CZ/oscommerce.lang b/htdocs/langs/cs_CZ/oscommerce.lang
deleted file mode 100644
index 76db4065e75190c65821e5f2fdbea0853df1a1ca..0000000000000000000000000000000000000000
--- a/htdocs/langs/cs_CZ/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=OS Commerce modul nastavení
-OSCommerceSetupSaved=OS Commerce nastavení uloží
-OSCommerceServer=OS Commerce Server host / ip
-OSCommerceDatabaseName=OS Commerce název databáze
-OSCommercePrefix=OS Commerce tabulky prefix
-OSCommerceUser=OS Commerce databáze login
diff --git a/htdocs/langs/cs_CZ/other.lang b/htdocs/langs/cs_CZ/other.lang
index 6fe68c3ec59581d69d2d96c556b0d3a0711a9837..d2b3363bde14e295d33ab89c762c5d94eaa8f3bd 100644
--- a/htdocs/langs/cs_CZ/other.lang
+++ b/htdocs/langs/cs_CZ/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=Bezpečnostní kód
Calendar=Kalendář
-AddTrip=Přidat výlet
Tools=Nástroje
ToolsDesc=Tato oblast je určena pro skupiny různých strojů, které nejsou k dispozici na jiné položky menu. <br><br> Tyto nástroje se dostanete z menu na boku.
Birthday=Narozeniny
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation
Notify_TASK_CREATE=Task created
Notify_TASK_MODIFY=Task modified
Notify_TASK_DELETE=Task deleted
+SeeModuleSetup=See module setup
NbOfAttachedFiles=Počet připojených souborů / dokumentů
TotalSizeOfAttachedFiles=Celková velikost připojených souborů / dokumentů
MaxSize=Maximální rozměr
@@ -80,6 +80,16 @@ ModifiedBy=Změnil %s
ValidatedBy=Ověřena %s
CanceledBy=Zrušena %s
ClosedBy=Uzavřel %s
+CreatedById=User id who created
+ModifiedById=User id who made last change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made last change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
FileWasRemoved=Soubor %s byl odstraněn
DirWasRemoved=Adresář %s byl odstraněn
FeatureNotYetAvailableShort=K dispozici v příští verzi
@@ -193,25 +203,26 @@ ForgetIfNothing=Pokud jste o tuto změnu, stačí zapomenout na tento e-mail. Va
##### Calendar common #####
AddCalendarEntry=Přidat záznam do kalendáře %s
-NewCompanyToDolibarr=Společnost %s přidány do Dolibarr
-ContractValidatedInDolibarr=Smlouva %s potvrzené v Dolibarr
-ContractCanceledInDolibarr=Smlouva %s zrušených v Dolibarr
-ContractClosedInDolibarr=Smlouva %s uzavřena v Dolibarr
-PropalClosedSignedInDolibarr=Návrh %s podepsána v Dolibarr
-PropalClosedRefusedInDolibarr=Návrh %s odmítl v Dolibarr
-PropalValidatedInDolibarr=Návrh %s potvrzené v Dolibarr
-InvoiceValidatedInDolibarr=Faktura %s potvrzené v Dolibarr
-InvoicePaidInDolibarr=Faktura změněné %s na placenou v Dolibarr
-InvoiceCanceledInDolibarr=Faktura %s zrušených v Dolibarr
-PaymentDoneInDolibarr=Platební %s provádí v Dolibarr
-CustomerPaymentDoneInDolibarr=%s o platební morálce zákazníků provádí v Dolibarr
-SupplierPaymentDoneInDolibarr=%s Dodavatel platba provedena v Dolibarr
-MemberValidatedInDolibarr=Členské %s potvrzené v Dolibarr
-MemberResiliatedInDolibarr=Členské %s resiliated v Dolibarr
-MemberDeletedInDolibarr=Členské %s odstraněn z Dolibarr
-MemberSubscriptionAddedInDolibarr=Zasílání novinek pro členské %s přidán Dolibarr
-ShipmentValidatedInDolibarr=Zásilky %s validované Dolibarr
-ShipmentDeletedInDolibarr=Zásilky %s odstraněn z Dolibarr
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
##### Export #####
Export=Export
ExportsArea=Vývoz plocha
diff --git a/htdocs/langs/cs_CZ/paybox.lang b/htdocs/langs/cs_CZ/paybox.lang
index 97e0a85221357c99aae15dddf2600032a2b51e83..629bf09cbefc328104f24707280102a5fecbb246 100644
--- a/htdocs/langs/cs_CZ/paybox.lang
+++ b/htdocs/langs/cs_CZ/paybox.lang
@@ -35,3 +35,6 @@ MessageKO=Zpráva o zrušení straně platební návratu
NewPayboxPaymentReceived=Nový Paybox přijaté platby
NewPayboxPaymentFailed=Nový Paybox platba snažil se ale propadal
PAYBOX_PAYONLINE_SENDEMAIL=E-mail upozornit po platbě (úspěch nebo selhání)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/cs_CZ/resource.lang b/htdocs/langs/cs_CZ/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..d64075dfbf595897a63e3eebf19194d8f71030dd
--- /dev/null
+++ b/htdocs/langs/cs_CZ/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
diff --git a/htdocs/langs/cs_CZ/sendings.lang b/htdocs/langs/cs_CZ/sendings.lang
index b6ce531c846532474b30d1f8d96378c82f2d01c5..986d8018caf5f17b6f4e188a1c45f4994516c349 100644
--- a/htdocs/langs/cs_CZ/sendings.lang
+++ b/htdocs/langs/cs_CZ/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=Pro tuto chvíli, je vytvoření nové zásilky
RelatedShippings=Související shippings
ShipmentLine=Zásilka linka
CarrierList=Seznam dopravců
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
# Sending methods
SendingMethodCATCH=Chytit zákazníka
diff --git a/htdocs/langs/cs_CZ/stocks.lang b/htdocs/langs/cs_CZ/stocks.lang
index 6d9a098f4add01af978874cd4ae68929c326735c..33382804d833b17a2fdb8c92b4f8cc01a4750ad9 100644
--- a/htdocs/langs/cs_CZ/stocks.lang
+++ b/htdocs/langs/cs_CZ/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Sklad štítek je nutné
CorrectStock=Upravit skladové zásoby
ListOfWarehouses=Seznam skladů
ListOfStockMovements=Seznam skladových pohybů
-StocksArea=Zásoby oblast
+StocksArea=Warehouses area
Location=Umístění
LocationSummary=Krátký název umístění
NumberOfDifferentProducts=Počet různých výrobků
diff --git a/htdocs/langs/cs_CZ/users.lang b/htdocs/langs/cs_CZ/users.lang
index abbe0e69a75f88de2eb36da3a21431a1738fb621..2083fc76f2fdbce371b66697586b658269bf0cfa 100644
--- a/htdocs/langs/cs_CZ/users.lang
+++ b/htdocs/langs/cs_CZ/users.lang
@@ -63,7 +63,6 @@ ShowGroup=Zobrazit skupinu
ShowUser=Zobrazit uživatele
NonAffectedUsers=Nepřiřazení uživatelé
UserModified=Uživatel úspěšně změněn
-GroupModified=Skupina úspěšně změněna
PhotoFile=Soubor s fotografií
UserWithDolibarrAccess=Uživatel s přístupem Dolibarr
ListOfUsersInGroup=Seznam uživatelů této skupiny
@@ -103,7 +102,7 @@ UserDisabled=Uživatel %s zakázán
UserEnabled=Uživatel %s aktivován
UserDeleted=Uživatel %s odstraněn
NewGroupCreated=Skupina %s vytvořena
-GroupModified=Skupina úspěšně změněna
+GroupModified=Group %s modified
GroupDeleted=Skupina %s odstraněna
ConfirmCreateContact=Jste si jisti, že chcete vytvořit účet Dolibarr k tomuto kontaktu?
ConfirmCreateLogin=Jste si jisti, že chcete vytvořit účet Dolibarr pro tohoto člena?
@@ -114,8 +113,10 @@ YourRole=Vaše role
YourQuotaOfUsersIsReached=Vaše kvóta aktivních uživatelů je dosažena!
NbOfUsers=Počet uživatelů
DontDowngradeSuperAdmin=Pouze superadmin může ponížit superadmina
-HierarchicalResponsible=Hierarchická odpovědnost
+HierarchicalResponsible=Supervisor
HierarchicView=Hierarchické zobrazení
UseTypeFieldToChange=Použijte pole Typ pro změnu
OpenIDURL=OpenID URL
LoginUsingOpenID=Použijte OpenID pro přihlášení
+WeeklyHours=Weekly hours
+ColorUser=Color of the user
diff --git a/htdocs/langs/cs_CZ/withdrawals.lang b/htdocs/langs/cs_CZ/withdrawals.lang
index 9c89856e0e9e44c50f1cb3c9aed4653943a974fd..086bf5db2b51473263c8dac5f3d88fd5e2dbd6f7 100644
--- a/htdocs/langs/cs_CZ/withdrawals.lang
+++ b/htdocs/langs/cs_CZ/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=Příjem
LastWithdrawalReceipts=Poslední příjmy %s stažení
WithdrawedBills=Stažené z faktury
WithdrawalsLines=Abstinenční linky
-RequestStandingOrderToTreat=Žádost o trvalých příkazů k léčbě
-RequestStandingOrderTreated=Žádost o trvalých příkazů léčit
+RequestStandingOrderToTreat=Request for standing orders to process
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=Objednávky zákazníků stojící
CustomerStandingOrder=Zákazník trvalý příkaz
NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
@@ -40,14 +41,13 @@ TransMetod=Transmission method
Send=Odeslat
Lines=Řádky
StandingOrderReject=Issue a rejection
-InvoiceRefused=Faktura odmítl
WithdrawalRefused=Withdrawal refused
WithdrawalRefusedConfirm=Jste si jisti, že chcete zadat stažení odmítnutí pro společnost
RefusedData=Datum odmítnutí
RefusedReason=Důvod odmítnutí
RefusedInvoicing=Fakturace odmítnutí
NoInvoiceRefused=Nenabíjejte odmítnutí
-InvoiceRefused=Faktura odmítl
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=Postavení
StatusUnknown=Neznámý
StatusWaiting=Čekání
@@ -76,7 +76,7 @@ WithBankUsingRIB=U bankovních účtů pomocí RIB
WithBankUsingBANBIC=U bankovních účtů pomocí IBAN / BIC / SWIFT
BankToReceiveWithdraw=Bankovní účet pro příjem odstoupí
CreditDate=Kredit na
-WithdrawalFileNotCapable=Nelze vytvářet stažení příjmu soubor pro vaši zemi
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
ShowWithdraw=Zobrazit Natáhněte
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
diff --git a/htdocs/langs/da_DK/accountancy.lang b/htdocs/langs/da_DK/accountancy.lang
index 337a0eb177345e68cd877c7d2d8da84d893a8664..69ee72f82ed24dd33a8c275a9c88f3381474a4a5 100644
--- a/htdocs/langs/da_DK/accountancy.lang
+++ b/htdocs/langs/da_DK/accountancy.lang
@@ -25,134 +25,134 @@ Selectchartofaccounts=Vælg en kontoplan
Validate=Godkend
Addanaccount=Tilføj en regnskabsmæssig konto
AccountAccounting=Regnskabsmæssig konto
-Ventilation=Ventilation
+Ventilation=Breakdown
ToDispatch=Afsend
-Dispatched=Dispatched
-
-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
-TradeMargin=Trade margin
-Reports=Reports
-ByCustomerInvoice=By invoices customers
-ByMonth=By Month
-NewAccount=New accounting account
-Update=Update
-List=List
-Create=Create
-UpdateAccount=Modification of an accounting account
-UpdateMvts=Modification of a movement
-WriteBookKeeping=Record accounts in general ledger
-Bookkeeping=General ledger
-AccountBalanceByMonth=Account balance by month
-
-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
-Line=Line
-
-CAHTF=Total purchase supplier HT
-InvoiceLines=Lines of invoice to be ventilated
-InvoiceLinesDone=Ventilated lines of invoice
-IntoAccount=In the accounting account
-
-Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
-
-Processing=Processing
-EndProcessing=The end of processing
-AnyLineVentilate=Any lines to ventilate
-SelectedLines=Selected lines
-Lineofinvoice=Line of invoice
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
+Dispatched=Afsendt
+
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+TradeMargin=Handelsforskel
+Reports=Reporter
+ByCustomerInvoice=Efter fakturakunder
+ByMonth=Efter måned
+NewAccount=By regnskabskonto
+Update=Opdater
+List=Liste
+Create=Opret
+UpdateAccount=Ændring af en regnskabsmæssig konto
+UpdateMvts=Ændring af en bevægelse
+WriteBookKeeping=Optage konti i kontoplanen
+Bookkeeping=Kontoplan
+AccountBalanceByMonth=Kontobalance efter måned
+
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
+Line=Linje
+
+CAHTF=Samlet køb leverandør
+InvoiceLines=Linjer af faktura, der skal fornyes
+InvoiceLinesDone=Fornyede linjer af faktura
+IntoAccount=I den regnskabsmæssige konto
+
+Ventilate=Forny
+VentilationAuto=Automatic breakdown
+
+Processing=Forarbejde
+EndProcessing=Forarbejdet
+AnyLineVentilate=Linjer, der skal fornyes
+SelectedLines=Valgte linjer
+Lineofinvoice=Fakturalinjer
+VentilatedinAccount=Fornyet med succes i den regnskabsmæssige konto
+NotVentilatedinAccount=Ikke fornyede i den regnskabsmæssige konto
ACCOUNTING_SEPARATORCSV=Separator CSV
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
-AccountLength=Length of the accounting accounts shown in Dolibarr
-AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+AccountLength=Længde af regnskabssystemet konti i Dolibarr
+AccountLengthDesc=Funktion gør det muligt at foregive en længde på regnskabsmæssig konto ved at erstatte mellemrum med tallet nul. Da denne funktion kun vises på skærmen ændrer det ikke ved de bogføring registreret i Dolibarr konti. For eksport, er det nødvendigt denne funktion til at være kompatibel med bestemt software.
+ACCOUNTING_LENGTH_GACCOUNT=Længde af det almindelige regnskab
+ACCOUNTING_LENGTH_AACCOUNT=Længde af de tredjeparts-konti
-ACCOUNTING_SELL_JOURNAL=Sell journal
-ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
-ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
-ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_SELL_JOURNAL=Salgskladde
+ACCOUNTING_PURCHASE_JOURNAL=Indkøbskladde
+ACCOUNTING_BANK_JOURNAL=Bankkladde
+ACCOUNTING_CASH_JOURNAL=Kontantkladde
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Diversekladde
+ACCOUNTING_SOCIAL_JOURNAL=Socialkladde
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
-ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Konto overførsel
+ACCOUNTING_ACCOUNT_SUSPENSE=Ventende konto
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Regnskab konto som standard for købte produkter (hvis ikke defineret i produktark)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Regnskab konto som standard for de solgte produkter (hvis ikke defineret i produktark)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Regnskab konto som standard for de indkøbte tjenester (hvis ikke defineret i tjeneste ark)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Regnskab konto som standard for de solgte ydelser (hvis ikke defineret i tjeneste ark)
-Doctype=Type of document
-Docdate=Date
+Doctype=Dokumenttype
+Docdate=Dato
Docref=Reference
-Numerocompte=Account
-Code_tiers=Thirdparty
-Labelcompte=Label account
-Debit=Debit
-Credit=Credit
-Amount=Amount
+Numerocompte=Konto
+Code_tiers=Trediepart
+Labelcompte=Kontonavn
+Debit=Debet
+Credit=Kredit
+Amount=Beløb
Sens=Sens
Codejournal=Journal
-DelBookKeeping=Delete the records of the general ledger
+DelBookKeeping=Slet posterne i kontoplanen
-SellsJournal=Sells journal
-PurchasesJournal=Purchases journal
-DescSellsJournal=Sells journal
-DescPurchasesJournal=Purchases journal
-BankJournal=Bank journal
-DescBankJournal=Bank journal including all the types of payments other than cash
-CashJournal=Cash journal
-DescCashJournal=Cash journal including the type of payment cash
+SellsJournal=Salgskladde
+PurchasesJournal=Købskladde
+DescSellsJournal=Salgskladde
+DescPurchasesJournal=Købskladde
+BankJournal=Bankjournal
+DescBankJournal=Bankkladden herunder alle de typer af andre betalinger end kontanter
+CashJournal=Kontantkladde
+DescCashJournal=Kontantkladde herunder betalinger med kontanter
-CashPayment=Cash Payment
+CashPayment=Kontant betaling
-SupplierInvoicePayment=Payment of invoice supplier
-CustomerInvoicePayment=Payment of invoice customer
+SupplierInvoicePayment=Betaling af leverandørfakturaer
+CustomerInvoicePayment=Betaling af kundefaktura
-ThirdPartyAccount=Thirdparty account
+ThirdPartyAccount=Tredjepart konto
-NewAccountingMvt=New movement
-NumMvts=Number of movement
-ListeMvts=List of the movement
-ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+NewAccountingMvt=Ny bevægelse
+NumMvts=Antal bevægelser
+ListeMvts=Liste af bevægelser / kontokort
+ErrorDebitCredit=Debet og kredit kan ikke have en værdi på samme tid
-ReportThirdParty=List thirdparty account
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=Tredjeparts konto liste
+DescThirdPartyReport=Gå til en liste over de tredjeparts kunder og leverandører og deres regnskabssystemer konti
-ListAccounts=List of the accounting accounts
+ListAccounts=Liste over de regnskabsmæssige konti
-Pcgversion=Version of the plan
-Pcgtype=Class of account
-Pcgsubtype=Under class of account
-Accountparent=Root of the account
-Active=Statement
+Pcgversion=Version af planen
+Pcgtype=Kontoens klasse
+Pcgsubtype=Kontoens underklasse
+Accountparent=Roden af kontoen
+Active=Erklæring
-NewFiscalYear=New fiscal year
+NewFiscalYear=Nyt finansår
-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
-TotalVente=Total turnover HT
-TotalMarge=Total sales margin
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
+TotalVente=Samlet omsætning
+TotalMarge=Samlet salgsforskel
+DescVentilDoneCustomer=Gå til en liste over de linjer af fakturaer kunder og deres regnskabskonto
+DescVentilTodoCustomer=Forny dine linjer ag kundefaktura med en regnskabskonto
+ChangeAccount=Skift den regnskabsmæssige konto for strækninger, der er udvalgt af hensyn til:
Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
-DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilTodoSupplier=Forny dine linier af faktura leverandører med en regnskabskonto
+DescVentilDoneSupplier=Gå til en liste over de linjer af fakturaer leverandør og deres regnskabskonto
-ValidateHistory=Validate Automatically
+ValidateHistory=Forny automatisk
-ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+ErrorAccountancyCodeIsAlreadyUse=Fejl, kan du ikke slette denne regnskabsmæssige konto, fordi den bruges
-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index e5fac958742ba5711ac00bc21b4f4e203561da77..d46556e6e3884ff852bdcec0cd62de409e983583 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -437,8 +437,8 @@ Module52Name=Lagre
Module52Desc=Lagre 'håndtering af produkter
Module53Name=Services
Module53Desc=Services' ledelse
-Module54Name=Kontrakter
-Module54Desc=Kontrakter og tjenesteydelserne forvaltning
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=Stregkoder
Module55Desc=Stregkoder 'ledelse
Module56Name=Telefoni
@@ -475,8 +475,8 @@ Module320Name=RSS Feed
Module320Desc=Tilføj RSS feed inde Dolibarr skærmen sider
Module330Name=Bogmærker
Module330Desc=Bogmærker 'ledelse
-Module400Name=Projekter
-Module400Desc=Projekter 'håndtering indeni andre moduler
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=Webcalendar
Module410Desc=Webcalendar integration
Module500Name=Special expenses (tax, social contributions, dividends)
@@ -484,7 +484,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di
Module510Name=Salaries
Module510Desc=Management of employees salaries and payments
Module600Name=Adviséringer
-Module600Desc=Send meddelelser (via email) på Dolibarr business-arrangementer
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Donationer
Module700Desc=Gaver 'ledelse
Module1200Name=Mantis
@@ -514,16 +514,16 @@ Module5000Name=Multi-selskab
Module5000Desc=Giver dig mulighed for at administrere flere selskaber
Module6000Name=Workflow
Module6000Desc=Workflow management
-Module20000Name=Helligdage
-Module20000Desc=Declare and follow employees holidays
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
Module39000Name=Product batch
Module39000Desc=Batch number, eat-by and sell-by date management on products
Module50000Name=PAYBOX
Module50000Desc=Modul til at tilbyde en online betaling side med kreditkort med PAYBOX
Module50100Name=Cash desk
Module50100Desc=Cash desk modul
-Module50200Name= Paypal
-Module50200Desc= Modul til at tilbyde en online betaling side med kreditkort med Paypal
+Module50200Name=Paypal
+Module50200Desc=Modul til at tilbyde en online betaling side med kreditkort med Paypal
Module50400Name=Accounting (advanced)
Module50400Desc=Accounting management (double parties)
Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=Læs stående ordrer
Permission152=Setup stående ordrer
Permission153=Læs stående ordrer kvitteringer
Permission154=Credit / afvise stående ordrer kvitteringer
-Permission161=Læs kontrakter
-Permission162=Opret / ændre kontrakter
-Permission163=Aktiver en tjeneste af en kontrakt
-Permission164=Deaktivere en tjeneste af en kontrakt
-Permission165=Slet kontrakter
-Permission171=Læs ture
-Permission172=Opret / ændre ture
-Permission173=Slet ture
-Permission178=Eksporter ture
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Read trips and expenses (own and his subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
Permission180=Læs leverandører
Permission181=Læs leverandør ordrer
Permission182=Opret / ændre leverandør ordrer
@@ -671,7 +672,7 @@ Permission300=Læs stregkoder
Permission301=Opret / ændre stregkoder
Permission302=Slet stregkoder
Permission311=Læs tjenester
-Permission312=Tildel service til kontrakt
+Permission312=Assign service/subscription to contract
Permission331=Læs bogmærker
Permission332=Opret / ændre bogmærker
Permission333=Slet bogmærker
@@ -701,8 +702,8 @@ Permission701=Læs donationer
Permission702=Opret / ændre donationer
Permission703=Slet donationer
Permission1001=Læs bestande
-Permission1002=Opret / ændre bestande
-Permission1003=Slet bestande
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=Læs bestand bevægelser
Permission1005=Opret / ændre status bevægelser
Permission1101=Læs levering ordrer
@@ -1038,7 +1039,6 @@ YesInSummer=Yes in summer
OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
SuhosinSessionEncrypt=Session storage encrypted by Suhosin
ConditionIsCurrently=Condition is currently %s
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
YouUseBestDriver=You use driver %s that is best driver available currently.
YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=Retur en regnskabspool kode bygget af %s efterfulgt af
ModuleCompanyCodePanicum=Retur tom regnskabspool kode.
ModuleCompanyCodeDigitaria=Regnskabsmæssig kode afhænger tredjepart kode. Koden er sammensat af tegnet "C" i første position efterfulgt af de første 5 bogstaver af tredjepart kode.
UseNotifications=Brug anmeldelser
-NotificationsDesc=Adviséringer funktionen giver dig mulighed for at stille sende automatiske mail, for nogle Dolibarr arrangementer, til virksomheder, der er konfigureret til
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
ModelModules=Dokumenter skabeloner
DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
WatermarkOnDraft=Vandmærke på udkast til et dokument
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=Tilføj leveringsdato evne
UseOptionLineIfNoQuantity=En linje af produkt / service med et nul beløb anses som en mulighed
FreeLegalTextOnProposal=Fri tekst på kommercielle forslag
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=Ordrer «forvaltning setup
OrdersNumberingModules=Ordrer nummerressourcer moduler
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list
ValidOrderAfterPropalClosed=At validere den rækkefølge efter forslag tættere sammen, gør det muligt ikke at træde ved den foreløbige kendelse
FreeLegalTextOnOrders=Fri tekst om ordrer
WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
##### Clicktodial #####
ClickToDialSetup=Klik for at ringe modul opsætning
ClickToDialUrlDesc=Url called when a click on phone picto is done. Dans l'url, vous pouvez utiliser les balises<br><b>__PHONETO__</b> qui sera remplacé par le téléphone de l'appelé<br><b>__PHONEFROM__</b> qui sera remplacé par le téléphone de l'appelant (le votre)<br><b>__LOGIN__</b> qui sera remplacé par votre login clicktodial (défini sur votre fiche utilisateur)<br><b>__PASS__</b> qui sera remplacé par votre mot de passe clicktodial (défini sur votre fiche utilisateur).
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=Intervention nummerressourcer moduler
TemplatePDFInterventions=Intervention kortet dokumenter modeller
WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
##### Contracts #####
-ContractsSetup=Kontrakter modul opsætning
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=Kontrakter nummerering moduler
TemplatePDFContracts=Contracts documents models
FreeLegalTextOnContracts=Free text on contracts
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
CacheByServer=Cache by server
CacheByClient=Cache by browser
CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=Produkter modul opsætning
ServiceSetup=Services modul opsætning
@@ -1382,9 +1384,10 @@ MailingSetup=Emailing modul opsætning
MailingEMailFrom=Afsender E-mail (Fra) for e-mails sendt med e-mail-modulet
MailingEMailError=Retur EMail (Fejl-til) for e-mails med fejl
##### Notification #####
-NotificationSetup=Mailing modul opsætning
+NotificationSetup=EMail notification module setup
NotificationEMailFrom=Afsender E-mail (Fra) for e-mails sendt til anmeldelser
-ListOfAvailableNotifications=Liste over tilgængelige meddelelser (Denne liste afhænger af aktiverede moduler)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
##### Sendings #####
SendingsSetup=Sender modul opsætning
SendingsReceiptModel=Afsendelse modtagelsen model
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=Forbindelse til server ' %s' på database' %s' med brugeren ' %
OSCommerceTestKo1=Forbindelse til server ' %s' lykkes men database' %s' kunne ikke være nået.
OSCommerceTestKo2=Forbindelse til server ' %s' med brugeren' %s' mislykkedes.
##### Stock #####
-StockSetup=Konfiguration modul lager
-UserWarehouse=Brug brugerens personlige bestande
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=Menu slettet
TreeMenu=Træ menuer
@@ -1478,11 +1482,14 @@ ClickToDialDesc=Dette modul giver mulighed for at tilføje et ikon efter telefon
##### Point Of Sales (CashDesk) #####
CashDesk=Point of salg
CashDeskSetup=Cash desk modul opsætning
-CashDeskThirdPartyForSell=Generic tredjepart bruge til sælger
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Cash konto til brug for sælger
CashDeskBankAccountForCheque= Konto til at bruge til at modtage betalinger med check
CashDeskBankAccountForCB= Konto til at bruge til at modtage kontant betaling ved kreditkort
-CashDeskIdWareHouse=Datawarehous til brugeren for sælger
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Bogmærkemodulet setup
BookmarkDesc=Dette modul giver dig mulighed for at håndtere bogmærker. Du kan også tilføje genveje til enhver Dolibarr sider eller externale websteder på din venstre menu.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Delete fiscal year
ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
Opened=Opened
Closed=Closed
-
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
diff --git a/htdocs/langs/da_DK/agenda.lang b/htdocs/langs/da_DK/agenda.lang
index b6fda1fb5eef5f0201af1c7b947a022baf28ba2c..bafe7810175dc3e141afa96ef75595a936e88a06 100644
--- a/htdocs/langs/da_DK/agenda.lang
+++ b/htdocs/langs/da_DK/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= Automatisk påfyldning af dagsorden
AgendaAutoActionDesc= Definer her begivenheder, som du vil Dolibarr at skabe automatisk en indsats på dagsordenen. Hvis det ikke er kontrolleret (som standard), kun manuel foranstaltninger vil blive inkluderet i dagsordenen.
AgendaSetupOtherDesc= Denne side giver mulighed for at konfigurere andre parametre af dagsorden-modulet.
AgendaExtSitesDesc=Denne side giver mulighed for at erklære eksterne kalendere til at se deres begivenheder i Dolibarr dagsorden.
-ActionsEvents= Begivenheder, for hvilke Dolibarr vil skabe en indsats på dagsordenen automatisk
-PropalValidatedInDolibarr= Forslag valideret
-InvoiceValidatedInDolibarr= Faktura valideret
+ActionsEvents=Begivenheder, for hvilke Dolibarr vil skabe en indsats på dagsordenen automatisk
+PropalValidatedInDolibarr=Forslag valideret
+InvoiceValidatedInDolibarr=Faktura valideret
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=Faktura %s gå tilbage til udkast til status
InvoiceDeleteDolibarr=Invoice %s deleted
OrderValidatedInDolibarr= Bestil valideret
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Bestil %s godkendt
OrderRefusedInDolibarr=Order %s refused
OrderBackToDraftInDolibarr=Bestil %s gå tilbage til udkast til status
OrderCanceledInDolibarr=Bestil %s annulleret
-InterventionValidatedInDolibarr=Intervention %s valideret
ProposalSentByEMail=Kommercielle forslag %s sendt via e-mail
OrderSentByEMail=Kunde ordre %s sendt via e-mail
InvoiceSentByEMail=Kundefaktura %s sendt via e-mail
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=Leverandør ordre %s sendt via e-mail
SupplierInvoiceSentByEMail=Leverandørfaktura %s sendt via e-mail
ShippingSentByEMail=Forsendelse %s sendt via e-mail
ShippingValidated= Shipping %s validated
-InterventionSentByEMail=Intervention %s sendt via e-mail
-InterventionClassifiedBilled=Intervention %s classified as Billed
NewCompanyToDolibarr= Tredjepart skabt
DateActionPlannedStart= Planlagt startdato
DateActionPlannedEnd= Planlagte slutdato
@@ -70,9 +68,9 @@ DateActionStart= Startdato
DateActionEnd= Slutdato
AgendaUrlOptions1=Du kan også tilføje følgende parametre til at filtrere output:
AgendaUrlOptions2=<b>login=<b>login= %s</b> for at begrænse produktionen til aktioner skabt af, påvirkes i eller udføres af <b>brugeren %s.</b>
-AgendaUrlOptions3=<b>logina=<b>logina= %s</b> for at begrænse produktionen til aktioner skabt af <b>brugeren %s.</b>
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
AgendaUrlOptions4=<b>logint=<b>logint= %s</b> for at begrænse produktionen til aktioner påvirket til <b>brugeren %s.</b>
-AgendaUrlOptions5=<b>logind=<b>logind= %s</b> for at begrænse produktionen til aktioner udført af <b>brugeren %s.</b>
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
AgendaShowBirthdayEvents=Vis fødselsdag kontakter
AgendaHideBirthdayEvents=Skjul fødselsdag kontakter
Busy=Busy
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=URL for at få adgang. ICal fil
ExtSiteNoLabel=Ingen beskrivelse
WorkingTimeRange=Working time range
WorkingDaysRange=Working days range
-AddEvent=Add event
+AddEvent=Create event
MyAvailability=My availability
diff --git a/htdocs/langs/da_DK/bills.lang b/htdocs/langs/da_DK/bills.lang
index a626c6d6e266d291c7a9ad28b66d505b211bc0b3..eb55c6333a69239e7404832f7d6fb3aecbb2a8eb 100644
--- a/htdocs/langs/da_DK/bills.lang
+++ b/htdocs/langs/da_DK/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Credit note
InvoiceAvoirAsk=Credit note til korrekt faktura
InvoiceAvoirDesc=<b>Kreditformidleren note</b> er et negativt faktura anvendes til at løse forhold, at en faktura er et beløb, der adskiller sig end beløbet reelt betales (fordi kunden betalt for meget ved en fejl, eller vil ikke betales helt, da han vendte tilbage nogle varer, for eksempel). <br><br> Bemærk: Original faktura skal allerede være lukket ( »betalt« eller »betales delvist) at tillade oprettelsen af en kreditnota på det.
invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
-invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
ReplaceInvoice=Erstat faktura %s
ReplacementInvoice=Erstatning faktura
ReplacedByInvoice=Erstattes af faktura %s
@@ -87,7 +87,7 @@ ClassifyCanceled=Klassificere 'Abandoned "
ClassifyClosed=Klassificere "lukket"
ClassifyUnBilled=Classify 'Unbilled'
CreateBill=Opret Faktura
-AddBill=Tilføj faktura eller kreditnota
+AddBill=Create invoice or credit note
AddToDraftInvoices=Add to draft invoice
DeleteBill=Slet faktura
SearchACustomerInvoice=Søg en kunde faktura
@@ -99,7 +99,7 @@ DoPaymentBack=Må betale tilbage
ConvertToReduc=Konverter til fremtidige rabat
EnterPaymentReceivedFromCustomer=Indtast betaling er modtaget fra kunden
EnterPaymentDueToCustomer=Foretag betaling til kunde
-DisabledBecauseRemainderToPayIsZero=Handicappede, fordi resten til at betale er nul
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
Amount=Mængde
PriceBase=Pris base
BillStatus=Faktura status
@@ -137,8 +137,6 @@ BillFrom=Fra
BillTo=Bill til
ActionsOnBill=Aktioner på faktura
NewBill=Ny faktura
-Prélèvements=Stående ordre
-Prélèvements=Stående ordre
LastBills=Seneste %s fakturaer
LastCustomersBills=Seneste %s kunder fakturaer
LastSuppliersBills=Seneste %s leverandører fakturaer
@@ -156,9 +154,9 @@ ConfirmCancelBill=Er du sikker på du vil annullere <b>faktura %s?</b>
ConfirmCancelBillQuestion=hvorfor har du lyst til at klassificere denne faktura 'opgivet'?
ConfirmClassifyPaidPartially=Er du sikker på du vil ændre <b>faktura %s</b> til status betales?
ConfirmClassifyPaidPartiallyQuestion=Denne faktura er ikke blevet betalt fuldt ud. Hvad er årsagerne til dig for at lukke denne faktura?
-ConfirmClassifyPaidPartiallyReasonAvoir=Restbeløb til at betale <b>( %s %s)</b> er en rabat, der ydes, fordi betalingen var foretaget før sigt. Jeg legalisere moms med en kreditnota.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Restbeløb til at betale <b>( %s %s)</b> er en rabat, der ydes, fordi betalingen var foretaget før sigt. Jeg accepterer at miste momsen på denne rabat.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Restbeløb til at betale <b>( %s %s)</b> er en rabat, der ydes, fordi betalingen var foretaget før sigt. Jeg inddrive moms på denne rabat uden en kreditnota.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad kunde
ConfirmClassifyPaidPartiallyReasonProductReturned=Produkter delvist tilbage
ConfirmClassifyPaidPartiallyReasonOther=Beløb opgives for andre grunde
@@ -191,9 +189,9 @@ AlreadyPaid=Allerede betales
AlreadyPaidBack=Already paid back
AlreadyPaidNoCreditNotesNoDeposits=Allerede betalt (uden kreditter og indlån)
Abandoned=Opgives
-RemainderToPay=Restbeløb til at betale
-RemainderToTake=Restbeløb at tage
-RemainderToPayBack=Remainder to pay back
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
Rest=Pending
AmountExpected=Beløb hævdede
ExcessReceived=Trop Peru
@@ -219,19 +217,18 @@ NoInvoice=Nr. faktura
ClassifyBill=Klassificere faktura
SupplierBillsToPay=Leverandører fakturaer til at betale
CustomerBillsUnpaid=Vederlagsfri kunder fakturaer
-DispenseMontantLettres=Les factures rdiges par procdsmcanographiques sont dispenserer de l'arrt da lettres
-DispenseMontantLettres=Les factures rdiges par procdsmcanographiques sont dispenserer de l'arrt da lettres
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=Ikke-refunderbar
SetConditions=Indstil aflønningsvilkår
SetMode=Indstil betaling mode
Billed=Billed
-RepeatableInvoice=Prædefinerede faktura
-RepeatableInvoices=Prædefinerede fakturaer
-Repeatable=Forhånd definerede
-Repeatables=Forhånd definerede
-ChangeIntoRepeatableInvoice=Konverter til på forhånd definerede
-CreateRepeatableInvoice=Opret prædefinerede faktura
-CreateFromRepeatableInvoice=Opret fra prædefinerede faktura
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
CustomersInvoicesAndInvoiceLines=Kunden fakturaer og fakturaer 'linjer
CustomersInvoicesAndPayments=Kunden fakturaer og betalinger
ExportDataset_invoice_1=Kunden fakturaer listen og fakturaer 'linjer
diff --git a/htdocs/langs/da_DK/categories.lang b/htdocs/langs/da_DK/categories.lang
index 2fc58208e0bda088155ddf52d43e4229c3715019..ec63e24aba0be251fb16fa2bb1f42192e60c07be 100644
--- a/htdocs/langs/da_DK/categories.lang
+++ b/htdocs/langs/da_DK/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories
CatCusLinks=Links between customers/prospects and categories
CatProdLinks=Links between products/services and categories
CatMemberLinks=Links between members and categories
-CatProdLinks=Links between products/services and categories
-CatCusLinks=Links between customers/prospects and categories
-CatSupLinks=Links between suppliers and categories
DeleteFromCat=Remove from category
DeletePicture=Picture delete
ConfirmDeletePicture=Confirm picture deletion?
@@ -112,3 +109,4 @@ CategoriesSetup=Categories setup
CategorieRecursiv=Link with parent category automatically
CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category
diff --git a/htdocs/langs/da_DK/compta.lang b/htdocs/langs/da_DK/compta.lang
index 6f13a305bb5b1c7c5bc61229998bcfb0fa45cb95..23ddcc675107ee7c4053b27a3324e3ef958b54ab 100644
--- a/htdocs/langs/da_DK/compta.lang
+++ b/htdocs/langs/da_DK/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad kunde regnskabspool kode for %s
SuppliersProductsSellSalesTurnover=Det gav en omsætning fra salg af leverandørernes produkter.
CheckReceipt=Check depositum
CheckReceiptShort=Check depositum
+LastCheckReceiptShort=Last %s check receipts
NewCheckReceipt=Ny rabat
NewCheckDeposit=Ny check depositum
NewCheckDepositOn=Ny tjekke depositum på konto: %s
diff --git a/htdocs/langs/da_DK/contracts.lang b/htdocs/langs/da_DK/contracts.lang
index 12f369aa2270b78fa8814cd23448ae6b1a8640d5..f46b393f678624bd7170d2e72c0211595e4c122a 100644
--- a/htdocs/langs/da_DK/contracts.lang
+++ b/htdocs/langs/da_DK/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Kontrakter område
ListOfContracts=Liste over kontrakter
-LastContracts=Seneste %s modificerede kontrakter
+LastModifiedContracts=Last %s modified contracts
AllContracts=Alle kontrakter
ContractCard=Kontrakt-kortet
ContractStatus=Kontrakt status
@@ -27,7 +27,7 @@ MenuRunningServices=Kørsel tjenester
MenuExpiredServices=Udløbet tjenester
MenuClosedServices=Lukket tjenester
NewContract=Ny kontrakt
-AddContract=Tilføj kontrakt
+AddContract=Create contract
SearchAContract=Søg en kontrakt
DeleteAContract=Slet en kontrakt
CloseAContract=Luk en kontrakt
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Liste over kører kontrakt linjer
ListOfRunningServices=Liste over kører tjenester
NotActivatedServices=Ikke aktiverede tjenester (blandt valideret kontrakter)
BoardNotActivatedServices=Tjenester for at aktivere blandt valideret kontrakter
-LastContracts=Seneste %s modificerede kontrakter
+LastContracts=Last % contracts
LastActivatedServices=Seneste %s aktiveret tjenester
LastModifiedServices=Seneste %s modificerede tjenester
EditServiceLine=Rediger service line
diff --git a/htdocs/langs/da_DK/cron.lang b/htdocs/langs/da_DK/cron.lang
index cad7937a1d9c7e6db295ae7fa9aa004296f95277..344ff0127ac7ccfa42c13744bc6e284fae59a618 100644
--- a/htdocs/langs/da_DK/cron.lang
+++ b/htdocs/langs/da_DK/cron.lang
@@ -1,114 +1,86 @@
# Dolibarr language file - Source file is en_US - cron
-#
# About page
-#
About = Om
-# CronAbout = About Cron
-# CronAboutPage = Cron about page
-
-#
+CronAbout = About Cron
+CronAboutPage = Cron about page
# Right
-#
-# Permission23101 = Read Scheduled task
-# Permission23102 = Create/update Scheduled task
-# Permission23103 = Delete Scheduled task
-# Permission23104 = Execute Scheduled task
-
-#
+Permission23101 = Read Scheduled task
+Permission23102 = Create/update Scheduled task
+Permission23103 = Delete Scheduled task
+Permission23104 = Execute Scheduled task
# Admin
-#
-# CronSetup= Scheduled job management setup
-# URLToLaunchCronJobs=URL to check and launch cron jobs if required
-# OrToLaunchASpecificJob=Or to check and launch a specific job
-# KeyForCronAccess=Security key for URL to launch cron jobs
-# FileToLaunchCronJobs=Command line to launch cron jobs
-# CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes
-# CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
-
-
-#
+CronSetup= Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch cron jobs if required
+OrToLaunchASpecificJob=Or to check and launch a specific job
+KeyForCronAccess=Security key for URL to launch cron jobs
+FileToLaunchCronJobs=Command line to launch cron jobs
+CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
# Menu
-#
-# CronJobs=Scheduled jobs
-# CronListActive= List of active jobs
-# CronListInactive= List of disabled jobs
-# CronListActive= List of active jobs
-
-
-#
+CronJobs=Scheduled jobs
+CronListActive=List of active/scheduled jobs
+CronListInactive=List of disabled jobs
# Page list
-#
-# CronDateLastRun=Last run
-# CronLastOutput=Last run output
-# CronLastResult=Last result code
-# CronListOfCronJobs=List of scheduled jobs
-# CronCommand=Command
-# CronList=Jobs list
-# CronDelete= Delete cron jobs
-# CronConfirmDelete= Are you sure you want to delete this cron job ?
-# CronExecute=Launch job
-# CronConfirmExecute= Are you sure to execute this job now
-# CronInfo= Jobs allow to execute task that have been planned
-# CronWaitingJobs=Wainting jobs
-# CronTask=Job
+CronDateLastRun=Last run
+CronLastOutput=Last run output
+CronLastResult=Last result code
+CronListOfCronJobs=List of scheduled jobs
+CronCommand=Command
+CronList=Jobs list
+CronDelete= Delete cron jobs
+CronConfirmDelete= Are you sure you want to delete this cron job ?
+CronExecute=Launch job
+CronConfirmExecute= Are you sure to execute this job now
+CronInfo= Jobs allow to execute task that have been planned
+CronWaitingJobs=Wainting jobs
+CronTask=Job
CronNone= Ingen
CronDtStart=Startdato
CronDtEnd=Slutdato
-# CronDtNextLaunch=Next execution
-# CronDtLastLaunch=Last execution
-# CronFrequency=Frequancy
-# CronClass=Classe
+CronDtNextLaunch=Next execution
+CronDtLastLaunch=Last execution
+CronFrequency=Frequancy
+CronClass=Classe
CronMethod=Metode
CronModule=Modul
-# CronAction=Action
+CronAction=Action
CronStatus=Status
CronStatusActive=Aktiveret
CronStatusInactive=Deaktiveret
-# CronNoJobs=No jobs registered
+CronNoJobs=No jobs registered
CronPriority=Prioritet
CronLabel=Beskrivelse
-# CronNbRun=Nb. launch
-# CronEach=Every
-# JobFinished=Job launched and finished
-
-#
+CronNbRun=Nb. launch
+CronEach=Every
+JobFinished=Job launched and finished
#Page card
-#
-# CronAdd= Add jobs
-# CronHourStart= Start Hour and date of task
-# CronEvery= And execute task each
-# CronObject= Instance/Object to create
+CronAdd= Add jobs
+CronHourStart= Start Hour and date of task
+CronEvery= And execute task each
+CronObject= Instance/Object to create
CronArgs=Parametre
-# CronSaveSucess=Save succesfully
+CronSaveSucess=Save succesfully
CronNote=Kommentar
-# CronFieldMandatory=Fields %s is mandatory
-# CronErrEndDateStartDt=End date cannot be before start date
-# CronStatusActiveBtn=Enable
+CronFieldMandatory=Fields %s is mandatory
+CronErrEndDateStartDt=End date cannot be before start date
+CronStatusActiveBtn=Enable
CronStatusInactiveBtn=Deaktivere
-# CronTaskInactive=This job is disabled
-# CronDtLastResult=Last result date
-# CronId=Id
-# CronClassFile=Classes (filename.class.php)
-# CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-# CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-# CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-# CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is <i>fecth</i>
-# CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-# CronCommandHelp=The system command line to execute.
-
-#
+CronTaskInactive=This job is disabled
+CronDtLastResult=Last result date
+CronId=Id
+CronClassFile=Classes (filename.class.php)
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
+CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronCommandHelp=The system command line to execute.
# Info
-#
-# CronInfoPage=Information
-
-
-#
+CronInfoPage=Information
# Common
-#
-# CronType=Task type
-# CronType_method=Call method of a Dolibarr Class
-# CronType_command=Shell command
-# CronMenu=Cron
-# CronCannotLoadClass=Cannot load class %s or object %s
-
-# UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+CronType=Task type
+CronType_method=Call method of a Dolibarr Class
+CronType_command=Shell command
+CronMenu=Cron
+CronCannotLoadClass=Cannot load class %s or object %s
+UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
diff --git a/htdocs/langs/da_DK/donations.lang b/htdocs/langs/da_DK/donations.lang
index c56faabf69749f74b8d2d6969ca6247de7b561a4..64929d78199c4cfa98d537c284a16ac3a6b66b4b 100644
--- a/htdocs/langs/da_DK/donations.lang
+++ b/htdocs/langs/da_DK/donations.lang
@@ -4,7 +4,7 @@ Donations=Donationer
DonationRef=Donation ref.
Donor=Donor
Donors=Donorer
-AddDonation=Tilføj en donation
+AddDonation=Create a donation
NewDonation=Ny donation
ShowDonation=Show donation
DonationPromise=Gave løfte
@@ -31,3 +31,8 @@ DonationRecipient=Donation recipient
ThankYou=Thank You
IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
MinimumAmount=Minimum amount is %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/da_DK/externalsite.lang b/htdocs/langs/da_DK/externalsite.lang
index 5e2a8deccc6dba00057e1347530fa3da04175192..0df00764d244d47812a68eb724daccd046a97bb7 100644
--- a/htdocs/langs/da_DK/externalsite.lang
+++ b/htdocs/langs/da_DK/externalsite.lang
@@ -1,4 +1,5 @@
# Dolibarr language file - Source file is en_US - externalsite
ExternalSiteSetup=Opsætning link til ekstern hjemmeside
ExternalSiteURL=Ekstern webstedwebadresse
-# ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/da_DK/holiday.lang b/htdocs/langs/da_DK/holiday.lang
index c0e60a8f9fa22de66350e7b95019c4ff4a3d8c8b..ad2a6324a0faa30cc4ba7b23df1b78399be2e23c 100644
--- a/htdocs/langs/da_DK/holiday.lang
+++ b/htdocs/langs/da_DK/holiday.lang
@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
CantCreateCP=You don't have the right to make leave requests.
InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=Opdatering
CantUpdate=You cannot update this leave request.
NoDateDebut=You must select a start date.
NoDateFin=You must select an end date.
-ErrorDureeCP=Your request for holidays does not contain working day.
-TitleValidCP=Approve the request holidays
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
ConfirmValidCP=Are you sure you want to approve the leave request?
DateValidCP=Date approved
TitleToValidCP=Send leave request
ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the request holidays
+TitleRefuseCP=Refuse the leave request
ConfirmRefuseCP=Are you sure you want to refuse the leave request?
NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
+TitleCancelCP=Cancel the leave request
ConfirmCancelCP=Are you sure you want to cancel the leave request?
DetailRefusCP=Reason for refusal
DateRefusCP=Date of refusal
@@ -78,7 +77,7 @@ ActionByCP=Performed by
UserUpdateCP=For the user
PrevSoldeCP=Previous Balance
NewSoldeCP=New Balance
-alreadyCPexist=A request for holidays has already been done on this period.
+alreadyCPexist=A leave request has already been done on this period.
UserName=Navn
Employee=Employee
FirstDayOfHoliday=First day of vacation
@@ -88,25 +87,25 @@ ManualUpdate=Manual update
HolidaysCancelation=Leave request cancelation
## Configuration du Module ##
-ConfCP=Configuration of holidays module
+ConfCP=Configuration of leave request module
DescOptionCP=Description of the option
ValueOptionCP=Værdi
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
UpdateConfCPOK=Updated successfully.
ErrorUpdateConfCP=An error occurred during the update, please try again.
-AddCPforUsers=Please add the balance of holidays of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
Module27130Name= Management of leave requests
Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
TitleOptionEventCP=Settings of leave requets for events
ValidEventCP=Validate
UpdateEventCP=Update events
diff --git a/htdocs/langs/da_DK/interventions.lang b/htdocs/langs/da_DK/interventions.lang
index 7c45fec1cd1d881adead66f24ec46c0ab2b4162a..efb080c2be4574a5f6a71b17d3e36787268971e9 100644
--- a/htdocs/langs/da_DK/interventions.lang
+++ b/htdocs/langs/da_DK/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Intervention
Interventions=Interventioner
InterventionCard=Intervention kortet
NewIntervention=Ny intervention
-AddIntervention=Tilføj intervention
+AddIntervention=Create intervention
ListOfInterventions=Liste over interventioner
EditIntervention=Editer intervention
ActionsOnFicheInter=Handlinger om intervention
@@ -30,6 +30,15 @@ StatusInterInvoiced=Billed
RelatedInterventions=Relaterede interventioner
ShowIntervention=Vis indgreb
SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Repræsentant opfølgning intervention
TypeContact_fichinter_internal_INTERVENING=Mellemliggende
diff --git a/htdocs/langs/da_DK/mails.lang b/htdocs/langs/da_DK/mails.lang
index ba38add1b390408d458825bd9511cf8776e6f010..3a8d4d24d721b415303e1af696c0a70ce955b704 100644
--- a/htdocs/langs/da_DK/mails.lang
+++ b/htdocs/langs/da_DK/mails.lang
@@ -115,7 +115,7 @@ SentBy=Sendt af
MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
MailingNeedCommand2=Du kan dog sende dem online ved at tilføje parameteren MAILING_LIMIT_SENDBYWEB med værdien af max antal e-mails, du vil sende ved session.
ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=Ryd liste
ToClearAllRecipientsClickHere=At rydde modtagernes liste for denne e-mail, skal du klikke på knappen
ToAddRecipientsChooseHere=Hvis du vil tilføje modtagere, skal du vælge i disse lister
@@ -133,6 +133,9 @@ Notifications=Adviséringer
NoNotificationsWillBeSent=Ingen e-mail-meddelelser er planlagt for denne begivenhed, og selskabet
ANotificationsWillBeSent=1 anmeldelse vil blive sendt via email
SomeNotificationsWillBeSent=%s meddelelser vil blive sendt via email
-AddNewNotification=Aktivere en ny anmeldelse anmodning
-ListOfActiveNotifications=List alle aktive meddelelser anmodninger
+AddNewNotification=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
ListOfNotificationsDone=List alle e-mail meddelelser
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang
index fd5b87cdb3db7e3a0034a6255093a3fb4e7e0e82..276eb8d3f3f23f829486940c1002d60c930136c8 100644
--- a/htdocs/langs/da_DK/main.lang
+++ b/htdocs/langs/da_DK/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Kunne ikke finde <b>bruger %s</b> i Doliba
ErrorNoVATRateDefinedForSellerCountry=Fejl, der ikke momssatser defineret for land ' %s'.
ErrorNoSocialContributionForSellerCountry=Fejl, ingen social bidrag type der er defineret for landets %s '.
ErrorFailedToSaveFile=Fejl, kunne ikke gemme filen.
-ErrorOnlyPngJpgSupported=Fejl, kun. Png og. Jpg billedformat filen understøttes.
-ErrorImageFormatNotSupported=Din PHP understøtter ikke funktioner til at konvertere billeder af dette format.
SetDate=Set date
SelectDate=Select a date
SeeAlso=Se også %s
BackgroundColorByDefault=Standard baggrundsfarve
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
FileWasNotUploaded=En fil er valgt for udlæg, men endnu ikke var uploadet. Klik på "Vedhæft fil" for dette.
NbOfEntries=Nb af tilmeldinger
GoToWikiHelpPage=Læs online hjælp (har brug for Internet-adgang)
@@ -266,6 +266,7 @@ Afternoon=Afternoon
Quadri=Quadri
MonthOfDay=Måned fra den dato
HourShort=H
+MinuteShort=mn
Rate=Hyppighed
UseLocalTax=Incl. afgift
Bytes=Bytes
@@ -340,6 +341,7 @@ FullList=Fuldstændig liste
Statistics=Statistik
OtherStatistics=Andre statistik
Status=Status
+Favorite=Favorite
ShortInfo=Info.
Ref=Ref.
RefSupplier=Ref. leverandør
@@ -365,6 +367,7 @@ ActionsOnCompany=Aktioner om denne tredjepart
ActionsOnMember=Events Om dette medlem
NActions=%s aktioner
NActionsLate=%s sent
+RequestAlreadyDone=Request already recorded
Filter=Filter
RemoveFilter=Fjern filter
ChartGenerated=Chart genereret
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Ekstra attributter opsætning
URLPhoto=Url af foto / logo
SetLinkToThirdParty=Link til en anden tredjepart
CreateDraft=Opret udkast
+SetToDraft=Back to draft
ClickToEdit=Klik for at redigere
ObjectDeleted=Objekt %s slettet
ByCountry=Efter land
@@ -678,7 +682,7 @@ ViewPrivateNote=View notes
XMoreLines=%s line(s) hidden
PublicUrl=Public URL
AddBox=Add box
-
+SelectElementAndClickRefresh=Select an element and click Refresh
# Week day
Monday=Mandag
Tuesday=Tirsdag
diff --git a/htdocs/langs/da_DK/margins.lang b/htdocs/langs/da_DK/margins.lang
index ca2f939513241592cb351bb8fcde51d1c6991356..7ced0e4fc68fd2f86bf1f33b5e7db726c88def36 100644
--- a/htdocs/langs/da_DK/margins.lang
+++ b/htdocs/langs/da_DK/margins.lang
@@ -10,24 +10,18 @@ MarkRate=Mark rate
DisplayMarginRates=Display margin rates
DisplayMarkRates=Display mark rates
InputPrice=Input price
-
margin=Profit margins management
margesSetup=Profit margins management setup
-
MarginDetails=Margin details
-
ProductMargins=Product margins
CustomerMargins=Customer margins
SalesRepresentativeMargins=Sales representative margins
-
ProductService=Produkt eller tjeneste
AllProducts=All products and services
ChooseProduct/Service=Choose product or service
-
StartDate=Startdato
EndDate=Slutdato
Launch=Start
-
ForceBuyingPriceIfNull=Force buying price if null
ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0)
MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
@@ -35,16 +29,16 @@ UseDiscountAsProduct=As a product
UseDiscountAsService=As a service
UseDiscountOnTotal=On subtotal
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
-
MARGIN_TYPE=Margin type
MargeBrute=Raw margin
MargeNette=Net margin
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - Cost price
-
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
Charges=Charges
-
AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/da_DK/orders.lang b/htdocs/langs/da_DK/orders.lang
index 462baf963c344f6816f749fd0b2e947af75c1388..ad1730360a9d6b95675a7bc04206fbf6661b487d 100644
--- a/htdocs/langs/da_DK/orders.lang
+++ b/htdocs/langs/da_DK/orders.lang
@@ -2,7 +2,7 @@
OrdersArea=Kunder ordrer område
SuppliersOrdersArea=Leverandører ordrer område
OrderCard=Bestil kort
-# OrderId=Order Id
+OrderId=Order Id
Order=Rækkefølge
Orders=Ordrer
OrderLine=Bestil online
@@ -28,7 +28,7 @@ StatusOrderCanceledShort=Annulleret
StatusOrderDraftShort=Udkast
StatusOrderValidatedShort=Valideret
StatusOrderSentShort=I proces
-# StatusOrderSent=Shipment in process
+StatusOrderSent=Shipment in process
StatusOrderOnProcessShort=Den proces
StatusOrderProcessedShort=Forarbejdede
StatusOrderToBillShort=Til lovforslag
@@ -53,9 +53,9 @@ ShippingExist=En forsendelse eksisterer
DraftOrWaitingApproved=Udkast til eller godkendt endnu ikke bestilt
DraftOrWaitingShipped=Udkast til eller valideres endnu ikke afsendt
MenuOrdersToBill=Ordrer til lovforslag
-# MenuOrdersToBill2=Orders to bill
+MenuOrdersToBill2=Billable orders
SearchOrder=Search for
-# SearchACustomerOrder=Search a customer order
+SearchACustomerOrder=Search a customer order
ShipProduct=Skib produkt
Discount=Discount
CreateOrder=Opret Order
@@ -65,14 +65,14 @@ ValidateOrder=Valider orden
UnvalidateOrder=Unvalidate rækkefølge
DeleteOrder=Slet orden
CancelOrder=Annuller ordre
-AddOrder=Tilføj orden
+AddOrder=Create order
AddToMyOrders=Føj til mine ordrer
AddToOtherOrders=Føj til andre ordrer
-# AddToDraftOrders=Add to draft order
+AddToDraftOrders=Add to draft order
ShowOrder=Vis for
NoOpenedOrders=Nr. åbnet ordrer
NoOtherOpenedOrders=Ingen andre åbnet ordrer
-# NoDraftOrders=No draft orders
+NoDraftOrders=No draft orders
OtherOrders=Andre kendelser
LastOrders=Seneste %s ordrer
LastModifiedOrders=Seneste %s modificerede ordrer
@@ -82,7 +82,7 @@ NbOfOrders=Antal ordrer
OrdersStatistics=Orders »statistik
OrdersStatisticsSuppliers=Leverandør ordrer «statistik
NumberOfOrdersByMonth=Antallet af ordrer efter måned
-# AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
+AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
ListOfOrders=Liste af ordrer
CloseOrder=Luk for
ConfirmCloseOrder=Er du sikker på du ønsker at lukke denne ordre? Når en ordre er afsluttet, kan den kun blive faktureret.
@@ -93,7 +93,7 @@ ConfirmUnvalidateOrder=Er du sikker på du vil genoprette ro og orden <b>%s</b>
ConfirmCancelOrder=Er du sikker på du vil annullere denne ordre?
ConfirmMakeOrder=Er du sikker på du vil bekræfte, du har foretaget denne ordre <b>på %s?</b>
GenerateBill=Generer faktura
-# ClassifyShipped=Classify delivered
+ClassifyShipped=Classify delivered
ClassifyBilled=Klassificere "Billed"
ComptaCard=Regnskabsmæssig kortet
DraftOrders=Udkast til ordrer
@@ -101,7 +101,6 @@ RelatedOrders=Relaterede ordrer
OnProcessOrders=Den proces ordrer
RefOrder=Ref. rækkefølge
RefCustomerOrder=Ref. kunde for
-CustomerOrder=Kunden for
RefCustomerOrderShort=Ref. kunde. rækkefølge
SendOrderByMail=Send ordre ved mail
ActionsOnOrder=Aktioner på bestilling
@@ -131,9 +130,7 @@ Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Konstant COMMANDE_SUPPLIER_ADDON ikke d
Error_COMMANDE_ADDON_NotDefined=Konstant COMMANDE_ADDON ikke defineret
Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Det lykkedes ikke at indlæse modulet fil ' %s'
Error_FailedToLoad_COMMANDE_ADDON_File=Det lykkedes ikke at indlæse modulet fil ' %s'
-# Error_OrderNotChecked=No orders to invoice selected
-
-
+Error_OrderNotChecked=No orders to invoice selected
# Sources
OrderSource0=Kommerciel forslag
OrderSource1=Internet
@@ -144,25 +141,22 @@ OrderSource5=Kommerciel
OrderSource6=Opbevare
QtyOrdered=Qty bestilt
AddDeliveryCostLine=Tilføj en leveringsrapport omkostninger linje angiver vægten af den rækkefølge
-
# Documents models
PDFEinsteinDescription=En fuldstændig orden model (logo. ..)
PDFEdisonDescription=En simpel orden model
-# PDFProformaDescription=A complete proforma invoice (logo…)
+PDFProformaDescription=A complete proforma invoice (logo…)
# Orders modes
OrderByMail=Mail
OrderByFax=Fax
OrderByEMail=EMail
OrderByWWW=Online
OrderByPhone=Telefon
-
-# CreateInvoiceForThisCustomer=Bill orders
-# NoOrdersToInvoice=No orders billable
-# CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-# MenuOrdersToBill2=Orders to bill
-# OrderCreation=Order creation
-# Ordered=Ordered
-# OrderCreated=Your orders have been created
-# OrderFail=An error happened during your orders creation
-# CreateOrders=Create orders
-# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+CreateInvoiceForThisCustomer=Bill orders
+NoOrdersToInvoice=No orders billable
+CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
+OrderCreation=Order creation
+Ordered=Ordered
+OrderCreated=Your orders have been created
+OrderFail=An error happened during your orders creation
+CreateOrders=Create orders
+ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
diff --git a/htdocs/langs/da_DK/oscommerce.lang b/htdocs/langs/da_DK/oscommerce.lang
deleted file mode 100644
index 7b83c7528c2b0f757ad349c012d538234c12e53d..0000000000000000000000000000000000000000
--- a/htdocs/langs/da_DK/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=OS Commerce modul opsætning
-OSCommerceSetupSaved=OS Commerce opsætning gemmes
-OSCommerceServer=OS Commerce Server host / ip
-OSCommerceDatabaseName=OS Commerce databasenavn
-OSCommercePrefix=OS Commerce tabeller præfiks
-OSCommerceUser=OS Commerce database login
diff --git a/htdocs/langs/da_DK/other.lang b/htdocs/langs/da_DK/other.lang
index 5819f3c5e4edd2c2f8d9ee10f0e52c0f3f62b490..3195ac89360f4be89713e75fcfdc92f2838e3d28 100644
--- a/htdocs/langs/da_DK/other.lang
+++ b/htdocs/langs/da_DK/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=Sikkerhedskode
Calendar=Kalender
-AddTrip=Tilføj tur
Tools=Værktøj
ToolsDesc=Dette område er dedikeret til gruppen diverse værktøjer ikke er tilgængelige til andre menupunkter. <br><br> Disse værktøjer kan nås fra menuen på siden.
Birthday=Fødselsdag
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation
Notify_TASK_CREATE=Task created
Notify_TASK_MODIFY=Task modified
Notify_TASK_DELETE=Task deleted
+SeeModuleSetup=See module setup
NbOfAttachedFiles=Antal vedhæftede filer / dokumenter
TotalSizeOfAttachedFiles=Samlede størrelse på vedhæftede filer / dokumenter
MaxSize=Maksimumstørrelse
@@ -80,6 +80,16 @@ ModifiedBy=Modificeret af %s
ValidatedBy=Attesteret af %s
CanceledBy=Annulleret af %s
ClosedBy=Lukket af %s
+CreatedById=User id who created
+ModifiedById=User id who made last change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made last change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
FileWasRemoved=Fil blev slettet
DirWasRemoved=Directory blev fjernet
FeatureNotYetAvailableShort=Fås i en kommende version
@@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your
##### Calendar common #####
AddCalendarEntry=Tilføj post i kalenderen %s
-NewCompanyToDolibarr=Company %s tilføjede i Dolibarr
-ContractValidatedInDolibarr=Kontrakt %s valideret i Dolibarr
-ContractCanceledInDolibarr=Kontrakt %s annulleret i Dolibarr
-ContractClosedInDolibarr=Kontrakt %s lukket i Dolibarr
-PropalClosedSignedInDolibarr=Forslag %s undertegnet i Dolibarr
-PropalClosedRefusedInDolibarr=Forslag %s nægtet i Dolibarr
-PropalValidatedInDolibarr=Forslag %s valideret i Dolibarr
-InvoiceValidatedInDolibarr=Faktura %s valideret i Dolibarr
-InvoicePaidInDolibarr=Faktura %s ændret til udbetales i Dolibarr
-InvoiceCanceledInDolibarr=Faktura %s annulleret i Dolibarr
-PaymentDoneInDolibarr=Betaling %s gjort i Dolibarr
-CustomerPaymentDoneInDolibarr=Kundens betaling %s gjort i Dolibarr
-SupplierPaymentDoneInDolibarr=Leverandør betaling %s gjort i Dolibarr
-MemberValidatedInDolibarr=Medlem %s valideret i Dolibarr
-MemberResiliatedInDolibarr=Medlem %s resiliated i Dolibarr
-MemberDeletedInDolibarr=Medlem %s slettet fra Dolibarr
-MemberSubscriptionAddedInDolibarr=Subscription for medlem %s indsættes i Dolibarr
-ShipmentValidatedInDolibarr=__CONTACTCIVNAME__ \n\n Forsendelse %s valideret i Dolibarr
-ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
##### Export #####
Export=Eksport
ExportsArea=Eksport område
diff --git a/htdocs/langs/da_DK/paybox.lang b/htdocs/langs/da_DK/paybox.lang
index fb0bd3f0211e29378b777e419393d9385f90576f..83139d10368daf89cc7d462d4debd94058a22dc6 100644
--- a/htdocs/langs/da_DK/paybox.lang
+++ b/htdocs/langs/da_DK/paybox.lang
@@ -32,6 +32,9 @@ VendorName=Navn på leverandør
CSSUrlForPaymentForm=CSS stylesheet url til indbetalingskort
MessageOK=Besked på validerede betaling tilbage side
MessageKO=Besked om annulleret betaling tilbage side
-# NewPayboxPaymentReceived=New Paybox payment received
-# NewPayboxPaymentFailed=New Paybox payment tried but failed
-# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+NewPayboxPaymentReceived=New Paybox payment received
+NewPayboxPaymentFailed=New Paybox payment tried but failed
+PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/da_DK/resource.lang b/htdocs/langs/da_DK/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..d64075dfbf595897a63e3eebf19194d8f71030dd
--- /dev/null
+++ b/htdocs/langs/da_DK/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
diff --git a/htdocs/langs/da_DK/sendings.lang b/htdocs/langs/da_DK/sendings.lang
index 70c765930a284ee46e3957837104a97c93ecd7c3..feec180528b263430c717842c0fe80d09ae6fbee 100644
--- a/htdocs/langs/da_DK/sendings.lang
+++ b/htdocs/langs/da_DK/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=For øjeblikket er skabelsen af en ny fors
RelatedShippings=Related shippings
ShipmentLine=Shipment line
CarrierList=List of transporters
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
# Sending methods
SendingMethodCATCH=Fangst af kunden
diff --git a/htdocs/langs/da_DK/stocks.lang b/htdocs/langs/da_DK/stocks.lang
index eb5b50f9859acf188a650626025c317327e81b06..78b35609b003fbf8bf85db1d12c13cb9306c349b 100644
--- a/htdocs/langs/da_DK/stocks.lang
+++ b/htdocs/langs/da_DK/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Warehouse fareseddel kræves
CorrectStock=Korrekt lager
ListOfWarehouses=Liste over pakhuse
ListOfStockMovements=Liste over lagerbevægelserne
-StocksArea=Lagre område
+StocksArea=Warehouses area
Location=Lieu
LocationSummary=Kortnavn placering
NumberOfDifferentProducts=Number of different products
diff --git a/htdocs/langs/da_DK/users.lang b/htdocs/langs/da_DK/users.lang
index 01f7e28be79c731f2160727f83e05258501238f0..d18aa0d6e929cc42073a3e60ec2b68a9ee68eea4 100644
--- a/htdocs/langs/da_DK/users.lang
+++ b/htdocs/langs/da_DK/users.lang
@@ -63,7 +63,6 @@ ShowGroup=Vis gruppe
ShowUser=Vis bruger
NonAffectedUsers=Ikke berørt brugere
UserModified=Bruger modificerede held
-GroupModified=Gruppen modificerede held
PhotoFile=Fotofilen
UserWithDolibarrAccess=Bruger med Dolibarr adgang
ListOfUsersInGroup=Liste over brugere i denne gruppe
@@ -103,7 +102,7 @@ UserDisabled=Bruger %s handicappede
UserEnabled=Bruger %s aktiveret
UserDeleted=Bruger %s fjernes
NewGroupCreated=Gruppe %s oprettet
-GroupModified=Gruppen modificerede held
+GroupModified=Group %s modified
GroupDeleted=Gruppe %s fjernes
ConfirmCreateContact=Er du sikker yu ønsker at skabe et Dolibarr højde for denne kontakt?
ConfirmCreateLogin=Er du sikker på at du vil oprette en Dolibarr højde for dette medlem?
@@ -114,8 +113,10 @@ YourRole=Din roller
YourQuotaOfUsersIsReached=Din kvote af aktive brugere er nået!
NbOfUsers=Nb af brugere
DontDowngradeSuperAdmin=Kun en superadmin kan nedgradere en superadmin
-HierarchicalResponsible=Hierarchical responsible
+HierarchicalResponsible=Supervisor
HierarchicView=Hierarchical view
UseTypeFieldToChange=Use field Type to change
OpenIDURL=OpenID URL
LoginUsingOpenID=Use OpenID to login
+WeeklyHours=Weekly hours
+ColorUser=Color of the user
diff --git a/htdocs/langs/da_DK/withdrawals.lang b/htdocs/langs/da_DK/withdrawals.lang
index 5e89831ee95fff72536a8b99a1bbe59d73399ac1..fb8815155673d38cfd39295c83ee3f31c864605e 100644
--- a/htdocs/langs/da_DK/withdrawals.lang
+++ b/htdocs/langs/da_DK/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=Modtagelse
LastWithdrawalReceipts=Seneste %s tilbagetrækning kvitteringer
WithdrawedBills=Withdrawed fakturaer
WithdrawalsLines=Tilbagekøb linjer
-RequestStandingOrderToTreat=Anmodning om stående ordrer til behandling
-RequestStandingOrderTreated=Anmodning om stående ordrer behandles
+RequestStandingOrderToTreat=Request for standing orders to process
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=Kunden stående ordrer
CustomerStandingOrder=Kunden stående ordre
NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
@@ -40,14 +41,13 @@ TransMetod=Metode Transmission
Send=Send
Lines=Lines
StandingOrderReject=Udstedelse en forkaste
-InvoiceRefused=Oplad afslag til kunden
WithdrawalRefused=Udbetalinger Refuseds
WithdrawalRefusedConfirm=Er du sikker på du vil indtaste en tilbagetrækning afvisning for samfundet
RefusedData=Dato for afvisning
RefusedReason=Årsag til afvisning
RefusedInvoicing=Fakturering afvisningen
NoInvoiceRefused=Oplad ikke afvisning
-InvoiceRefused=Oplad afslag til kunden
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=Status
StatusUnknown=Ukendt
StatusWaiting=Venter
@@ -76,7 +76,7 @@ WithBankUsingRIB=For bankkonti ved hjælp af RIB
WithBankUsingBANBIC=For bankkonti ved hjælp af IBAN / BIC / SWIFT
BankToReceiveWithdraw=Bankkonto til at modtage trækker sig
CreditDate=Kredit på
-WithdrawalFileNotCapable=Kan ikke generere tilbagetrækning kvittering fil til dit land
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
ShowWithdraw=Vis Træk
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Hvis faktura mindst en tilbagetrækning betaling endnu ikke behandlet, vil den ikke blive angivet som betales for at tillade at styre tilbagetrækning før.
DoStandingOrdersBeforePayments=Denne faner giver dig mulighed for at anmode om en stående ordre. Når den bliver færdig, kan du skrive betalingen for at lukke fakturaen.
diff --git a/htdocs/langs/de_AT/oscommerce.lang b/htdocs/langs/de_AT/oscommerce.lang
deleted file mode 100644
index dfe6479ee16b37c12467b3e3f4c475fe1ed3e95e..0000000000000000000000000000000000000000
--- a/htdocs/langs/de_AT/oscommerce.lang
+++ /dev/null
@@ -1 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang
index 5bd833c227364373b2323be6189f642cc2777272..96c7bf1a336ffc7f07eecfefba6a793d7ed329d7 100644
--- a/htdocs/langs/de_DE/accountancy.lang
+++ b/htdocs/langs/de_DE/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=Kontenplan wählen
Validate=Freigeben
Addanaccount=Fügen Sie ein Buchhaltungskonto hinzu
AccountAccounting=Buchhaltungs Konto
-Ventilation=Erörterung
+Ventilation=Breakdown
ToDispatch=Zu versenden
Dispatched=Versandt
-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
TradeMargin=Handelsspanne
Reports=Berichte
ByCustomerInvoice=Nach Kundenrechnungen
@@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger
Bookkeeping=Hauptbuch
AccountBalanceByMonth=Kontostand pro Monat
-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
Line=Zeile
CAHTF=Total purchase supplier HT
@@ -56,32 +56,32 @@ InvoiceLinesDone=Ventilated lines of invoice
IntoAccount=In the accounting account
Ventilate=erörtern
-VentilationAuto=Automatic ventilation
+VentilationAuto=Automatic breakdown
-Processing=Processing
-EndProcessing=The end of processing
+Processing=Bearbeitung
+EndProcessing=Das Ende der Verarbeitung
AnyLineVentilate=Any lines to ventilate
SelectedLines=Gewählte Zeilen
Lineofinvoice=Rechnungszeile
VentilatedinAccount=Ventilated successfully in the accounting account
NotVentilatedinAccount=Not ventilated in the accounting account
-ACCOUNTING_SEPARATORCSV=Separator CSV
+ACCOUNTING_SEPARATORCSV=CSV Trennzeichen
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
-ACCOUNTING_SELL_JOURNAL=Sell journal
-ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
-ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_SELL_JOURNAL=Verkaufsjournal
+ACCOUNTING_PURCHASE_JOURNAL=Einkaufsjournal
+ACCOUNTING_BANK_JOURNAL=Bankauszug
+ACCOUNTING_CASH_JOURNAL=Kassenbeleg
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Verschiedenes Journal
ACCOUNTING_SOCIAL_JOURNAL=Social journal
ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
@@ -110,9 +110,9 @@ SellsJournal=Verkaufsjournal
PurchasesJournal=Einkaufsjournal
DescSellsJournal=Verkaufsjournal
DescPurchasesJournal=Einkaufsjournal
-BankJournal=Bank journal
+BankJournal=Bankauszug
DescBankJournal=Bank journal including all the types of payments other than cash
-CashJournal=Cash journal
+CashJournal=Kassenbeleg
DescCashJournal=Cash journal including the type of payment cash
CashPayment=Barzahlung
@@ -120,7 +120,7 @@ CashPayment=Barzahlung
SupplierInvoicePayment=Rechnungszahlung (Lieferant)
CustomerInvoicePayment=Rechnungszahlung (Kunde)
-ThirdPartyAccount=Thirdparty account
+ThirdPartyAccount=Partner Konto
NewAccountingMvt=Neue Änderung
NumMvts=Number of movement
@@ -140,14 +140,14 @@ Active=Auszug
NewFiscalYear=Neues fiskalisches Jahr
-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
TotalVente=Total turnover HT
TotalMarge=Gesamt-Spanne
DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
ChangeAccount=Change the accounting account for lines selected by the account:
Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
@@ -155,4 +155,4 @@ ValidateHistory=Automatisch geltend machen
ErrorAccountancyCodeIsAlreadyUse=Fehler, Sie können dieses Buchaltungskonto nicht löschen, da es benutzt wird.
-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index 186ef2ef1ebd75a5dd562a9023a5eea547ff061d..f1168a1fce5ffce962e5d16f785359a1172c36df 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -125,7 +125,7 @@ PHPTZ=Zeitzone der PHP-Version
PHPServerOffsetWithGreenwich=PHP-Server Zeit-Offset Greenwich-Breite (Sekunden)
ClientOffsetWithGreenwich=Benutzer/Browser Zeit-Offset Greenwich-Breite (Sekunden)
DaylingSavingTime=Sommerzeit (Benutzer)
-CurrentHour=Aktuelle Stunde
+CurrentHour=Aktuelle Systemzeit
CompanyTZ=Unternehmenszeitzone (Hauptunternehmen)
CompanyHour=Unternehmenszeit (Hauptunternehmen)
CurrentSessionTimeOut=Aktuelle Session timeout
@@ -394,8 +394,8 @@ KeepEmptyToUseDefault=Leer lassen für Standardwert
DefaultLink=Standardlink
ValueOverwrittenByUserSetup=Achtung, dieser Wert kann durch den Benutzer überschrieben werden (jeder kann seine eigene ClickToDial-URL setzen)
ExternalModule=Externes Modul - im Verzeichnis %s installiert
-BarcodeInitForThirdparties=Mass barcode init for thirdparties
-BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
+BarcodeInitForThirdparties=Alle Strichcodes für Drittanbieter initialisieren
+BarcodeInitForProductsOrServices=Alle Strichcodes für Produkte oder Services initialisieren oder zurücksetzen
CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> records on <strong>%s</strong> %s without barcode defined.
InitEmptyBarCode=Startwert für die nächsten %s leeren Datensätze
EraseAllCurrentBarCode=Alle aktuellen Barcode-Werte löschen
@@ -437,8 +437,8 @@ Module52Name=Produktbestände
Module52Desc=Produktbestandsverwaltung
Module53Name=Leistungen
Module53Desc=Leistungs-Verwaltung
-Module54Name=Verträge
-Module54Desc=Vertragsverwaltung
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=Barcodes
Module55Desc=Barcode-Verwaltung
Module56Name=Telefonie
@@ -475,8 +475,8 @@ Module320Name=RSS-Feed
Module320Desc=RSS-Feed-Bildschirm innerhalb des Systems anzeigen
Module330Name=Lesezeichen
Module330Desc=Lesezeichenverwaltung
-Module400Name=Projekte
-Module400Desc=Projektverwaltung in anderen Modulen
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=Webkalender
Module410Desc=Webkalenderintegration
Module500Name=Sonderausgaben (Steuern, Sozialbeiträge und Dividenden)
@@ -484,7 +484,7 @@ Module500Desc=Steuer-, Sozialbeitrags-, Dividenden- und Lohnverwaltung
Module510Name=Löhne
Module510Desc=Verwaltung der Angestellten-Gehälter und -Zahlungen
Module600Name=Benachrichtigungen
-Module600Desc=Senden Sie Benachrichtigungen (per E-Mail) zu dolibarr-Events
+Module600Desc=Senden Sie Benachrichtigungen zu einigen Dolibarr-Events per E-Mail an Partner (wird pro Partner definiert)
Module700Name=Spenden
Module700Desc=Spendenverwaltung
Module1200Name=Mantis
@@ -514,16 +514,16 @@ Module5000Name=Mandantenfähigkeit
Module5000Desc=Ermöglicht Ihnen die Verwaltung mehrerer Firmen
Module6000Name=Workflow
Module6000Desc=Workflow management
-Module20000Name=Ferien
-Module20000Desc=Melden und beobachten sie den Urlaub Ihrer Angestellten.
+Module20000Name=Urlaubsantrags-Verwaltung
+Module20000Desc=Definieren und beobachten sie die Urlaubsanträge Ihrer Angestellten.
Module39000Name=Produktstapel
Module39000Desc=Batch-Nummer, verzehren-bis-Datum und verkaufen-bis-Datum auf Produkten
Module50000Name=PayBox
Module50000Desc=Über dieses Modul können Sie online Kreditkartenzahlungen entgegennehmen
Module50100Name=Kasse
Module50100Desc=Kassenmodul
-Module50200Name= Paypal
-Module50200Desc= Mit diesem Modul können Sie via PayPal Online Kreditkartenzahlungen entgegennehmen
+Module50200Name=Paypal
+Module50200Desc=Mit diesem Modul können Sie via PayPal Online Kreditkartenzahlungen entgegennehmen
Module50400Name=Buchhaltung (erweitert)
Module50400Desc=Buchhaltung für Experten (doppelte Buchhaltung)
Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=Daueraufträge einsehen
Permission152=Dauerauftragsanträge erstellen/bearbeiten
Permission153=Dauerauftragsbelege übertragen
Permission154=Dauerauftragsbelege kreditieren/ablehnen
-Permission161=Veträge einsehen
-Permission162=Verträge erstellen/bearbeiten
-Permission163=Dienstleistungen in Verträgen aktivieren
-Permission164=Dienstleistungen in Verträgen deaktivieren
-Permission165=Verträge löschen
-Permission171=Reisen lesen
-Permission172=Reisen erstellen/bearbeiten
-Permission173=Reisen löschen
-Permission178=Reisen exportieren
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Reisen und Spesen einsehen (eigene und Untergebene)
+Permission172=Reisen und Spesen erstellen/ändern
+Permission173=Reisen und Spesen löschen
+Permission174=Alle Reisen und Spesen einsehen
+Permission178=Reisen und Spesen exportieren
Permission180=Lieferanten einsehen
Permission181=Lieferantenbestellungen einsehen
Permission182=Lieferantenbestellungen erstellen/bearbeiten
@@ -671,7 +672,7 @@ Permission300=Barcodes einsehen
Permission301=Barcodes erstellen/bearbeiten
Permission302=Barcodes löschen
Permission311=Leistungen lesen
-Permission312=Leistungen einem Vertrag zuordnen
+Permission312=Assign service/subscription to contract
Permission331=Lesezeichen einsehen
Permission332=Lesezeichen erstellen/bearbeiten
Permission333=Lesezeichen löschen
@@ -701,8 +702,8 @@ Permission701=Spenden einsehen
Permission702=Spenden erstellen/bearbeiten
Permission703=Spenden löschen
Permission1001=Warenbestände einsehen
-Permission1002=Warenbestände erstellen/bearbeiten
-Permission1003=Warenbestände löschen
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=Lagerbewegungen einsehen
Permission1005=Lagerbewegungen erstellen/bearbeiten
Permission1101=Lieferscheine einsehen
@@ -749,19 +750,19 @@ Permission50101=Benutze Kassen
Permission50201=Transaktionen einsehen
Permission50202=Transaktionen importieren
Permission54001=Drucken
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
+Permission55001=Abstimmungen einsehen
+Permission55002=Abstimmung erstellen/ändern
+Permission59001=Margen einsehen
+Permission59002=Margen definieren
DictionaryCompanyType=Partnertyp
-DictionaryCompanyJuridicalType=Juridical kinds of thirdparties
+DictionaryCompanyJuridicalType=Gesellschaftsformen von Drittanbietern
DictionaryProspectLevel=Geschäftsaussicht
DictionaryCanton=Bundesland/Kanton
DictionaryRegion=Regionen
DictionaryCountry=Länder
DictionaryCurrency=Währungen
DictionaryCivility=Anredeformen
-DictionaryActions=Type of agenda events
+DictionaryActions=Maßnahmen
DictionarySocialContributions=Sozialbeitragstypen
DictionaryVAT=MwSt.-Sätze
DictionaryRevenueStamp=Amount of revenue stamps
@@ -938,7 +939,7 @@ InfoDatabase=Infos Datenbank
InfoPHP=Infos PHP
InfoPerf=Leistungs-Informationen
BrowserName=Browser Name
-BrowserOS=Browser OS
+BrowserOS=Betriebssystem des Browsers
ListEvents=Liste aller protokollierten Ereignisse
ListOfSecurityEvents=Liste der sicherheitsrelevanten Ereignisse
SecurityEventsPurged=Security-Ereignisse gelöscht
@@ -1038,7 +1039,6 @@ YesInSummer=Ja im Sommer
OnlyFollowingModulesAreOpenedToExternalUsers=Bitte beachten: nur die folgenden Module sind für externe Nutzer verfügbar (unabhängig von deren Rechten):
SuhosinSessionEncrypt=Sitzungsspeicher durch Suhosin verschlüsselt
ConditionIsCurrently=Einstellung ist aktuell %s
-TestNotPossibleWithCurrentBrowsers=Automatische Erkennung nicht möglich
YouUseBestDriver=Sie verwenden den Treiber %s, dies ist derzeit der beste verfügbare.
YouDoNotUseBestDriver=Sie verwenden Treiber %s, aber der Treiber %s wird empfohlen.
NbOfProductIsLowerThanNoPb=Sie haben nur %s Produkte/Dienstleistungen in der Datenbank. Daher ist keine bestimmte Optimierung erforderlich.
@@ -1049,7 +1049,7 @@ BrowserIsKO=Sie benutzen den Webbrowser %s. Dieser ist bekannt für Sicherheitsp
XDebugInstalled=XDebug installiert.
XCacheInstalled=XCache installiert.
AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink
-FieldEdition=Edition of field %s
+FieldEdition=Bearbeitung von Feld %s
FixTZ=Zeitzonen-Korrektur
FillThisOnlyIfRequired=Beispiel: +2 (nur ausfüllen, wenn Sie Probleme mit der Zeitzone haben)
GetBarCode=Erhalten Sie einen Barcode
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=Generiert einen Kontierungscode %s, gefolgt von der Li
ModuleCompanyCodePanicum=Generiert einen leeren Kontierungscode.
ModuleCompanyCodeDigitaria=Kontierungscode hängt vom Partnercode ab. Der Code setzt sich aus dem Buchstaben 'C' und den ersten 5 Stellen des Partnercodes zusammen.
UseNotifications=Benachrichtigungen verwenden
-NotificationsDesc=E-Mail-Benachrichtigungsfunktionen erlauben Ihnen den stillschweigenden Versand automatischer Benachrichtigungen zu Systemereignissen an dafür eingerichtete Partner (Kunden oder Lieferanten).
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
ModelModules=Dokumentvorlagenmodul
DocumentModelOdt=Erstellen von Dokumentvorlagen im OpenDocuments-Format (.odt- oder .ods-Dateien für OpenOffice, KOffice, TextEdit, ...)
WatermarkOnDraft=Wasserzeichen auf Entwurf
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=Lieferfähigkeitsdatum hinzufügen
UseOptionLineIfNoQuantity=Produkt-/Servicezeilen mit Nullmenge zulässig
FreeLegalTextOnProposal=Freier Rechtstext für Angebote
WatermarkOnDraftProposal=Wasserzeichen auf Angebotsentwürfen (keins, falls leer)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=Bestellverwaltungseinstellungen
OrdersNumberingModules=Bestellnumerierungs-Module
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Ausblenden von bearbeiteten oder abgebrochenen Angeboten in de
ValidOrderAfterPropalClosed=Zur Freigabe der Bestellung nach Schließung des Angebots (überspringt vorläufige Bestellung)
FreeLegalTextOnOrders=Freier Rechtstext auf Bestellungen
WatermarkOnDraftOrders=Wasserzeichen auf Entwürfen von Aufträgen (keins, wenn leer)
+ShippableOrderIconInList=In Auftragsliste ein entsprechendes Icon zufügen, wenn die Bestellung versandbereit ist
##### Clicktodial #####
ClickToDialSetup=Click-to-Dial Moduleinstellungen
ClickToDialUrlDesc=Definieren Sie hier die URL, die bei einem Klick auf das Telefonsymbol aufgerufen werden soll. In dieser URL können Sie Tags verwenden<br><b>%%1$s</b> wird durch die Telefonnummer des Angerufenen ersetzt<br><b>%%2$s</b> wird durch die Telefonnummer des Anrufers (Ihre) ersetzt<br><b>%%3$s</b> wird durch Ihren Benutzernamen für Click-to-Dial ersetzt (siehe Benutzerdatenblatt)<br><b>%%4$s</b> wird durch Ihr Click-to-Dial-Passwort ersetzt (siehe Benutzerdatenblatt).
@@ -1158,9 +1160,9 @@ FicheinterNumberingModules=Intervention Nummerierung Module
TemplatePDFInterventions=Intervention Karte Dokumenten Modelle
WatermarkOnDraftInterventionCards=Wasserzeichen auf Interventionskarte Dokumente (keins, wenn leer)
##### Contracts #####
-ContractsSetup=Verträge Modul Setup
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=Verträge Nummerierung Module
-TemplatePDFContracts=Contracts documents models
+TemplatePDFContracts=Vertragsvorlagen
FreeLegalTextOnContracts=Freier Text auf Verträgen
WatermarkOnDraftContractCards=Wasserzeichen auf Entwürfen von Verträgen (keins, wenn leer)
##### Members #####
@@ -1314,7 +1316,7 @@ MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found
MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
OPCodeCache=OPCode cache
NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
+HTTPCacheStaticResources=HTTP Cache für statische Ressourcen (CSS, img, Javascript)
FilesOfTypeCached=Dateien vom Typ %s werden vom HTTP Server zwischengespeichert
FilesOfTypeNotCached=Dateien vom Typ %s werden vom HTTP Server nicht zwischengespeichert
FilesOfTypeCompressed=Dateien vom Typ %s werden vom HTTP Server komprimiert
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Dateien vom Typ %s werden vom HTTP Server nicht komprim
CacheByServer=Vom Server zwischengespeichert
CacheByClient=Vom Browser zwischengespeichert
CompressionOfResources=Komprimierung von HTTP Antworten
-TestNotPossibleWithCurrentBrowsers=Automatische Erkennung nicht möglich
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=Produktmoduleinstellungen
ServiceSetup=Dienstleistungen Modul Setup
@@ -1337,7 +1339,7 @@ UseSearchToSelectProduct=Suchfeld statt Listenansicht für die Produktauswahl ve
UseEcoTaxeAbility=Umweltabgaben unterstüzten
SetDefaultBarcodeTypeProducts=Standard-Barcode-Typ für Produkte
SetDefaultBarcodeTypeThirdParties=Standard-Barcode-Typ für Partner
-ProductCodeChecker= Module for product code generation and checking (product or service)
+ProductCodeChecker= Modul für Produktcode-Erstellung und -Überprüfung (Produkt oder Service)
ProductOtherConf= Konfiguration Produkt-/Services
##### Syslog #####
SyslogSetup=Protokollierungsmodul-Einstellungen
@@ -1368,7 +1370,7 @@ BarcodeDescISBN=Barcode vom Typ ISBN
BarcodeDescC39=Barcode vom Typ C39
BarcodeDescC128=Barcode vom Typ C128
GenbarcodeLocation=Kommandozeilen-Tool zur Barcode-Generierung (von phpbarcode-Engine verwendet)
-BarcodeInternalEngine=Internal engine
+BarcodeInternalEngine=interne Engine
BarCodeNumberManager=Manager to auto define barcode numbers
##### Prelevements #####
WithdrawalsSetup=Abbuchungseinstellungen
@@ -1382,9 +1384,10 @@ MailingSetup=E-Mail-Kampagnenmodul-Einstellungen
MailingEMailFrom=E-Mail-Absender (für ausgehende Mails) des E-Mail-Moduls
MailingEMailError=Antwort-E-Mail-Adresse für unzustellbare E-Mails
##### Notification #####
-NotificationSetup=Benachrichtigungsmoduleinstellungen
+NotificationSetup=E-Mail Benachrichtigungs-Einstellungen
NotificationEMailFrom=E-Mail-Absender (für ausgehende Mails) des Benachrichtigungsmoduls
-ListOfAvailableNotifications=Liste der verfügbaren Meldungen (Diese Liste ist abhängig von aktivierten Module)
+ListOfAvailableNotifications=Liste der möglichen Benachrichtigungen, entweder pro Partner (in der Partner-Karte einzustellen) oder mit einer festen Mail-Adresse (Inhalt der Liste hängt ab von den aktivierten Modulen)
+FixedEmailTarget=Festes E-Mail-Ziel
##### Sendings #####
SendingsSetup=Versandmoduleinstellungen
SendingsReceiptModel=Versandbelegsvorlage
@@ -1405,15 +1408,16 @@ FCKeditorForProduct=WYSIWIG Erstellung/Bearbeitung von Produkt-/Serviceinformati
FCKeditorForProductDetails=WYSIWIG Erstellung/Bearbeitung der Produktdetails für alle Dokumente (Angebote, Bestellungen, Rechnungen, etc. ..) <br>Achtung: Diese Option kann bei der Erstellung von PDF-Dokumenten zu Fehlern führen und ist deshalb nicht empfohlen.
FCKeditorForMailing= WYSIWIG Erstellung/Bearbeitung von E-Mails
FCKeditorForUserSignature=WYSIWIG Erstellung/Bearbeitung von Benutzer-Signaturen
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Outils->eMailing)
+FCKeditorForMail=WYSIWYG Erstellung/Bearbeitung für gesamte Mail (außer Werkzeuge->eMailing)
##### OSCommerce 1 #####
OSCommerceErrorConnectOkButWrongDatabase=Datenbank-Verbindung erfolgreich, es scheint sich allerdings nicht um eine OSCommerce-Datenbank zu handeln (Key %s nicht gefunden in der Tabelle %s).
OSCommerceTestOk=Verbindung zum Server '%s' für Datenbank '%s' mit Benutzer '%s' erfolgreich.
OSCommerceTestKo1=Verbindung zum Server '%s' erfolgreich, aber Datenbank '%s' konnte nicht erreicht werden.
OSCommerceTestKo2=Verbindung zum Server '%s' mit dem Benutzer '%s' fehlgeschlagen.
##### Stock #####
-StockSetup=Lagermoduleinstellungen
-UserWarehouse=Persönliche Benutzerlagerstände verwenden
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=Menü gelöscht
TreeMenu=Baumansicht
@@ -1448,8 +1452,8 @@ ConfirmDeleteLine=Möchten Sie diese Zeile wirklich löschen?
##### Tax #####
TaxSetup=Steuer-, Sozialbeitrags- und Dividendenmodul-Einstellungen
OptionVatMode=MwSt. fällig
-OptionVATDefault=Cash basis
-OptionVATDebitOption=Accrual basis
+OptionVATDefault=Barbestandsbasis
+OptionVATDebitOption=Rückstellungsbasis
OptionVatDefaultDesc=Mehrwertsteuerschuld entsteht: <br>- Bei Lieferung/Zahlung für Waren<br>- Bei Zahlung für Dienstleistungen
OptionVatDebitOptionDesc=Mehrwertsteuerschuld entsteht: <br>- Bei Lieferung/Zahlung für Waren<br>- Bei Rechnungslegung (Lastschrift) für Dienstleistungen
SummaryOfVatExigibilityUsedByDefault=Standardmäßiger Zeitpunkt der MwSt.-Fälligkeit in Abhängigkeit zur derzeit gewählten Option:
@@ -1470,19 +1474,22 @@ AgendaSetup=Agenda-Moduleinstellungen
PasswordTogetVCalExport=Passwort für den VCal-Export
PastDelayVCalExport=Keine Termine exportieren die älter sind als
AGENDA_USE_EVENT_TYPE=Use events types (managed into menu Setup -> Dictionary -> Type of agenda events)
-AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view
-AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
+AGENDA_DEFAULT_FILTER_TYPE=Diesen Ereignistyp automatisch in den Suchfilter für die Agenda-Ansicht übernehmen
+AGENDA_DEFAULT_FILTER_STATUS=Diesen Ereignisstatus automatisch in den Suchfilter für die Agenda-Ansicht übernehmen
AGENDA_DEFAULT_VIEW=Welchen Reiter möchten Sie beim Öffnen der Agenda automatisch anzeigen
##### ClickToDial #####
ClickToDialDesc=Dieses Modul fügt ein Symbols nach Telefonnummern ein, bei dessen der Server unter der unten definierten URL aufgerufen wird. Diese Funktion können Sie dazu verwenden, ein Callcenter-System innerhalb dolibarrs aufzurufen, das eine Telefonnummer z.B. über ein SIP-System, für Sie wählt.
##### Point Of Sales (CashDesk) #####
CashDesk=Point of Sales
CashDeskSetup=Kassenmoduleinstellungen
-CashDeskThirdPartyForSell=Standardpartner für Kassenverkäufe (erforderlich)
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Standard-Bargeldkonto für Kassenverkäufe (erforderlich)
CashDeskBankAccountForCheque= Finanzkonto für Scheckeinlösungen
CashDeskBankAccountForCB= Finanzkonto für die Einlösung von Bargeldzahlungen via Kreditkarte
-CashDeskIdWareHouse=Standard-Warenlager für Kassenverkauf (optional)
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Lesezeichenmoduleinstellungen
BookmarkDesc=Dieses Modul ermöglicht die Verwaltung von Lesezeichen. Außerdem können Sie hiermit Verknüpfungen zu internen und externen Seiten im linken Menü anlegen.
@@ -1519,14 +1526,14 @@ ProjectsNumberingModules=Projektnumerierungsmodul
ProjectsSetup=Projekteinstellungenmodul
ProjectsModelModule=Projektvorlagenmodul
TasksNumberingModules=Aufgaben-Nummerierungs-Modul
-TaskModelModule=Tasks reports document model
+TaskModelModule=Vorlage für Arbeitsberichte
##### ECM (GED) #####
ECMSetup = GED Setup
ECMAutoTree = Automatic tree folder and document
##### Fiscal Year #####
FiscalYears=Fiskalische Jahre
FiscalYear=Fiskalisches Jahr
-FiscalYearCard=Fiscal year card
+FiscalYearCard=Karte für das Geschäftsjahr
NewFiscalYear=Neues fiskalisches Jahr
EditFiscalYear=Fiskalisches Jahr bearbeiten
OpenFiscalYear=Fiskalisches Jahr öffnen
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Fiskalisches Jahr löschen
ConfirmDeleteFiscalYear=Möchten Sie dieses fiskalische Jahr wirklich löschen?
Opened=Geöffnet
Closed=Geschlossen
-
+AlwaysEditable=kann immer bearbeitet werden
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Mindestanzahl Großbuchstaben
+NbNumMin=Mindestanzahl Ziffern
+NbSpeMin=Mindestanzahl Sonderzeichen
+NbIteConsecutive=Maximale Anzahl sich wiederholender Zeichen
+NoAmbiCaracAutoGeneration=Verwende keine mehrdeutigen Zeichen ("1", "l", "i", "|", "0", "O") für die automatische Generierung
+SalariesSetup=Setup of module salaries
+SortOrder=Sortierreihenfolge
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
diff --git a/htdocs/langs/de_DE/agenda.lang b/htdocs/langs/de_DE/agenda.lang
index e0a35fc2f40059252aee171a8376955fa9967f33..1590b3464b31d943914ef257ec8972a3b56e87a5 100644
--- a/htdocs/langs/de_DE/agenda.lang
+++ b/htdocs/langs/de_DE/agenda.lang
@@ -7,7 +7,7 @@ Agendas=Tagesordnungen
Calendar=Kalender
Calendars=Kalender
LocalAgenda=Internetkalender
-ActionsOwnedBy=Event owned by
+ActionsOwnedBy=Maßnahme gehört
AffectedTo=Zugewiesen an
DoneBy=Erldedigt von
Event=Aktion
@@ -41,9 +41,10 @@ AutoActions= Automatische Befüllung der Tagesordnung
AgendaAutoActionDesc= Definieren Sie hier Termine zur automatischen Übernahme in den Terminkalender. Ist nichts aktviert (Standardmäßig), umfasst der Terminkalender nur manuell eingetragene Termine.
AgendaSetupOtherDesc= Diese Seite ermöglicht die Konfiguration anderer Parameter des Tagesordnungsmoduls.
AgendaExtSitesDesc=Diese Seite erlaubt Ihnen externe Kalender zu konfigurieren.
-ActionsEvents= Veranstaltungen zur automatischen Übernahme in die Agenda
-PropalValidatedInDolibarr= Angebot freigegeben
-InvoiceValidatedInDolibarr= Rechnung freigegeben
+ActionsEvents=Veranstaltungen zur automatischen Übernahme in die Agenda
+PropalValidatedInDolibarr=Angebot freigegeben
+InvoiceValidatedInDolibarr=Rechnung freigegeben
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=Rechnung %s in den Entwurf Status zurücksetzen
InvoiceDeleteDolibarr=Rechnung %s gelöscht
OrderValidatedInDolibarr= Bestellung %s freigegeben
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Bestellen %s genehmigt
OrderRefusedInDolibarr=Bestellung %s abgelehnt
OrderBackToDraftInDolibarr=Bestellen %s zurück nach Draft-Status
OrderCanceledInDolibarr=Auftrag storniert %s
-InterventionValidatedInDolibarr=Service %s freigegeben
ProposalSentByEMail=Angebot %s per E-Mail versendet
OrderSentByEMail=Kundenbestellung %s per E-Mail versendet
InvoiceSentByEMail=Kundenrechnung %s per E-Mail versendet
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=Lieferantenbestellung %s per E-Mail versendet
SupplierInvoiceSentByEMail=Lieferantenrechnung %s per E-Mail versendet
ShippingSentByEMail=Lieferschein %s per E-Mail versendet
ShippingValidated= Versand %s freigegeben
-InterventionSentByEMail=Service %s per E-Mail versendet
-InterventionClassifiedBilled=Eingriff %s als verrechnet eingestuft
NewCompanyToDolibarr= Partner erstellt
DateActionPlannedStart= Geplantes Startdatum
DateActionPlannedEnd= Geplantes Enddatum
@@ -72,7 +70,7 @@ AgendaUrlOptions1=Sie können die Ausgabe über folgende Parameter filtern:
AgendaUrlOptions2=<b>login=%s</b> begrenzt die Ausgabe auf von Benutzer <b>%s</b> erstellte, betroffene oder erledigte Maßnahmen.
AgendaUrlOptions3=<b>logina=%s</b> begrenzt die Ausgabe auf von Benutzer <b>%s</b> erstellte Maßnahmen.
AgendaUrlOptions4=<b>logint=%s</b> begrenzt die Ausgabe auf von Benutzer <b>%s</b> betroffene Maßnahmen.
-AgendaUrlOptions5=<b>logind=%s</b> begrenzt die Ausgabe auf von Benutzer <b>%s</b> erledigte Maßnahmen.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> begrenzt die die Ausgabe auf Maßnahmen im Zusammenhang mit Projekt <b>PROJECT_ID</b>.
AgendaShowBirthdayEvents=Zeige Geburtstage
AgendaHideBirthdayEvents=Geburtstage ausblenden
Busy=Besetzt
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=URL Adresse um .ical Datei zu erreichen
ExtSiteNoLabel=Keine Beschreibung
WorkingTimeRange=Arbeitszeit-Bereich
WorkingDaysRange=Arbeitstag-Bereich
-AddEvent=Add event
-MyAvailability=My availability
+AddEvent=Maßnahme erstellen
+MyAvailability=Meine Verfügbarkeit
diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang
index 9d3ce72112422a1e6445f615c399ca65bd207357..c6ff37f86a64d0637e289a65ca5b9b1787b013c1 100644
--- a/htdocs/langs/de_DE/bills.lang
+++ b/htdocs/langs/de_DE/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Gutschrift
InvoiceAvoirAsk=Gutschrift zur Rechnungskorrektur
InvoiceAvoirDesc=Eine <b>Gutschrift</b> ist eine negative Rechnung zur Begleichung von Wertdifferenzen zwischen Rechnungssummen und Zahlungseingängen (Zuviel bezahlt oder mangelhafte Lieferung).
invoiceAvoirWithLines=Neue Gutschrift mit den Positionen der Ursprungs-Rechnung
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
-invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake
+invoiceAvoirWithPaymentRestAmount=Gutschrift über den Restbetrag der Originalrechnung erstellen
+invoiceAvoirLineWithPaymentRestAmount=Gutschrift über den Restbetrag der Originalrechnung
ReplaceInvoice=Ersetze Rechnung %s
ReplacementInvoice=Ersatzrechnung
ReplacedByInvoice=Ersetzt durch Rechnung %s
@@ -137,8 +137,6 @@ BillFrom=Von
BillTo=An
ActionsOnBill=Maßnahmen zu dieser Rechnung
NewBill=Neue Rechnung
-Prélèvements=Dauerauftrag
-Prélèvements=Dauerauftrag
LastBills=%s neueste Rechnungen
LastCustomersBills=%s neueste Kundenrechnungen
LastSuppliersBills=Letzte %s Lieferantenrechnungen
@@ -156,9 +154,9 @@ ConfirmCancelBill=Möchten Sie die Rechnung <b>%s</b> wirklich stornieren?
ConfirmCancelBillQuestion=Warum wollen Sie klassifizieren diese Rechnung "aufgegeben"?
ConfirmClassifyPaidPartially=Möchten Sie die Rechnung <b>%s</b> wirklich als 'teilweise bezahlt' markieren?
ConfirmClassifyPaidPartiallyQuestion=Diese Rechnung wurde nicht vollständig bezahlt. Was sind Gründe für das Schließen dieser Rechnung?
-ConfirmClassifyPaidPartiallyReasonAvoir=Der offene Zahlbetrag <b>( %s %s)</b> resultiert aus einem gewährten Skonto. Zur Korrektur der MwSt. lege ich eine Gutschrift an.
+ConfirmClassifyPaidPartiallyReasonAvoir=Der offene Zahlbetrag <b>( %s %s)</b> resultiert aus einem gewährten Skonto. Zur Korrektur der MwSt. wird eine Gutschrift angelegt.
ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Der offene Zahlbetrag <b>( %s %s)</b> resultiert aus einem gewährten Skonto. Ich akzeptiere den Verlust der MwSt. aus diesem Rabatt.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Der offene Zahlbetrag <b>( %s %s)</b> resultiert aus einem gewährten Skonto. Ich stelle die Mehrwertsteuer aus diesem Rabatt über eine Gutschrift wiederher.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Der offene Zahlbetrag <b>( %s %s)</b> resultiert aus einem gewährten Skonto. Die Mehrwertsteuer aus diesem Rabatt wird ohne Gutschrift wieder hergestellt.
ConfirmClassifyPaidPartiallyReasonBadCustomer=Kundenverschulden
ConfirmClassifyPaidPartiallyReasonProductReturned=Produkte teilweise retourniert
ConfirmClassifyPaidPartiallyReasonOther=Betrag aus anderen Gründen uneinbringlich
@@ -191,8 +189,8 @@ AlreadyPaid=Bereits bezahlt
AlreadyPaidBack=Bereits zurückbezahlt
AlreadyPaidNoCreditNotesNoDeposits=Bereits bezahlte (ohne Gutschriften und Einlagen)
Abandoned=Weggefallen
-RemainderToPay=Zu zahlender Restbetrag
-RemainderToTake=Einzuhebender Restbetrag
+RemainderToPay=Offener Zahlbetrag
+RemainderToTake=Verbleibender Restbetrag
RemainderToPayBack=Zurück zu zahlender Restbetrag
Rest=Ausstehend
AmountExpected=Höhe der Forderung
@@ -219,19 +217,18 @@ NoInvoice=Keine Rechnung
ClassifyBill=Rechnung einordnen
SupplierBillsToPay=Zu zahlende Lieferantenrechnungen
CustomerBillsUnpaid=Offene Kundenrechnungen
-DispenseMontantLettres=Automatisch generierte Dokumente unterliegen nicht den Formvorschriften eines Briefs.
-DispenseMontantLettres=Automatisch generierte Dokumente unterliegen nicht den Formvorschriften eines Briefs.
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=Nicht erstattungsfähig
SetConditions=Zahlungskonditionen einstellen
SetMode=Definiere Zahlungsart
Billed=In Rechnung gestellt
-RepeatableInvoice=Rechnungsvorlage
-RepeatableInvoices=Rechnungsvorlagen
+RepeatableInvoice=Rechnungs-Vorlage
+RepeatableInvoices=Rechnungs-Vorlagen
Repeatable=Vorlage
Repeatables=Vorlagen
-ChangeIntoRepeatableInvoice=In Rechnungsvorlage umwandeln
-CreateRepeatableInvoice=Erstelle Rechnungsvorlage
-CreateFromRepeatableInvoice=Aus Rechnungsvorlage erstellen
+ChangeIntoRepeatableInvoice=In Rechnungs-Vorlage umwandeln
+CreateRepeatableInvoice=Rechnungs-Vorlage erstellen
+CreateFromRepeatableInvoice=Aus Rechnungs-Vorlage erzeugen
CustomersInvoicesAndInvoiceLines=Kundenrechnungen und -positionen
CustomersInvoicesAndPayments=Kundenrechnungen und -zahlungen
ExportDataset_invoice_1=Kundenrechnungen und -positionen
diff --git a/htdocs/langs/de_DE/categories.lang b/htdocs/langs/de_DE/categories.lang
index a42f68d2cc62ee161d1fe9837e7492e8616ed1ee..a558ee04ff6c147899acdbdce9e4edc12e0bfeda 100644
--- a/htdocs/langs/de_DE/categories.lang
+++ b/htdocs/langs/de_DE/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Verbindung zwischen Lieferanten und Kategorien
CatCusLinks=Verbindung zwischen Kunden-/Lead und Kategorien
CatProdLinks=Verbindungen zwischen Produkten/Services und Kategorien
CatMemberLinks=Verbindung zwischen Mitgliedern und Kategorien
-CatProdLinks=Verbindungen zwischen Produkten/Services und Kategorien
-CatCusLinks=Verbindung zwischen Kunden-/Lead und Kategorien
-CatSupLinks=Verbindung zwischen Lieferanten und Kategorien
DeleteFromCat=Aus Kategorie entfernen
DeletePicture=Bild löschen
ConfirmDeletePicture=Bild wirklich löschen?
@@ -111,4 +108,5 @@ ExtraFieldsCategories=Ergänzende Attribute
CategoriesSetup=Kategorien Setup
CategorieRecursiv=Automatisch mit übergeordneter Kategorie verbinden
CategorieRecursivHelp=Wenn aktiviert, wird das Produkt auch zur übergeordneten Kategorie zugewiesen, wenn es einer Unterkategorie zugewiesen wird
-AddProductServiceIntoCategory=Add the following product/service
+AddProductServiceIntoCategory=Folgendes Produkt/Dienstleistungen hinzufügen
+ShowCategory=Zeige Kategorie
diff --git a/htdocs/langs/de_DE/compta.lang b/htdocs/langs/de_DE/compta.lang
index 8ec57d4d0d94801cd7262c7f0f996955050de304..e1d23dec5011f16a60a0fd6b90b28289a6a4e42f 100644
--- a/htdocs/langs/de_DE/compta.lang
+++ b/htdocs/langs/de_DE/compta.lang
@@ -79,8 +79,8 @@ ListOfPayments=Liste der Zahlungen
ListOfCustomerPayments=Liste der Kundenzahlungen
ListOfSupplierPayments=Liste der Lieferantenzahlungen
DatePayment=Zahlungsdatum
-DateStartPeriod=Date start period
-DateEndPeriod=Date end period
+DateStartPeriod=Startdatum für Zeitraum
+DateEndPeriod=Enddatum für Zeitraum
NewVATPayment=Neue MwSt. Zahlung
newLT2PaymentES=Neue EKSt. Zahlung
newLT1PaymentES=New RE payment
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Kontierungscode ungültig für Kunden %s
SuppliersProductsSellSalesTurnover=Umsatz aus dem Verkauf von Waren dieses Lieferanten.
CheckReceipt=Scheck erhalten
CheckReceiptShort=Scheck erhalten
+LastCheckReceiptShort=Letzte %s Scheckeinnahmen
NewCheckReceipt=Neuen Scheck erhalten
NewCheckDeposit=Neue Check Hinterlegung
NewCheckDepositOn=Neue Scheckeinlösung auf Konto: %s
@@ -178,7 +179,7 @@ AddRemind=Verfügbare Menge zum Versenden
RemainToDivide= Noch zu Versenden :
WarningDepositsNotIncluded=Abschlagsrechnungen werden in dieser Version des Rechnungswesens nicht berücksichtigt.
DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
-Pcg_version=Pcg version
+Pcg_version=Pcg-Version
Pcg_type=Pcg type
Pcg_subtype=Pcg subtype
InvoiceLinesToDispatch=Invoice lines to dispatch
@@ -187,7 +188,7 @@ AccountancyDashboard=Rechnungswesen Zusammenfassung
ByProductsAndServices=Nach Produkten und Services
RefExt=Externe Referenz
ToCreateAPredefinedInvoice=Um eine vordefinierte Rechnung zu erzeugen, erstellen Sie eine Standard-Rechnung und klicken dann ohne Freigabe auf "In vordefinierte Rechnung umwandeln".
-LinkedOrder=Link to order
+LinkedOrder=Link zur Bestellung
ReCalculate=Neuberechnung
Mode1=Methode 1
Mode2=Methode 2
@@ -195,15 +196,15 @@ CalculationRuleDesc=Zur Berechnung der Gesamt-MwSt. gibt es zwei Methoden: <br>M
CalculationRuleDescSupplier=Wählen Sie die geeignete Methode, um zum gleichen Ergebnis wie Ihr Lieferant zu kommen.
TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
CalculationMode=Berechnungsmodus
-AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
-ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
+AccountancyJournal=Buchhaltungscode-Journal
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Standard-Aufwandskonto, um Produkte zu kaufen
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Standard-Erlöskonto, um Produkte zu verkaufen
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Standard-Aufwandskonto, um Dienstleistungen zu kaufen
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Standard-Erlöskonto, um Dienstleistungen zu verkaufen
+ACCOUNTING_VAT_ACCOUNT=Standard-Erlöskonto, um MwSt einzuziehen
+ACCOUNTING_VAT_BUY_ACCOUNT=Standard-Aufwandskonto, um MwSt zu bezahlen
ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
-CloneTaxForNextMonth=Clone it for next month
+CloneTax=Sozialbeitrag duplizieren
+ConfirmCloneTax=Bestätigung 'Sozialbeitrag duplizieren'
+CloneTaxForNextMonth=Für nächsten Monat duplizieren
diff --git a/htdocs/langs/de_DE/contracts.lang b/htdocs/langs/de_DE/contracts.lang
index 1e4e9eb888802a147c709e3b37f94864fe9001a5..bd84dd8ed7ef535f941500d708a9f2fc692dcbfc 100644
--- a/htdocs/langs/de_DE/contracts.lang
+++ b/htdocs/langs/de_DE/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Vertragsübersicht
ListOfContracts=Liste der Verträge
-LastContracts=%s zuletzt geänderte Verträge
+LastModifiedContracts=Last %s modified contracts
AllContracts=Alle Verträge
ContractCard=Vertragskarte
ContractStatus=Vertragsstatus
@@ -27,7 +27,7 @@ MenuRunningServices=Aktive Services
MenuExpiredServices=Abgelaufene Services
MenuClosedServices=Geschlossene Services
NewContract=Neuer Vertrag
-AddContract=Vertrag hinzufügen
+AddContract=Kontrakt erstellen
SearchAContract=Suche einen Vertrag
DeleteAContract=Löschen eines Vertrages
CloseAContract=Schließen eines Vertrages
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Liste der aktiven Vertragspositionen
ListOfRunningServices=Liste aktiver Services
NotActivatedServices=Inaktive Services (in freigegebenen Verträgen)
BoardNotActivatedServices=Zu aktivierende Services (in freigegebenen Verträgen)
-LastContracts=%s zuletzt geänderte Verträge
+LastContracts=Last % contracts
LastActivatedServices=%s zuletzt aktivierte Services
LastModifiedServices=%s zuletzt bearbeitete Services
EditServiceLine=Service-Position bearbeiten
diff --git a/htdocs/langs/de_DE/cron.lang b/htdocs/langs/de_DE/cron.lang
index a9dee5725e79c1ef6aaca7a167882b2ae4cdaa16..f63c423a33c5f7d9f795bb7e41c4786d8bd3cea9 100644
--- a/htdocs/langs/de_DE/cron.lang
+++ b/htdocs/langs/de_DE/cron.lang
@@ -1,22 +1,14 @@
# Dolibarr language file - Source file is en_US - cron
-#
# About page
-#
About = Über
CronAbout = Über Cron
CronAboutPage = Über cron Seite
-
-#
# Right
-#
Permission23101 = Lese geplante Aufgabe
Permission23102 = Erstelle/aktualisiere geplante Aufgabe
Permission23103 = Lösche geplante Aufgabe
Permission23104 = Führe geplante Aufgabe aus
-
-#
# Admin
-#
CronSetup= Jobverwaltungs-Konfiguration
URLToLaunchCronJobs=URL zum Prüfen und Starten von Cronjobs wenn nötig
OrToLaunchASpecificJob=Oder zum Prüfen und Starten von speziellen Jobs
@@ -24,20 +16,11 @@ KeyForCronAccess=Sicherheitsschlüssel für URL zum Starten von Cronjobs
FileToLaunchCronJobs=Kommandozeile zum Starten von Cronjobs
CronExplainHowToRunUnix=In Unix-Umgebungen sollte man crontab benutzen um die Kommandozeile jede Minute auszuführen
CronExplainHowToRunWin=In Microsoft(tm) Windows kannst Du die Aufgabenplanung benutzen um die Kommandozeile jede Minute aufzurufen
-
-
-#
# Menu
-#
CronJobs=Geplante Jobs
-CronListActive= Liste der aktiven Jobs
-CronListInactive= Liste der deaktivierten Jobs
-CronListActive= Liste der aktiven Jobs
-
-
-#
+CronListActive=List of active/scheduled jobs
+CronListInactive=Liste der deaktivierten Jobs
# Page list
-#
CronDateLastRun=Letzte Ausführung
CronLastOutput=Ausgabe der letzten Ausführung
CronLastResult=Letzter Resultatcode
@@ -70,10 +53,7 @@ CronLabel=Beschreibung
CronNbRun=Anzahl Starts
CronEach=Jede
JobFinished=Job gestarted und beendet
-
-#
#Page card
-#
CronAdd= Jobs hinzufügen
CronHourStart= Startzeit und -datum für Aufgabe
CronEvery= Und führe Aufgabe aus jeden
@@ -95,20 +75,12 @@ CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Doli
CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is <i>fecth</i>
CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
CronCommandHelp=Die auszuführende System-Kommandozeile
-
-#
# Info
-#
CronInfoPage=Information
-
-
-#
# Common
-#
CronType=Aufgaben-Typ
CronType_method=Aufrufmethode einer Dolibarr Class
CronType_command=Shell-Befehl
CronMenu=Cron
CronCannotLoadClass=Kann Klasse %s oder Object %s nicht laden
-
UseMenuModuleToolsToAddCronJobs=Rufe Menu "Home - Modules tools - Job Liste" auf um geplante Aufgaben zu sehen und zu verändern.
diff --git a/htdocs/langs/de_DE/donations.lang b/htdocs/langs/de_DE/donations.lang
index bf615dfa70f8234d7dfda6fe42dc7cea3b4c3fdb..7242670c4145327d63714084ea864743e7658f4d 100644
--- a/htdocs/langs/de_DE/donations.lang
+++ b/htdocs/langs/de_DE/donations.lang
@@ -4,7 +4,7 @@ Donations=Spenden
DonationRef=Spenden Referenz
Donor=Spender
Donors=Spender
-AddDonation=Spende hinzufügen
+AddDonation=Spende erstellen
NewDonation=Neue Spende
ShowDonation=Spenden anzeigen
DonationPromise=Zugesagte Spende
@@ -29,5 +29,10 @@ LastModifiedDonations=Letzten %s geänderten Spenden
SearchADonation=Spende suchen
DonationRecipient=Spenden Empfänger
ThankYou=Danke
-IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
-MinimumAmount=Minimum amount is %s
+IConfirmDonationReception=Der Empfänger bestätigt den Erhalt einer Spende in Höhe von
+MinimumAmount=Mindestbetrag ist %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Optionen für Frankreich
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/de_DE/externalsite.lang b/htdocs/langs/de_DE/externalsite.lang
index ec247b9a4f51b2149523897a3fe5faf5e0bd2106..e4afde906aceacbe3b36e161ce807a192ab37ec0 100644
--- a/htdocs/langs/de_DE/externalsite.lang
+++ b/htdocs/langs/de_DE/externalsite.lang
@@ -2,3 +2,4 @@
ExternalSiteSetup=Setup-Link zu einer externen URL
ExternalSiteURL=URL der externen Seite
ExternalSiteModuleNotComplete=Module ExternalSite wurde nicht richtig konfiguriert.
+ExampleMyMenuEntry=Mein Menü-Eintrag
diff --git a/htdocs/langs/de_DE/holiday.lang b/htdocs/langs/de_DE/holiday.lang
index 9253560a2af7564757b10924fc539f435f73c4ac..1a83603119df22d98356c982e4f012ee3af11258 100644
--- a/htdocs/langs/de_DE/holiday.lang
+++ b/htdocs/langs/de_DE/holiday.lang
@@ -1,13 +1,13 @@
# Dolibarr language file - Source file is en_US - holiday
HRM=Mitarbeiter
-Holidays=Leaves
-CPTitreMenu=Leaves
+Holidays=Urlaub
+CPTitreMenu=Urlaub
MenuReportMonth=Monatsauszug
-MenuAddCP=Make a leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
-NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
-NoCPforUser=You don't have any available day.
-AddCP=Make a leave request
+MenuAddCP=Urlaubs-Antrag einreichen
+NotActiveModCP=Sie müssen das Urlaubs-Modul aktivieren um diese Seite zu sehen.
+NotConfigModCP=Sie müssen das Modul Urlaub konfigurieren, um diese Seite zu sehen. Um dies zu tun, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;">klicken Sie bitte hier</a>.
+NoCPforUser=Sie haben keinen Anspruch auf Urlaub.
+AddCP=Urlaubs-Antrag einreichen
Employe=Mitarbeiter
DateDebCP=Urlaubsbeginn
DateFinCP=Urlaubsende
@@ -18,24 +18,24 @@ ApprovedCP=Genehmigt
CancelCP=Zurückgezogen
RefuseCP=Abgelehnt
ValidatorCP=genehmigt durch
-ListeCP=List of leaves
+ListeCP=Urlaubsliste
ReviewedByCP=Wird geprüft von
DescCP=Beschreibung
-SendRequestCP=Create leave request
-DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Edit balance of leaves
-UpdateAllCP=Update the leaves
-SoldeCPUser=Leaves balance is <b>%s</b> days.
+SendRequestCP=Urlaubs-Antrag erstellen
+DelayToRequestCP=Urlaubsanträge müssen mindestens <b>%s Tage</b> im voraus gestellt werden.
+MenuConfCP=Urlaubsliste bearbeiten
+UpdateAllCP=Urlaube aktualisieren
+SoldeCPUser=Feriensaldo ist <b>%s</b> Tage.
ErrorEndDateCP=Sie müssen ein End-Datum wählen, dass nach dem Start-Datum liegt.
ErrorSQLCreateCP=Ein SQL Fehler trat auf bei der Eerstellung von:
-ErrorIDFicheCP=An error has occurred, the leave request does not exist.
+ErrorIDFicheCP=Fehler aufgetreten: der Urlaubsantrag existiert nicht.
ReturnCP=Zurück zur vorherigen Seite
-ErrorUserViewCP=You are not authorized to read this leave request.
-InfosCP=Information of the leave request
+ErrorUserViewCP=Sie sind nicht berechtigt diesen Urlaubs-Antrag zu lesen.
+InfosCP=Hinweis zum Urlaubsantrag
InfosWorkflowCP=Information Workflow
RequestByCP=Beantragt von
-TitreRequestCP=Leave request
-NbUseDaysCP=Number of days of vacation consumed
+TitreRequestCP=Urlaubsantrag
+NbUseDaysCP=Anzahl genommene Urlaubstage
EditCP=Bearbeiten
DeleteCP=Lösche Gruppe
ActionValidCP=Freigeben
@@ -43,70 +43,69 @@ ActionRefuseCP=Ablehnen
ActionCancelCP=Abbrechen
StatutCP=Status
SendToValidationCP=Zur Überprüfung senden
-TitleDeleteCP=Delete the leave request
-ConfirmDeleteCP=Confirm the deletion of this leave request?
-ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
-CantCreateCP=You don't have the right to make leave requests.
-InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=Aktualisieren
-CantUpdate=You cannot update this leave request.
+TitleDeleteCP=Urlaubsantrag löschen
+ConfirmDeleteCP=Wollen Sie diesen Urlaubsantrag wirklich löschen?
+ErrorCantDeleteCP=Fehler: Sie haben nicht die Berechtigung, diesen Urlaubsantrag zu löschen.
+CantCreateCP=Sie haben nicht die Berechtigung Urlaub zu beantragen.
+InvalidValidatorCP=Sie müssen einen Vorgesetzten wählen, der Ihre Urlaubsanfrage genehmigt.
+CantUpdate=Sie können diesen Urlaubsantrag nicht aktualisieren
NoDateDebut=Sie müssen ein Startdatum wählen.
NoDateFin=Sie müssen ein Enddatum wählen.
-ErrorDureeCP=Ihr Antrag auf Ferien enthält keine Werktage.
+ErrorDureeCP=Ihr Urlaubsantrag enthält keine Werktage.
TitleValidCP=Urlaubsantrag genehmigen
-ConfirmValidCP=Are you sure you want to approve the leave request?
+ConfirmValidCP=Möchten Sie diesen Urlaubsantrag wirklich genehmigen?
DateValidCP=Datum genehmigt
-TitleToValidCP=Send leave request
-ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Ferienantrag ablehnen
-ConfirmRefuseCP=Are you sure you want to refuse the leave request?
+TitleToValidCP=Urlaubsantrag senden
+ConfirmToValidCP=Möchten Sie diesen Urlaubsantrag wirklich senden?
+TitleRefuseCP=Urlaubsantrag ablehnen
+ConfirmRefuseCP=Möchten Sie diesen Urlaubsantrag wirklich ablehnen?
NoMotifRefuseCP=Sie müssen einen Grund für die Ablehnung angeben.
-TitleCancelCP=Ferienantrag abbrechen
-ConfirmCancelCP=Are you sure you want to cancel the leave request?
+TitleCancelCP=Urlaubsantrag stornieren
+ConfirmCancelCP=Möchten Sie diesen Urlaubsantrag wirklich stornieren?
DetailRefusCP=Ablehnungsgrund
DateRefusCP=Datum der Ablehnung
DateCancelCP=Datum der Absage
DefineEventUserCP=Assign an exceptional leave for a user
-addEventToUserCP=Assign leave
+addEventToUserCP=Urlaub zuweisen
MotifCP=Grund
UserCP=Benutzer
ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of leave requests
+MenuLogCP=Zeige Logdaten zu Urlaubsanträgen
LogCP=Log of updates of available vacation days
ActionByCP=Ausgeführt von
UserUpdateCP=Für den Benutzer
PrevSoldeCP=Vorherige Übersicht
NewSoldeCP=Neue Übersicht
-alreadyCPexist=Ein Ferienantrag wurde für diese Periode bereits erstellt.
+alreadyCPexist=Ein Urlaubsantrag wurde für diese Periode bereits erstellt.
UserName=Nachname
Employee=Angestellter
-FirstDayOfHoliday=First day of vacation
-LastDayOfHoliday=Last day of vacation
+FirstDayOfHoliday=Erster Urlaubstag
+LastDayOfHoliday=Letzter Urlaubstag
HolidaysMonthlyUpdate=Monatliches Update
ManualUpdate=Manuelles Update
HolidaysCancelation=Leave request cancelation
## Configuration du Module ##
-ConfCP=Konfiguration des Ferienmoduls
+ConfCP=Konfiguration des Urlaubsmoduls
DescOptionCP=Beschreibung der Wahlmöglichkeit
ValueOptionCP=Warenwert
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Gruppe mit der Berechtigung Urlaub zu bewilligen
ConfirmConfigCP=Konfiguration bestätigen
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
UpdateConfCPOK=Erfolgreich bearbeitet.
ErrorUpdateConfCP=Ein Fehler trat beim Bearbeiten auf, bitte nochmals versuchen.
-AddCPforUsers=Please add the balance of holidays of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Letzter Termin für Ferienanträge
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
+AddCPforUsers=Bitte geben Sie die Anzahl Urlaubstage der Benutzer an, <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">indem Sie hier klicken</a>.
+DelayForSubmitCP=Letztmöglicher Termin für Urlaubsanträge
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
-nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
-Module27130Name= Management of leave requests
-Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+nbUserCP=Anzahl unterstützter Benutzer im Urlaubsmodul
+nbHolidayDeductedCP=Anzahl Urlaubstage, die für jeden genommenen Ferientag abgezogen werden
+nbHolidayEveryMonthCP=Anzahl hinzugefügter Urlaubstage pro Monat
+Module27130Name= Verwaltung von Urlaubsanträgen
+Module27130Desc= Verwaltung von Urlaubsanträgen
+TitleOptionMainCP=Wichtigste Urlaubs-Einstellungen
TitleOptionEventCP=Settings of leave requets for events
ValidEventCP=Freigeben
UpdateEventCP=Maßnahmen aktualisieren
@@ -127,23 +126,23 @@ UpdateEventOptionCP=Aktualisieren
ErrorMailNotSend=Ein Fehler ist beim EMail-Senden aufgetreten:
NoCPforMonth=Kein Urlaub diesen Monat
nbJours=Anzahl der Tage
-TitleAdminCP=Configuration of Leaves
+TitleAdminCP=Konfiguration der Urlaube
#Messages
Hello=Hallo
-HolidaysToValidate=Validate leave requests
-HolidaysToValidateBody=Below is a leave request to validate
-HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
-HolidaysValidated=Validated leave requests
-HolidaysValidatedBody=Your leave request for %s to %s has been validated.
-HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled leaved request
-HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
-Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
+HolidaysToValidate=Genehmige Urlaubsanträge
+HolidaysToValidateBody=Es folgt ein Urlaubsantrag zur Freigabe
+HolidaysToValidateDelay=Dieser Urlaub wird in weniger als %s Tagen stattfinden.
+HolidaysToValidateAlertSolde=Der Einreicher dieses Urlaubsantrags besitzt nicht mehr genügend verfügbare Tage.
+HolidaysValidated=Genehmigte Urlaubsanträge
+HolidaysValidatedBody=Ihr Antrag auf Urlaub von %s bis %s wurde bewilligt.
+HolidaysRefused=Anfrage abgelehnt
+HolidaysRefusedBody=Ihr Antrag auf Urlaub von %s bis %s wurde aus folgendem Grund abgelehnt:
+HolidaysCanceled=Urlaubsantrag storniert
+HolidaysCanceledBody=Ihr Antrag auf Urlaub von %s bis %s wurde storniert.
+Permission20000=Eigene Urlaubsanträge einsehen
+Permission20001=Erstellen/Ändern Ihrer Urlaubsanträge
+Permission20002=Anlegen/Ändern der Urlaube für alle
+Permission20003=Urlaubsanträge löschen
+Permission20004=Bestimme die verfügbaren Urlaubstage des Benutzers
Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Permission20006=Monatlichen Urlaubsbericht einsehen
diff --git a/htdocs/langs/de_DE/interventions.lang b/htdocs/langs/de_DE/interventions.lang
index 7229a18531c8c219e6d810d5608abffd4b916003..e17e1c339db341e0873a4e108739cf310fa540a1 100644
--- a/htdocs/langs/de_DE/interventions.lang
+++ b/htdocs/langs/de_DE/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Eingriff
Interventions=Eingriffe
InterventionCard=Eingriffskarte
NewIntervention=Neuer Eingriff
-AddIntervention=Eingriffsstelle hinzufügen
+AddIntervention=Eingriff erstellen
ListOfInterventions=Liste der Eingriffe
EditIntervention=Eingriff bearbeiten
ActionsOnFicheInter=Aktionen zum Eingriff
@@ -24,12 +24,21 @@ NameAndSignatureOfInternalContact=Name und Unterschrift des internen Kontakts:
NameAndSignatureOfExternalContact=Name und Unterschrift des Kunden:
DocumentModelStandard=Standard-Dokumentvorlage für Eingriffe
InterventionCardsAndInterventionLines=Eingriffe und Eingriffszeilen
-InterventionClassifyBilled=Classify "Billed"
-InterventionClassifyUnBilled=Classify "Unbilled"
+InterventionClassifyBilled=Eingeordnet "Angekündigt"
+InterventionClassifyUnBilled=Als "nicht verrechnet" markieren
StatusInterInvoiced=Angekündigt
RelatedInterventions=Verbundene Eingriffe
ShowIntervention=Zeige Eingriffe
SendInterventionRef=Einreichung von Eingriffen %s
+SendInterventionByMail=Eingriff per E-Mail versenden
+InterventionCreatedInDolibarr=Eingriff %s erstellt
+InterventionValidatedInDolibarr=Eingriff %s freigegeben
+InterventionModifiedInDolibarr=Eingriff %s geändert
+InterventionClassifiedBilledInDolibarr=Eingriff %s als verrechnet eingestuft
+InterventionClassifiedUnbilledInDolibarr=Eingriff %s als nicht verrechnet eingestuft
+InterventionSentByEMail=Eingriff %s per E-Mail versandt
+InterventionDeletedInDolibarr=Eingriff %s gelöscht
+SearchAnIntervention=Eingriff suchen
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Eingriffsnachverfolgung durch Vertreter
TypeContact_fichinter_internal_INTERVENING=Eingriff läuft
diff --git a/htdocs/langs/de_DE/mails.lang b/htdocs/langs/de_DE/mails.lang
index 1364b70c808826dc5c85d165bea5af269bd0a2e2..881b4946d837afe3e15fc057cba3bf4e6bc23ecd 100644
--- a/htdocs/langs/de_DE/mails.lang
+++ b/htdocs/langs/de_DE/mails.lang
@@ -84,7 +84,7 @@ EachInvoiceWillBeAttachedToEmail=Ein Dokument mit der Standard-Vorlage für Rech
MailTopicSendRemindUnpaidInvoices=Zahlungserinnerung für Rechnung %s (%s)
SendRemind=Zahlungserinnerung per E-Mail senden
RemindSent=%s Erinnerung(en) gesendet
-AllRecipientSelectedForRemind=All thirdparties selected and if an email is set (note that one mail per invoice will be sent)
+AllRecipientSelectedForRemind=Alle Partner ausgewählt und wenn eine Email angegeben ist (beachten sie, dass eine Mail pro Rechnung geschickt wird)
NoRemindSent=Keine eMail-Erinnerung versandt
ResultOfMassSending=Ergebnis der Massen-eMail-Erinnerung
@@ -115,7 +115,7 @@ SentBy=Gesendet von
MailingNeedCommand=Aus Sicherheitsgründen sollten E-Mails von der Kommandozeile aus versandt werden. Bitten Sie Ihren Server Administrator um die Ausführung des folgenden Befehls, um den Versand an alle Empfänger zu starten:
MailingNeedCommand2=Sie können den Versand jedoch auch online starten, indem Sie den Parameter MAILING_LIMIT_SENDBYWEB auf den Wert der pro Sitzung gleichzeitig zu versendenden Mails setzen. Die entsprechenden Einstellungen finden Sie unter Übersicht-Einstellungen-Andere.
ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Aus Sicherheits- und Zeitüberschreitungsgründen ist der Online-Versand von E-Mails auf <b>%s</b> Empfänger je Sitzung beschränkt.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=Liste leeren
ToClearAllRecipientsClickHere=Klicken Sie hier, um die Empfängerliste zu leeren
ToAddRecipientsChooseHere=Fügen Sie Empfänger über die Listenauswahl hinzu
@@ -133,6 +133,9 @@ Notifications=Benachrichtigungen
NoNotificationsWillBeSent=Für dieses Ereignis und diesen Partner sind keine Benachrichtigungen geplant
ANotificationsWillBeSent=Eine Benachrichtigung wird per E-Mail versandt
SomeNotificationsWillBeSent=%s Benachrichtigungen werden per E-Mail versandt
-AddNewNotification=Aktivieren Sie eine neue E-Mail-Benachrichtigungsanfrage
-ListOfActiveNotifications=Liste aller aktiven E-Mail Benachrichtigungen
+AddNewNotification=Neues E-Mail-Beachrichtigungsziel aktivieren
+ListOfActiveNotifications=Liste aller aktiven E-Mail-Beachrichtigungsziele
ListOfNotificationsDone=Liste aller versandten E-Mail Benachrichtigungen
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
index 3df2b8c5409f462e24dd84c0c42dd5fd9abc16af..ddcf803555197dabd0bc5a19d025738db1f13efb 100644
--- a/htdocs/langs/de_DE/main.lang
+++ b/htdocs/langs/de_DE/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Kann Benutzer <b>%s</b> nicht aus der Syst
ErrorNoVATRateDefinedForSellerCountry=Keine MwSt.-Sätze für Verkäuferland '%s' definiert.
ErrorNoSocialContributionForSellerCountry=Für das Verkäuferland '%s' wurde kein Sozialbetrag definiert.
ErrorFailedToSaveFile=Fehler beim Speichern der Datei.
-ErrorOnlyPngJpgSupported=Fehler: Es werden nur Dateien im Format .jpg oder .png unterstützt.
-ErrorImageFormatNotSupported=Ihre PHP-Konfiguration unterstützt keine Konvertierungsfunktionen für dieses Bildformat.
SetDate=Datum
SelectDate=Wählen Sie ein Datum
SeeAlso=Siehe auch %s
BackgroundColorByDefault=Standard-Hintergrundfarbe
+FileNotUploaded=Datei wurde nicht hochgeladen
+FileUploaded=Datei wurde erfolgreich hochgeladen
FileWasNotUploaded=Ein Dateianhang wurde gewählt aber noch nicht hochgeladen. Klicken Sie auf "Datei anhängen" um den Vorgang zu starten.
NbOfEntries=Anzahl der Einträge
GoToWikiHelpPage=Zur Wiki-Hilfeseite (Internetzugang erforderlich)
@@ -266,6 +266,7 @@ Afternoon=Nachmittag
Quadri=vierfach
MonthOfDay=Tag des Monats
HourShort=H
+MinuteShort=mn
Rate=Rate
UseLocalTax=Mit MwSt.
Bytes=Bytes
@@ -340,6 +341,7 @@ FullList=Vollständige Liste
Statistics=Statistik
OtherStatistics=Weitere Statistiken
Status=Status
+Favorite=Favorit
ShortInfo=Info.
Ref=Nummer
RefSupplier=Lieferanten-Nr.
@@ -365,6 +367,7 @@ ActionsOnCompany=Maßnahmen zu diesem Partner
ActionsOnMember=Aktionen zu diesem Mitglied
NActions=%s Maßnahmen
NActionsLate=%s verspätete Maßnahmen
+RequestAlreadyDone=Request already recorded
Filter=Filter
RemoveFilter=Filter entfernen
ChartGenerated=Diagramm erstellt
@@ -508,7 +511,7 @@ NbOfCustomers=Anzahl der Kunden
NbOfLines=Anzahl der Positionen
NbOfObjects=Anzahl der Objekte
NbOfReferers=Anzahl der Verweise
-Referers=Refering objects
+Referers=Bezugnahmen
TotalQuantity=Gesamtmenge
DateFromTo=Von %s bis %s
DateFrom=Von %s
@@ -607,7 +610,7 @@ Notes=Hinweise
AddNewLine=Neue Zeile hinzufügen
AddFile=Datei hinzufügen
ListOfFiles=Liste verfügbarer Dateien
-FreeZone=Free entry
+FreeZone=Freier Text
FreeLineOfType=Free entry of type
CloneMainAttributes=Objekt mit Haupteigenschaften duplizieren
PDFMerge=PDFs verbinden
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Zusätzliche Attributeinstellungen
URLPhoto=URL für Foto/Bild
SetLinkToThirdParty=Link zu einem Partner
CreateDraft=Angebot erstellen
+SetToDraft=Auf Entwurf zurücksetzen
ClickToEdit=Klicken zum Bearbeiten
ObjectDeleted=Objekt %s gelöscht
ByCountry=Nach Land
@@ -677,8 +681,8 @@ AccountCurrency=Kontowährung
ViewPrivateNote=Zeige Notizen
XMoreLines=%s Zeile(n) versteckt
PublicUrl=Öffentliche URL
-AddBox=Add box
-
+AddBox=Box zufügen
+SelectElementAndClickRefresh=Wählen Sie ein Element und clicken Sie Aktualisieren
# Week day
Monday=Montag
Tuesday=Dienstag
diff --git a/htdocs/langs/de_DE/margins.lang b/htdocs/langs/de_DE/margins.lang
index 919b9f5202a64bc87cd20165287552bcfc3d4e57..33f2f2d402b6f192cf6c37e1070463fdca9b2cd8 100644
--- a/htdocs/langs/de_DE/margins.lang
+++ b/htdocs/langs/de_DE/margins.lang
@@ -10,7 +10,7 @@ MarkRate=Mark rate
DisplayMarginRates=Zeige Gewinnspannen-Raten an
DisplayMarkRates=Display mark rates
InputPrice=Eingabe Preis
-margin=Profit margins management
+margin=Gewinnspannen-Verwaltung
margesSetup=Profit margins management setup
MarginDetails=Details zu Gewinnspannen
ProductMargins=Produkt-Gewinnspannen
@@ -22,7 +22,7 @@ ChooseProduct/Service=Produkt oder Service wählen
StartDate=Vertragsbeginn
EndDate=Vertragsende
Launch=Start
-ForceBuyingPriceIfNull=Force buying price if null
+ForceBuyingPriceIfNull=Einkaufspreis erzwingen wenn Null
ForceBuyingPriceIfNullDetails=falls "AN", wird die Spanne der Zeile als Null angezeigt (Kaufpreis = Verkaufspreis), andernfalls ("AUS"), ist die Gewinnspanne gleich dem Verkaufspreis (Kaufpreis = 0)
MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
UseDiscountAsProduct=Als Produkt
@@ -38,4 +38,7 @@ BuyingCost=Kosten
UnitCharges=Unit charges
Charges=Charges
AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Setzen Sie fest welcher Kontakt-Typ (auf Rechnungen verknüpft) für Gewinnspannenbericht bei Handelsvertretern verwendet wird.
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/de_DE/orders.lang b/htdocs/langs/de_DE/orders.lang
index 8d4ea51c343ccaf91be2e27bf12394b8ec5ff048..0260b5de948f882bb29027a6c10fac4b7ccfc0cf 100644
--- a/htdocs/langs/de_DE/orders.lang
+++ b/htdocs/langs/de_DE/orders.lang
@@ -53,7 +53,7 @@ ShippingExist=Eine Sendung ist vorhanden
DraftOrWaitingApproved=Entwurf oder genehmigt, noch nicht bestellt
DraftOrWaitingShipped=Entwurf oder bestätigt, noch nicht versandt
MenuOrdersToBill=Bestellverrechnung
-MenuOrdersToBill2=Zu verrechnende Bestellungen
+MenuOrdersToBill2=Billable orders
SearchOrder=Suche Bestellung
SearchACustomerOrder=Kundenauftrag suchen
ShipProduct=Produkt versenden
@@ -65,7 +65,7 @@ ValidateOrder=Bestellung freigeben
UnvalidateOrder=Unbestätigte Bestellung
DeleteOrder=Bestellung löschen
CancelOrder=Bestellung verwerfen
-AddOrder=Bestellung hinzufügen
+AddOrder=Bestellung anlegen
AddToMyOrders=Zu meinen Bestellungen hinzufügen
AddToOtherOrders=Zu Bestellungen Anderer hinzufügen
AddToDraftOrders=Zu Bestellentwurf hinzufügen
@@ -151,10 +151,9 @@ OrderByFax=Fax
OrderByEMail=E-Mail
OrderByWWW=Online
OrderByPhone=Telefon
-CreateInvoiceForThisCustomer=Bill orders
+CreateInvoiceForThisCustomer=Bestellung verrechnen
NoOrdersToInvoice=Keine Bestellungen Rechnungsfähig
CloseProcessedOrdersAutomatically=Markiere alle ausgewählten Bestellungen als "verarbeitet".
-MenuOrdersToBill2=Zu verrechnende Bestellungen
OrderCreation=Erstellen einer Bestellung
Ordered=Bestellt
OrderCreated=Ihre Bestellungen wurden erstellt
diff --git a/htdocs/langs/de_DE/oscommerce.lang b/htdocs/langs/de_DE/oscommerce.lang
deleted file mode 100644
index 34dd883614a04db8efb1b30e2761313d4ca0a7e9..0000000000000000000000000000000000000000
--- a/htdocs/langs/de_DE/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OSCommerce
-OSCommerceSetup=OSCommerce-Modul Einstellungen
-OSCommerceSetupSaved=OSCommerce-Einstellungen gespeichert
-OSCommerceServer=OSCommerce Server Host/IP
-OSCommerceDatabaseName=OSCommerce Datenbankname
-OSCommercePrefix=OSCommerce Tabellen-Präfix
-OSCommerceUser=OSCommerce Datenbank Login
diff --git a/htdocs/langs/de_DE/other.lang b/htdocs/langs/de_DE/other.lang
index 4748242e9fc30e5b7dd657e9afc6270c44940c7b..99ba2d2cf4c4d0e8ea9d8eb53a625a0f2713bbaf 100644
--- a/htdocs/langs/de_DE/other.lang
+++ b/htdocs/langs/de_DE/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=Sicherheitsschlüssel
Calendar=Kalender
-AddTrip=Reise hinzufügen
Tools=Werkzeuge
ToolsDesc=Dieser Bereich ist bestimmt für die Gruppe "Verschiedenes" und nicht in andern Menüeinträgen verfügbar.<br /><br /> Diese Tools können Sie über das Menü auf dieser Seite erreichen.
Birthday=Geburtstag
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Projekt-Erstellung
Notify_TASK_CREATE=Aufgabe erstellt
Notify_TASK_MODIFY=Aufgabe geändert
Notify_TASK_DELETE=Aufgabe gelöscht
+SeeModuleSetup=See module setup
NbOfAttachedFiles=Anzahl der angehängten Dateien/okumente
TotalSizeOfAttachedFiles=Gesamtgröße der angehängten Dateien/Dokumente
MaxSize=Maximalgröße
@@ -57,14 +57,14 @@ Miscellaneous=Verschiedenes
NbOfActiveNotifications=Anzahl aktiver Benachrichtigungen
PredefinedMailTest=Dies ist ein Test-Mail.\n Die beiden Zeilen sind durch eine Zeilenschaltung getrennt.
PredefinedMailTestHtml=Dies ist ein (HTML)-<b>Test</b> Mail (das Wort Test muss in Fettschrift erscheinen). <br> Die beiden Zeilen sollteb durch eine Zeilenschaltung getrennt sein.
-PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ \n\n Anbei erhalten Sie die Rechnung __ FACREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__
+PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ \n\n Anbei erhalten Sie die Rechnung __FACREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ \n\n Bedauerlicherweise scheint die Rechnung __FACREF__ bislang unbeglichen. Als Erinnerung übersenden wir Ihnen diese nochmals im Anhang.\n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__ \n\n Bitte entnehmen Sie dem Anhang unser Angebot __PROPREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__ \n\n Bitte entnehmen Sie dem Anhang die Bestellung __ORDERREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ \n\n Bitte entnehmen Sie dem Anhang die Bestellung __ORDERREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ \n\n Anbei erhalten Sie die Rechnung __ FACREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__
PredefinedMailContentSendShipping=__CONTACTCIVNAME__ \n\n Als Anlage erhalten Sie unsere Lieferung __ SHIPPINGREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__
-PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendFichInter=__CONTACTCIVNAME__ \n\n Anbei finden Sie die Intervention __ FICHINTERREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__
PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
DemoDesc=Bei Dolibarr handelt es sich um ein kompaktes ERP/CRM-System, bestehend aus einzelnen Modulen. Da eine Demo aller Module kaum eine praxisnahe Anwendung darstellt, stehen Ihnen unterschiedliche Demo-Profile zur Verfügung.
ChooseYourDemoProfil=Bitte wählen Sie das Demo-Profil das Ihrem Berufsfeld am ehesten entspricht
@@ -80,6 +80,16 @@ ModifiedBy=Bearbeitet von %s
ValidatedBy=Freigegeben von %s
CanceledBy=Storniert von %s
ClosedBy=Geschlossen von %s
+CreatedById=Erstellt von User-ID
+ModifiedById=letzte Änderung von User-ID
+ValidatedById=Freigabe durch User-ID
+CanceledById=Storno durch User-ID
+ClosedById=geschlossen von User-ID
+CreatedByLogin=Erstellt von User
+ModifiedByLogin=letzte Änderung durch User
+ValidatedByLogin=Freigabe durch User
+CanceledByLogin=Storno durch User
+ClosedByLogin=geschlossen von User
FileWasRemoved=Datei wurde entfernt
DirWasRemoved=Verzeichnis wurde entfernt
FeatureNotYetAvailableShort=Verfügbar ab der nächsten Versionen
@@ -122,7 +132,7 @@ VolumeUnitdm3=dm³
VolumeUnitcm3=cm³
VolumeUnitmm3=mm³
VolumeUnitfoot3=ft3
-VolumeUnitinch3=in3
+VolumeUnitinch3=in 3
VolumeUnitounce=Unze
VolumeUnitlitre=Liter
VolumeUnitgallon=Gallone
@@ -133,7 +143,7 @@ SizeUnitcm=cm
SizeUnitmm=mm
SizeUnitinch=Zoll
SizeUnitfoot=Fuß
-SizeUnitpoint=point
+SizeUnitpoint=Punkt
BugTracker=Fehlerverfolgung (Bug-Tracker)
SendNewPasswordDesc=Über dieses Formular können Sie sich ein neues Passwort zusenden lassen.<br>Die Änderungen an Ihrem Passwort werden erst wirksam, wenn Sie auf den im Mail enthaltenen Bestätigungslink klicken. <br> Überprüfen Sie den Posteingang Ihrer E-Mail-Anwendung.
BackToLoginPage=Zurück zur Anmeldeseite
@@ -193,16 +203,17 @@ ForgetIfNothing=Wenn Sie diese Änderung nicht beantragt haben, löschen Sie ein
##### Calendar common #####
AddCalendarEntry=Neuer Eintrag im Kalender %s
-NewCompanyToDolibarr=Partner %s hinzugefügt
+NewCompanyToDolibarr=Firma %s zugefügt
ContractValidatedInDolibarr=Vertrag %s freigegeben
ContractCanceledInDolibarr=Vertrag %s storniert
ContractClosedInDolibarr=Vertrag %s geschlossen
PropalClosedSignedInDolibarr=Angebot %s unterschrieben
PropalClosedRefusedInDolibarr=Angebot %s abgelehnt
PropalValidatedInDolibarr=Angebot %s freigegeben
+PropalClassifiedBilledInDolibarr=Angebot %s als verrechnet eingestuft
InvoiceValidatedInDolibarr=Rechnung %s freigegeben
InvoicePaidInDolibarr=Rechnung %s bezahlt
-InvoiceCanceledInDolibarr=Rechnung %s storniet
+InvoiceCanceledInDolibarr=Rechnung %s storniert
PaymentDoneInDolibarr=Zahlung %s erfolgt
CustomerPaymentDoneInDolibarr=Kundenzahlung %s erfolgt
SupplierPaymentDoneInDolibarr=Lieferantenzahlung %s erfolgt
@@ -211,7 +222,7 @@ MemberResiliatedInDolibarr=Mitglied %s aufgehoben
MemberDeletedInDolibarr=Mitglied %s gelöscht
MemberSubscriptionAddedInDolibarr=Abonnement für Mitglied %s hinzugefügt
ShipmentValidatedInDolibarr=Versand %s in Dolibarr geprüft
-ShipmentDeletedInDolibarr=Versand %s gelöscht von Dolibarr
+ShipmentDeletedInDolibarr=Sendung %s gelöscht
##### Export #####
Export=Export
ExportsArea=Exportübersicht
diff --git a/htdocs/langs/de_DE/paybox.lang b/htdocs/langs/de_DE/paybox.lang
index a1125e0e77cd193dca6de73951a33a597c4ed7f5..96ab7031e2bcd13cc3c04ed08c24c0f78b11e6e8 100644
--- a/htdocs/langs/de_DE/paybox.lang
+++ b/htdocs/langs/de_DE/paybox.lang
@@ -35,3 +35,6 @@ MessageKO=Nachrichtenseite für abgebrochene Zahlung
NewPayboxPaymentReceived=Neue Paybox-Zahlung erhalten
NewPayboxPaymentFailed=Neue Paybox-Zahlungen probiert, aber fehlgeschlagen
PAYBOX_PAYONLINE_SENDEMAIL=Status-Email nach einer Zahlung (erfolgreich oder nicht)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang
index f20fbf915e998c25d608a5a49da78df95d8b12bb..3569bc378b69816f0b92515f75143e610d5658ed 100644
--- a/htdocs/langs/de_DE/projects.lang
+++ b/htdocs/langs/de_DE/projects.lang
@@ -1,5 +1,5 @@
# Dolibarr language file - Source file is en_US - projects
-RefProject=Ref. project
+RefProject=Projekt-Nr.
ProjectId=Projekt-ID
Project=Projekt
Projects=Projekte
@@ -14,7 +14,7 @@ TasksDesc=Diese Ansicht zeigt alle Projekte und Aufgaben (Ihre Benutzerberechtig
Myprojects=Meine Projekte
ProjectsArea=Projektübersicht
NewProject=Neues Projekt
-AddProject=Projekt hinzufügen
+AddProject=Projekt erstellen
DeleteAProject=Löschen eines Projekts
DeleteATask=Löschen einer Aufgabe
ConfirmDeleteAProject=Möchten Sie dieses Projekt wirklich löschen?
@@ -45,7 +45,7 @@ TaskDateStart=Startdatum der Aufgabe
TaskDateEnd=Enddatum der Aufgabe
TaskDescription=Aufgaben-Beschreibung
NewTask=Neue Aufgabe
-AddTask=Aufgabe hinzufügen
+AddTask=Aufgabe erstellen
AddDuration=Dauer hinzufügen
Activity=Tätigkeit
Activities=Aufgaben/Tätigkeiten
@@ -85,13 +85,13 @@ ActionsOnProject=Projektaktionen
YouAreNotContactOfProject=Sie sind diesem privaten Projekt nicht als Kontakt zugeordnet.
DeleteATimeSpent=Lösche einen Zeitaufwand
ConfirmDeleteATimeSpent=Möchten Sie diesen Zeitaufwand wirklich löschen?
-DoNotShowMyTasksOnly=See also tasks not assigned to me
-ShowMyTasksOnly=View only tasks assigned to me
+DoNotShowMyTasksOnly=Zeige auch die Aufgaben der Anderen
+ShowMyTasksOnly=Zeige nur meine Aufgaben
TaskRessourceLinks=Ressourcen
ProjectsDedicatedToThisThirdParty=Mit diesem Partner verknüpfte Projekte
NoTasks=Keine Aufgaben für dieses Projekt
LinkedToAnotherCompany=Mit Partner verknüpft
-TaskIsNotAffectedToYou=Task not assigned to you
+TaskIsNotAffectedToYou=Aufgabe nicht Ihnen zugeordnet
ErrorTimeSpentIsEmpty=Zeitaufwand ist leer
ThisWillAlsoRemoveTasks=Diese Aktion löscht ebenfalls alle Aufgaben zum Projekt (<b>%s</b> akutelle Aufgaben) und alle Zeitaufwände.
IfNeedToUseOhterObjectKeepEmpty=Wenn einige Zuordnungen (Rechnung, Bestellung, ...), einem Dritten gehören, müssen Sie erst alle mit dem Projekt verbinden, damit das Projekt auch Dritten zugänglich ist .
@@ -120,13 +120,13 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Mitwirkender
TypeContact_project_task_external_TASKCONTRIBUTOR=Mitwirkender
SelectElement=Element wählen
AddElement=Mit Element verknüpfen
-UnlinkElement=Unlink element
+UnlinkElement=Verknüpfung zu Element aufheben
# Documents models
DocumentModelBaleine=Eine vollständige Projektberichtsvorlage (Logo, uwm.)
PlannedWorkload = Geplante Auslastung
WorkloadOccupation= Beeinflussung der Auslastung
ProjectReferers=Bezugnahmen
SearchAProject=Suchen Sie ein Projekt
-ProjectMustBeValidatedFirst=Project must be validated first
-ProjectDraft=Draft projects
+ProjectMustBeValidatedFirst=Projekt muss erst bestätigt werden
+ProjectDraft=Projekt-Entwürfe
FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
diff --git a/htdocs/langs/de_DE/resource.lang b/htdocs/langs/de_DE/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..6dd94c6cfc5da5fdd9e0242069ec6495086f7bd2
--- /dev/null
+++ b/htdocs/langs/de_DE/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Ressourcen
+MenuResourceAdd=Neue Ressource
+MenuResourcePlanning=Ressourcen-Planung
+DeleteResource=Ressource löschen
+ConfirmDeleteResourceElement=Bitte Löschung der Ressource dieses Elements bestätigen
+NoResourceInDatabase=Keine Ressource in Datenbank
+NoResourceLinked=Keine Ressource verknüpft
+
+ResourcePageIndex=Liste der Ressourcen
+ResourceSingular=Ressource
+ResourceCard=Ressourcen-Karte
+AddResource=Ressource erstellen
+ResourceFormLabel_ref=Ressourcen-Name
+ResourceType=Ressourcen-Typ
+ResourceFormLabel_description=Ressourcen-Beschreibung
+
+ResourcesLinkedToElement=mit Element verknüpfte Ressourcen
+
+ShowResourcePlanning=Ressourcen-Planung zeigen
+GotoDate=Gehe zu Datum
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Ressource erfolgreich erstellt
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Ressource erfolgreich verknüpft
+
+TitleResourceCard=Ressourcen-Karte
+ConfirmDeleteResource=Ressource wirklich löschen?
+RessourceSuccessfullyDeleted=Ressource erfolgreich gelöscht
+DictionaryResourceType=Ressourcen-Typ
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Ressource wählen
diff --git a/htdocs/langs/de_DE/sendings.lang b/htdocs/langs/de_DE/sendings.lang
index fea929ad1233c1700f56c8955662e40ce0091d71..294d8e50e77e1d61328e4af8d927e12af2aa9bcf 100644
--- a/htdocs/langs/de_DE/sendings.lang
+++ b/htdocs/langs/de_DE/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=Aktuell ist die Erstellung der neuen Sendung üb
RelatedShippings=Ähnliche Sendungen
ShipmentLine=Sendungszeilen
CarrierList=Liste der Transporter
+SendingRunning=Produkt aus Kundenbestellung bereits versandt
+SuppliersReceiptRunning=Produkt aus Lieferantenbestellung bereits erhalten
# Sending methods
SendingMethodCATCH=Abholung durch Kunden
@@ -74,5 +76,5 @@ SumOfProductVolumes=Summe der Produktevolumen
SumOfProductWeights=Summe der Produktegewichte
# warehouse details
-DetailWarehouseNumber= Warehouse details
+DetailWarehouseNumber= Warenlager-Details
DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/de_DE/stocks.lang b/htdocs/langs/de_DE/stocks.lang
index 2b7376cb62e2befe9d8db32363f0bec61c2c7012..e5b37168b3c79c15d4e4f63720311561a12b98b3 100644
--- a/htdocs/langs/de_DE/stocks.lang
+++ b/htdocs/langs/de_DE/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Warenlager-Label erforderlich
CorrectStock=Lagerbestand anpassen
ListOfWarehouses=Liste der Warenlager
ListOfStockMovements=Liste der Lagerbewegungen
-StocksArea=Warenbestandsübersicht
+StocksArea=Lagerbereich
Location=Standort
LocationSummary=Kurzbezeichnung Standort
NumberOfDifferentProducts=Anzahl unterschiedlicher Produkte
diff --git a/htdocs/langs/de_DE/users.lang b/htdocs/langs/de_DE/users.lang
index 94507c0c5726e738df1b089bebf27f21405800d9..f574590148ec71ee47655d73e390bf42f222a8cb 100644
--- a/htdocs/langs/de_DE/users.lang
+++ b/htdocs/langs/de_DE/users.lang
@@ -63,7 +63,6 @@ ShowGroup=Zeige Gruppe
ShowUser=Zeige Benutzer
NonAffectedUsers=Nicht betroffene Benutzer
UserModified=Benutzer erfolgreich bearbeitet
-GroupModified=Gruppe erfolgreich bearbeitet
PhotoFile=Bilddatei
UserWithDolibarrAccess=Benutzer mit Zugangsberechtigung
ListOfUsersInGroup=Liste der Benutzer in dieser Gruppe
@@ -103,7 +102,7 @@ UserDisabled=Benutzer %s deaktiviert
UserEnabled=Benutzer %s aktiviert
UserDeleted=Benutzer %s entfernt
NewGroupCreated=Gruppe %s erstellt
-GroupModified=Gruppe erfolgreich bearbeitet
+GroupModified=Group %s modified
GroupDeleted=Gruppe %s entfernt
ConfirmCreateContact=Möchten Sie für diesen Kontakt wirklich ein Systembenutzerkonto anlegen?
ConfirmCreateLogin=Möchten Sie für dieses Mitglied wirklich ein Benutzerkonto erstellen?
@@ -120,3 +119,4 @@ UseTypeFieldToChange=Nutzen sie das Feld "Typ" zum ändern
OpenIDURL=OpenID URL
LoginUsingOpenID=Verwende OpenID für Anmeldung
WeeklyHours=Wochenstunden
+ColorUser=Benutzerfarbe
diff --git a/htdocs/langs/de_DE/withdrawals.lang b/htdocs/langs/de_DE/withdrawals.lang
index 139f35c108518282655bcef6f9c188e934053c3e..8289f34fa771a330dd1e97a0612c83c3caf1bff5 100644
--- a/htdocs/langs/de_DE/withdrawals.lang
+++ b/htdocs/langs/de_DE/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=Beleg
LastWithdrawalReceipts=%s neuste Abbuchungsbelege
WithdrawedBills=Abgebuchte Rechnungen
WithdrawalsLines=Abbuchungszeilen
-RequestStandingOrderToTreat=Antrag auf Dauerauftrag zur Behandlung von
-RequestStandingOrderTreated=Antrag auf Dauerauftrag behandelt
+RequestStandingOrderToTreat=Request for standing orders to process
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=Daueraufträge (Kunden)
CustomerStandingOrder=Dauerauftrag (Kunde)
NbOfInvoiceToWithdraw=Nr. der abzubuchenden Rechnung
@@ -40,14 +41,13 @@ TransMetod=Überweisungsart
Send=Senden
Lines=Zeilen
StandingOrderReject=Ablehnung ausstellen
-InvoiceRefused=Rechnung abgelehnt
WithdrawalRefused=Abbuchung abgelehnt
WithdrawalRefusedConfirm=Möchten Sie wirklich eine Abbuchungsablehnung zu diesem Partner erstellen?
RefusedData=Ablehnungsdatum
RefusedReason=Ablehnungsgrund
RefusedInvoicing=Ablehnung in Rechnung stellen
NoInvoiceRefused=Ablehnung nicht in Rechnung stellen
-InvoiceRefused=Rechnung abgelehnt
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=Status
StatusUnknown=Unbekannt
StatusWaiting=Wartend
@@ -76,7 +76,7 @@ WithBankUsingRIB=Bankkonten mit RIB
WithBankUsingBANBIC=Bankkonten mit IBAN/BIC/SWIFT
BankToReceiveWithdraw=Bankkonto für Abbuchungen
CreditDate=Am
-WithdrawalFileNotCapable=Abbuchungsformular für Ihr Land konnte nicht erstellt werden.
+WithdrawalFileNotCapable=Abbuchungsformular für Ihr Land %s konnte nicht erstellt werden (Dieses Land wird nicht unterstützt).
ShowWithdraw=Zeige Abbuchung
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Wenn eine Rechnung mindestens eine noch zu bearbeitende Verbuchung vorweist, kann diese nicht als bezahlt markiert werden.
DoStandingOrdersBeforePayments=Dies erlaubt Ihnen, einen Dauerauftrag anzulegen. Sobald dieser vollständig ist, können Sie den Zahlbetrag eingeben, um die Rechnung abzuschließen.
diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang
index 7716a2e93938249b1dedfd56972e147a09a519f5..c3c355390c5457dab0144d8632035408c85cd38e 100644
--- a/htdocs/langs/el_GR/accountancy.lang
+++ b/htdocs/langs/el_GR/accountancy.lang
@@ -2,7 +2,7 @@
CHARSET=UTF-8
Accounting=Λογιστική
-Globalparameters=Global parameters
+Globalparameters=Βασικοί Παράμετροι
Chartofaccounts=Διάγραμμα των λογαριασμών
Fiscalyear=Οικονομικά έτη
Menuaccount=Λογαριασμοί Λογιστικής
@@ -11,12 +11,12 @@ MenuTools=Εργαλεία
ConfigAccountingExpert=Διαμόρφωση της μονάδας λογιστικής expert
Journaux=Ημερολόγια
-JournalFinancial=Financial journals
+JournalFinancial=Οικονιμικά ημερολόγια
Exports=Εξαγωγές
Modelcsv=Πρότυπο εξαγωγής
Selectmodelcsv=Επιλέξτε ένα πρότυπο από την εξαγωγή
Modelcsv_normal=Κλασική εξαγωγή
-Modelcsv_CEGID=Export towards CEGID Expert
+Modelcsv_CEGID=Εξαγωγή προς CEGID εμπειρογνωμόνων
BackToChartofaccounts=Επιστροφή στο διάγραμμα των λογαριασμών
Back=Επιστροφή
@@ -25,12 +25,12 @@ Selectchartofaccounts=Επιλέξτε ένα διάγραμμα των λογα
Validate=Επικύρωση
Addanaccount=Προσθέστε ένα λογιστικό λογαριασμό
AccountAccounting=Λογιστική λογαριασμού
-Ventilation=Ventilation
+Ventilation=Ανάλυση
ToDispatch=Για την αποστολή
Dispatched=Αποστέλλονται
-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
+CustomersVentilation=Ανάλυση πελατών
+SuppliersVentilation=Ανάλυση προμηθευτών
TradeMargin=Εμπορικό Περιθώριο
Reports=Αναφορές
ByCustomerInvoice=Με τιμολόγια πελατών
@@ -40,23 +40,23 @@ Update=Ενημέρωση
List=Λίστα
Create=Δημιουργία
UpdateAccount=Τροποποίηση του λογιστικού λογαριασμού
-UpdateMvts=Modification of a movement
-WriteBookKeeping=Record accounts in general ledger
+UpdateMvts=Τροποποίηση μιας κίνησης
+WriteBookKeeping=Εγγραφή λογαριασμών σε γενικό βιβλίο
Bookkeeping=Γενικό Καθολικό
AccountBalanceByMonth=Το υπόλοιπο του λογαριασμού ανά μήνα
-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
+AccountingVentilation=Ανάλυση των λογαριασμών
+AccountingVentilationSupplier=Ανάλυση λογιστικών προμηθευτή
+AccountingVentilationCustomer=Ανάλυση λογιστικών των πελατών
Line=Γραμμή
-CAHTF=Total purchase supplier HT
+CAHTF=Σύνολο προμηθευτή αγορά ΗΤ
InvoiceLines=Lines of invoice to be ventilated
InvoiceLinesDone=Ventilated lines of invoice
-IntoAccount=In the accounting account
+IntoAccount=Στο λογιστικό λογαριασμό
Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
+VentilationAuto=Automatic breakdown
Processing=Επεξεργασία
EndProcessing=Τέλος της επεξεργασίας
@@ -68,12 +68,12 @@ NotVentilatedinAccount=Not ventilated in the accounting account
ACCOUNTING_SEPARATORCSV=Separator CSV
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
-AccountLength=Length of the accounting accounts shown in Dolibarr
-AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+AccountLength=Μήκος των λογιστικών λογαριασμών που φαίνονται στο Dolibarr
+AccountLengthDesc=Λειτουργία που επιτρέπει να υποκρίνεαι μήκος του λογιστικού λογαριασμού αντικαθιστώντας χώρους από τον αριθμό μηδέν. Η λειτουργία αυτή αγγίζει μόνο την οθόνη, δεν τροποποιούν τους λογιστικούς λογαριασμούς στο Dolibarr. Για την εξαγωγή, αυτή η λειτουργία είναι απαραίτητη για να είναι συμβατή με το συγκεκριμένο λογισμικό.
ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
@@ -101,33 +101,33 @@ Labelcompte=Ετικέτα λογαριασμού
Debit=Χρέωση
Credit=Πίστωση
Amount=Σύνολο
-Sens=Sens
+Sens=Σημασία
Codejournal=Ημερολόγιο
-DelBookKeeping=Delete the records of the general ledger
+DelBookKeeping=Διαγράψτε τα αρχεία της γενικής λογιστικής
-SellsJournal=Sells journal
-PurchasesJournal=Purchases journal
-DescSellsJournal=Sells journal
-DescPurchasesJournal=Purchases journal
-BankJournal=Bank journal
-DescBankJournal=Bank journal including all the types of payments other than cash
-CashJournal=Cash journal
-DescCashJournal=Cash journal including the type of payment cash
+SellsJournal=Ημερολόγιο πωλήσεων
+PurchasesJournal=Ημερολόγιο αγορών
+DescSellsJournal=Ημερολόγιο πωλήσεων
+DescPurchasesJournal=Ημερολόγιο αγορών
+BankJournal=Τραπεζικό ημερολόγιο
+DescBankJournal=Ημερολόγιο Τράπεζας, συμπεριλαμβανομένων όλων των ειδών πληρωμών εκτός από τα μετρητά
+CashJournal=Ημερολόγιο μετρητών
+DescCashJournal=Ημερολόγιο μετρητών καθώς και το είδος των ταμειακών πληρωμών
-CashPayment=Cash Payment
+CashPayment=Καταβολή Μετρητών
-SupplierInvoicePayment=Payment of invoice supplier
-CustomerInvoicePayment=Payment of invoice customer
+SupplierInvoicePayment=Πληρωμή τιμολογίου προμηθευτή
+CustomerInvoicePayment=Πληρωμή τιμολογίου προμηθευτή
-ThirdPartyAccount=Thirdparty account
+ThirdPartyAccount=Λογαριασμός Πελ./Προμ.
-NewAccountingMvt=New movement
-NumMvts=Number of movement
-ListeMvts=List of the movement
-ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+NewAccountingMvt=Νέα κίνηση
+NumMvts=Αριθμός κίνησης
+ListeMvts=Λίστα των κινήσεων
+ErrorDebitCredit=Χρεωστικές και Πιστωτικές δεν μπορούν να χουν την ίδια αξία ταυτόχρονα
-ReportThirdParty=List thirdparty account
+ReportThirdParty=Λίστα λογαριασμού Πελ./Προμ.
DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
ListAccounts=List of the accounting accounts
@@ -140,14 +140,14 @@ Active=Statement
NewFiscalYear=New fiscal year
-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
TotalVente=Total turnover HT
TotalMarge=Total sales margin
DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
ChangeAccount=Change the accounting account for lines selected by the account:
Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
@@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically
ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index ceddf7f8824b31edcb8fc5bca36f9c7ced42ba71..24c2ac930a1c74845098e5037a74546a3568b6bc 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -118,8 +118,8 @@ ParameterInDolibarr=Παράμετρος %s
LanguageParameter=Παράμετρος γλώσσας %s
LanguageBrowserParameter=Παράμετρος %s
LocalisationDolibarrParameters=Παράμετροι τοπικών ρυθμίσεων
-ClientTZ=Ζώνη Ώρας client (χρήστης)
-ClientHour=Ωρα client (χρήστης)
+ClientTZ=Ζώνη Ώρας χρήστη (χρήστης)
+ClientHour=Ωρα χρήστη (χρήστης)
OSTZ=OS Time Zone του διακομιστή
PHPTZ=Ζώνη Ώρας PHP server
PHPServerOffsetWithGreenwich=PHP server offset width Greenwich (seconds)
@@ -219,7 +219,7 @@ AutomaticIfJavascriptDisabled=Automatic if Javascript is disabled
AvailableOnlyIfJavascriptNotDisabled=Available only if JavaScript is not disabled
AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
Required=Υποχρεωτικό
-UsedOnlyWithTypeOption=Used by some agenda option only
+UsedOnlyWithTypeOption=Χρησιμοποιείται μόνο από κάποια επιλογή της ατζέντας
Security=Ασφάλεια
Passwords=Συνθηματικά
DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
@@ -260,11 +260,11 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into
MAIN_MAIL_EMAIL_FROM=Sender e-mail for automatic emails (By default in php.ini: <b>%s</b>)
MAIN_MAIL_ERRORS_TO=E-mail αποστολέα που χρησιμοποιούνται για την επιστροφή λάθος μηνύματα που στέλνονται
MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
-MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Αποστολή συστηματικά ένος κρυφού καρμπόν-αντίγραφου των προτάσεων που αποστέλλονται μέσω email στο
-MAIN_MAIL_AUTOCOPY_ORDER_TO= Αποστολή συστηματικά ένος κρυφού καρμπόν-αντίγραφου των παραγγελιών που αποστέλλονται μέσω email στο
-MAIN_MAIL_AUTOCOPY_INVOICE_TO= Αποστολή συστηματικά ένος κρυφού καρμπόν-αντίγραφου του τιμολογίου που αποστέλλεται μέσω email στο
+MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Αποστολή συστηματικά ένος κρυφού καρμπόν-αντίγραφου των προσφορών που αποστέλλονται μέσω email στο
+MAIN_MAIL_AUTOCOPY_ORDER_TO= Αποστολή συστηματικά ενός κρυφού καρμπόν-αντίγραφου των παραγγελιών που αποστέλλονται μέσω email στο
+MAIN_MAIL_AUTOCOPY_INVOICE_TO= Αποστολή συστηματικά ενός κρυφού καρμπόν-αντίγραφου τιμολογίου που αποστέλλεται μέσω email στο
MAIN_DISABLE_ALL_MAILS=Disable all e-mails sendings (for test purposes or demos)
-MAIN_MAIL_SENDMODE=Μέθοδος για να χρησιμοποιήσετε για αποστολή EMails
+MAIN_MAIL_SENDMODE=Μέθοδος που χρησιμοποιείτε για αποστολή EMails
MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encrypt
@@ -437,8 +437,8 @@ Module52Name=Αποθήκες
Module52Desc=Stock's management of products
Module53Name=Υπηρεσίες
Module53Desc=Service management
-Module54Name=Συμβόλαια
-Module54Desc=Contract's and service's management
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=Barcodes
Module55Desc=Barcode management
Module56Name=Τηλεφωνία
@@ -475,8 +475,8 @@ Module320Name=RSS Feed
Module320Desc=Add RSS feed inside Dolibarr screen pages
Module330Name=Σελιδοδείκτες
Module330Desc=Bookmark management
-Module400Name=Έργα
-Module400Desc=Project management inside other modules
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=Webcalendar
Module410Desc=Webcalendar integration
Module500Name=Ειδικά έξοδα (φόροι, εισφορές κοινωνικής ασφάλισης, μερίσματα)
@@ -484,7 +484,7 @@ Module500Desc=Διαχείριση των ειδικών δαπανών, όπω
Module510Name=Μισθοί
Module510Desc=Διαχείριση υπαλλήλων, μισθών και πληρωμών
Module600Name=Notifications
-Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Δωρεές
Module700Desc=Donation management
Module1200Name=Mantis
@@ -514,16 +514,16 @@ Module5000Name=Multi-company
Module5000Desc=Allows you to manage multiple companies
Module6000Name=Ροή εργασίας
Module6000Desc=Διαχείρισης Ροών Εργασιών
-Module20000Name=Holidays
-Module20000Desc=Declare and follow employees holidays
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
Module39000Name=Παρτίδα προϊόντων
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Αριθμός παρτίδας, κατανάλωση μέχρι ημερομηνία και πώληση μέχρι ημερομηνία διαχείριση για τα προϊόντα
Module50000Name=Paybox
Module50000Desc=Ενότητα για να προσφέρει μια σε απευθείας σύνδεση σελίδα πληρωμής με πιστωτική κάρτα με Paybox
Module50100Name=Σημείο Πωλήσεων
Module50100Desc=Point of sales module
-Module50200Name= Paypal
-Module50200Desc= Ενότητα για να προσφέρει μια σε απευθείας σύνδεση σελίδα πληρωμής με πιστωτική κάρτα με Paypal
+Module50200Name=Paypal
+Module50200Desc=Ενότητα για να προσφέρει μια σε απευθείας σύνδεση σελίδα πληρωμής με πιστωτική κάρτα με Paypal
Module50400Name=Λογιστική (για προχωρημένους)
Module50400Desc=Λογιστική διαχείριση (διπλά μέρη)
Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=Read standing orders
Permission152=Create/modify a standing orders request
Permission153=Transmission standing orders receipts
Permission154=Πιστωτικές / αρνηθεί στέκεται εισπράξεις παραγγελιών
-Permission161=Read contracts
-Permission162=Create/modify contracts
-Permission163=Activate a service of a contract
-Permission164=Disable a service of a contract
-Permission165=Delete contracts
-Permission171=Read trips
-Permission172=Create/modify trips
-Permission173=Delete trips
-Permission178=Export trips
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Read trips and expenses (own and his subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Διαγραφή ταξιδιών και εξόδων
+Permission174=Read all trips and expenses
+Permission178=Εξαγωγή ταξιδιών και εξόδων
Permission180=Read suppliers
Permission181=Read supplier orders
Permission182=Create/modify supplier orders
@@ -671,7 +672,7 @@ Permission300=Read bar codes
Permission301=Create/modify bar codes
Permission302=Delete bar codes
Permission311=Read services
-Permission312=Assign service to contract
+Permission312=Assign service/subscription to contract
Permission331=Read bookmarks
Permission332=Create/modify bookmarks
Permission333=Delete bookmarks
@@ -701,8 +702,8 @@ Permission701=Read donations
Permission702=Δημιουργία / τροποποίηση δωρεές
Permission703=Διαγραφή δωρεές
Permission1001=Διαβάστε τα αποθέματα
-Permission1002=Δημιουργία / τροποποίηση των αποθεμάτων
-Permission1003=Διαγραφή των αποθεμάτων
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=Διαβάστε τις κινήσεις αποθεμάτων
Permission1005=Δημιουργία / τροποποίηση των κινήσεων του αποθέματος
Permission1101=Read delivery orders
@@ -1038,7 +1039,6 @@ YesInSummer=Yes in summer
OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
SuhosinSessionEncrypt=Session storage encrypted by Suhosin
ConditionIsCurrently=Condition is currently %s
-TestNotPossibleWithCurrentBrowsers=Αυτόματη ανίχνευση δεν είναι δυνατή
YouUseBestDriver=Μπορείτε να χρησιμοποιήσετε το πρόγραμμα οδήγησης %s που είναι καλύτερος οδηγός που διατίθεται σήμερα.
YouDoNotUseBestDriver=Μπορείτε να χρησιμοποιήσετε τη μονάδα %s αλλά ο οδηγός %s προτείνετε.
NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by
ModuleCompanyCodePanicum=Return an empty accountancy code.
ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
UseNotifications=Use notifications
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events, to third parties (customers or suppliers) that are configured to. Choice of active notification and targets contacts is made one third party at time.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
ModelModules=Πρότυπα εγγράφων
DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
WatermarkOnDraft=Watermark on draft document
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=Add delivery date ability
UseOptionLineIfNoQuantity=A line of product/service with a zero amount is considered as an option
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Απόκρυψη των επεξεργασμένων ή ακυ
ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order
FreeLegalTextOnOrders=Free text on orders
WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
##### Clicktodial #####
ClickToDialSetup=Click To Dial module setup
ClickToDialUrlDesc=Url called when a click on phone picto is done. In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=Intervention numbering models
TemplatePDFInterventions=Intervention card documents models
WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
##### Contracts #####
-ContractsSetup=Συμβάσεις εγκατάσταση μονάδας
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=Συμβάσεις αρίθμησης ενοτήτων
TemplatePDFContracts=Συμβάσεις μοντέλα εγγράφων
FreeLegalTextOnContracts=Ελεύθερο κείμενο για τις συμβάσεις
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Αρχεία τύπου %s δεν συμπιέζοντ
CacheByServer=Cache από τον server
CacheByClient=Cache από τον browser
CompressionOfResources=Συμπίεση HTTP απαντήσεων
-TestNotPossibleWithCurrentBrowsers=Αυτόματη ανίχνευση δεν είναι δυνατή
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=Products module setup
ServiceSetup=Υπηρεσίες εγκατάστασης μονάδας
@@ -1382,9 +1384,10 @@ MailingSetup=EMailing module setup
MailingEMailFrom=Sender EMail (From) for emails sent by emailing module
MailingEMailError=Return EMail (Errors-to) for emails with errors
##### Notification #####
-NotificationSetup=Notification bu email module setup
+NotificationSetup=EMail notification module setup
NotificationEMailFrom=Sender EMail (From) for emails sent for notifications
-ListOfAvailableNotifications=Κατάλογος των διαθέσιμων κοινοποιήσεων (Αυτή η λίστα εξαρτάται από την ενεργοποίηση modules)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
##### Sendings #####
SendingsSetup=Sending module setup
SendingsReceiptModel=Sending receipt model
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe
OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
##### Stock #####
-StockSetup=Configuration module stock
-UserWarehouse=Use user personal stocks
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=Menu deleted
TreeMenu=Tree menus
@@ -1478,11 +1482,14 @@ ClickToDialDesc=This module allows to add an icon after phone numbers. A click o
##### Point Of Sales (CashDesk) #####
CashDesk=Σημείο Πωλήσεων
CashDeskSetup=Point of sales module setup
-CashDeskThirdPartyForSell=Generic third party to use for sells
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Default account to use to receive cash payments
CashDeskBankAccountForCheque= Default account to use to receive payments by cheque
CashDeskBankAccountForCB= Default account to use to receive payments by credit cards
-CashDeskIdWareHouse=Warehouse to use for sells
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Bookmark module setup
BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Διαγραφή οικονομικού έτους
ConfirmDeleteFiscalYear=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το οικονομικό έτος;
Opened=Ανοίξτε
Closed=Κλείστε
-
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
Format=Μορφή
TypePaymentDesc=0:Τύπος πληρωμής πελάτη, 1:Τύπος πληρωμής προμηθευτή, 2:Τύπος πληρωμής τόσο για τους πελάτες όσο και για τους προμηθευτές
diff --git a/htdocs/langs/el_GR/agenda.lang b/htdocs/langs/el_GR/agenda.lang
index 446b0613cb9f5c75cbe0c304dc037ccd97b28bb1..932a236ab4a904fcd6b8ccddf7eb3461242554dd 100644
--- a/htdocs/langs/el_GR/agenda.lang
+++ b/htdocs/langs/el_GR/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= Αυτόματη συμπλήρωση ημερολογίου
AgendaAutoActionDesc= Εδώ ορίζετε γεγονότα για το οποία θέλετε το Dolibarr να δημιουργεί αυτόματα μια ενέργεια στην ατζέντα. Αν τίποτα δεν είναι τσεκαρισμένο (προεπιλογή), τότε, μόνο χειροκίνητες ενέργειες θα συμπεριληφθούν στην ατζέντα.
AgendaSetupOtherDesc= Αυτή η σελίδα παρέχει επιλογές για να καταστεί δυνατή η εξαγωγή των δικών σας εκδηλώσεων Dolibarr σε ένα εξωτερικό ημερολόγιο (thunderbird, google calendar, ...)
AgendaExtSitesDesc=Αυτή η σελίδα σας επιτρέπει να ρυθμίσετε εξωτερικά ημερολόγια.
-ActionsEvents= Γεγονότα για τα οποία θα δημιουργήσουν εγγραφή στο ημερολόγιο, αυτόματα
-PropalValidatedInDolibarr= Η πρόταση %s επικυρώθηκε
-InvoiceValidatedInDolibarr= Το τιμολόγιο %s επικυρώθηκε
+ActionsEvents=Γεγονότα για τα οποία θα δημιουργήσουν εγγραφή στο ημερολόγιο, αυτόματα
+PropalValidatedInDolibarr=Η πρόταση %s επικυρώθηκε
+InvoiceValidatedInDolibarr=Το τιμολόγιο %s επικυρώθηκε
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=Τιμολόγιο %s θα επιστρέψει στην κατάσταση του σχεδίου
InvoiceDeleteDolibarr=Τιμολόγιο %s διαγράφεται
OrderValidatedInDolibarr= Η παραγγελία %s επικυρώθηκε
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Παραγγελία %s εγκρίθηκε
OrderRefusedInDolibarr=Παραγγελία %s απορριφθεί
OrderBackToDraftInDolibarr=Παραγγελία %s θα επιστρέψει στην κατάσταση σχέδιο
OrderCanceledInDolibarr=Παραγγελία %s ακυρώθηκε
-InterventionValidatedInDolibarr=Η παρέμβαση %s επικυρώθηκε
ProposalSentByEMail=Η εμπορική πρόταση %s στάλθηκε με e-mail
OrderSentByEMail=Η παραγγελία του πελάτη %s εστάλη με EMail
InvoiceSentByEMail=Το τιμολόγιο του πελάτη %s εστάλη με EMail
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=Η παραγγελία προμηθευτή %s στά
SupplierInvoiceSentByEMail=Το τιμολόγιο προμηθευτή %s στάλθηκε με e-mail
ShippingSentByEMail=Αποστολές %s αποστέλλονται με ηλεκτρονικό ταχυδρομείο
ShippingValidated= Αποστολές %s επικυρωθεί
-InterventionSentByEMail=Παρέμβαση %s αποστέλλονται με ηλεκτρονικό ταχυδρομείο
-InterventionClassifiedBilled=Παρέμβαση %s ταξινόμηση ως τιμολογημένα
NewCompanyToDolibarr= Το στοιχείο δημιουργήθηκε
DateActionPlannedStart= Προγρ/σμένη ημερομηνία έναρξης
DateActionPlannedEnd= Προγρ/σμένη ημερομηνία λήξης
@@ -70,9 +68,9 @@ DateActionStart= Ημερομηνία έναρξης
DateActionEnd= Ημερομηνία λήξης
AgendaUrlOptions1=Μπορείτε ακόμη να προσθέσετε τις ακόλουθες παραμέτρους για να φιλτράρετε τα αποτέλεσμα:
AgendaUrlOptions2=<b>login=%s</b> για να περιορίσετε τα αποτελέσματα σε ενέργειες που δημιουργήθηκαν και έγιναν από τον χρήστη <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> για να περιορίσετε τα αποτελέσματα σε ενέργειες που δημιουργήθηκαν από τον χρήστη<b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
AgendaUrlOptions4=<b>logint=%s</b> για να περιορίσετε τα αποτελέσματα σε ενέργειες που αφορούν τον χρήστη<b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> για να περιορίσετε τα αποτελέσματα σε ενέργειες που έγιναν από τον χρήστη <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
AgendaShowBirthdayEvents=Εμφάνιση γενεθλίων των προσώπων επικοινωνίας
AgendaHideBirthdayEvents=Απόκρυψη γενεθλίων των προσώπων επικοινωνίας
Busy=Απασχολ.
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=URL για να αποκτήσετε πρόσβαση στο .i
ExtSiteNoLabel=Χωρίς Περιγραφή
WorkingTimeRange=Εύρος χρόνου εργασίας
WorkingDaysRange=Εύρος ημερών εργασίας
-AddEvent=Προσθήκη ενέργειας
+AddEvent=Create event
MyAvailability=Η διαθεσιμότητα μου
diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang
index aae26d2dd4336ea3fd6720a1b76d4c8ae2cdea27..1c0ff4d72c98fd661350d1484b1f81399ed04923 100644
--- a/htdocs/langs/el_GR/bills.lang
+++ b/htdocs/langs/el_GR/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Πιστωτικό σημείωμα
InvoiceAvoirAsk=Πιστωτικό σημείωμα για την διόρθωση τιμολογίου
InvoiceAvoirDesc=Το <b>πιστωτικό σημείωμα</b>είναι ένα αρνητικό τιμολόγιο που χρησιμοποιείτε για να λύσει τη κατάσταση κατά την οποία το σύνολο του τιμολογίου διαφέρει από το σύνολο της πραγματικής πληρωμής (ίσως επειδή ο πελάτης πλήρωσε περισσότερα -- από λάθος, ή επειδή πλήρωσε λιγότερα και επέστρεψε κάποια προϊόντα).
invoiceAvoirWithLines=Δημιουργία Πιστωτικού Σημειώματος με γραμμές από το τιμολόγιο προέλευσης.
-invoiceAvoirWithPaymentRestAmount=Δημιουργία Πιστωτικού Τιμολογίου με το ποσό των πληρωμών του τιμολογίου προέλευσης
-invoiceAvoirLineWithPaymentRestAmount=Πιστωτικό Τιμολόγιο με ποσό των πληρωμών τιμολογίου
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
ReplaceInvoice=Αντικατάσταση Τιμολογίου %s
ReplacementInvoice=Τιμολόγιο Αντικατάστασης
ReplacedByInvoice=Αντικαταστάθηκε από το τιμολόγιο %s
@@ -85,9 +85,9 @@ ClassifyPaid=Χαρακτηρισμός ως 'Πληρωμένο''
ClassifyPaidPartially=Χαρακτηρισμός ως 'Μη Εξοφλημένο'
ClassifyCanceled=Χαρακτηρισμός ως 'Εγκαταλελειμμένο'
ClassifyClosed=Χαρακτηρισμός ως 'Κλειστό'
-ClassifyUnBilled=Classify 'Unbilled'
+ClassifyUnBilled=Ταξινομήστε τα «Μη τιμολογημένα»
CreateBill=Δημιουργία Τιμολογίου
-AddBill=Προσθήκη τιμολ./πιστ. σημ.
+AddBill=Create invoice or credit note
AddToDraftInvoices=Προσθήκη στο πρόχειρο τιμολόγιο
DeleteBill=Διαγραφή Τιμολογίου
SearchACustomerInvoice=Εύρεση τιμολογίου πελάτη
@@ -99,7 +99,7 @@ DoPaymentBack=Do payment back
ConvertToReduc=Μετατροπή σε μελλοντική έκπτωση
EnterPaymentReceivedFromCustomer=Εισαγωγή πληρωμής από πελάτη
EnterPaymentDueToCustomer=Πληρωμή προς προμηθευτή
-DisabledBecauseRemainderToPayIsZero=Απενεργοποιήθηκε λόγω μηδενικού υπολοίπου
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
Amount=Σύνολο
PriceBase=Τιμή βάσης
BillStatus=Κατάσταση τιμολογίου
@@ -137,8 +137,6 @@ BillFrom=Από
BillTo=Στοιχεία Πελάτη
ActionsOnBill=Ενέργειες στο τιμολόγιο
NewBill=Νέο τιμολόγιο
-Prélèvements=Πάγιες Εντολές
-Prélèvements=Πάγιες Εντολές
LastBills=Τελευταία %s τιμολόγια
LastCustomersBills=Τελευταία %s τιμολόγια πελατών
LastSuppliersBills=Τελευταία %s τιμολόγια προμηθευτών
@@ -156,9 +154,9 @@ ConfirmCancelBill=Είστε σίγουροι ότι θέλετε να ακυρ
ConfirmCancelBillQuestion=Γιατί θέλετε να χαρακτηρίσετε το τιμολόγιο ώς "Εγκαταλειμμένο"
ConfirmClassifyPaidPartially=Είστε σίγουροι ότι θέλετε να αλλάξετε την κατάσταση τιμολογίου <b>%s</b> σε 'Πληρωμένο';
ConfirmClassifyPaidPartiallyQuestion=Το τιμολόγιο δεν αποπληρώθηκε. Για ποιο λόγο θέλετε να κλείσετε το τιμολόγιο;
-ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
ConfirmClassifyPaidPartiallyReasonBadCustomer=Κακός πελάτης
ConfirmClassifyPaidPartiallyReasonProductReturned=Τα προϊόντα επιστράφηκαν μερικώς
ConfirmClassifyPaidPartiallyReasonOther=Ποσό εγκαταλελειμμένο για άλλους λόγους
@@ -191,9 +189,9 @@ AlreadyPaid=Ήδη πληρωμένο
AlreadyPaidBack=Already paid back
AlreadyPaidNoCreditNotesNoDeposits=Ήδη πληρωμένο (χωρίς πιστώσεις ή καταθέσεις)
Abandoned=Εγκαταλελειμμένο
-RemainderToPay=Υπόλοιπο
-RemainderToTake=Υπόλοιπο προς είσπραξη
-RemainderToPayBack=Υπόλοιπο για την αποπληρωμή
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
Rest=Εκκρεμής
AmountExpected=Ποσό που ζητήθηκε
ExcessReceived=Περίσσεια που λήφθηκε
@@ -219,19 +217,18 @@ NoInvoice=Δεν υπάρχει τιμολόγιο
ClassifyBill=Κατηγοριοποίηση Τιμολογίου
SupplierBillsToPay=Απλήρωτα τιμολόγια προμηθευτών
CustomerBillsUnpaid=Απλήρωτα τιμολόγια πελατών
-DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters
-DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=Non-recoverable
SetConditions=Set payment conditions
SetMode=Set payment mode
Billed=Τιμολογημένο
-RepeatableInvoice=Επαναλαμβανόμενο τιμολόγιο
-RepeatableInvoices=Επαναλαμβανόμενα τιμολόγια
-Repeatable=Επαναλαμβανόμενο
-Repeatables=Επαναλαμβανόμενο
-ChangeIntoRepeatableInvoice=Μετατροπή σε Επαναλαμβανόμενο
-CreateRepeatableInvoice=Δημιουργία Επαναλαμβανόμενου Τιμολογίου
-CreateFromRepeatableInvoice=Δημιουργία από προκαθορισμένο τιμολόγιο
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines
CustomersInvoicesAndPayments=Πληρωμές και τιμολόγια πελατών
ExportDataset_invoice_1=Customer invoices list and invoice's lines
diff --git a/htdocs/langs/el_GR/categories.lang b/htdocs/langs/el_GR/categories.lang
index d622e8657bfeb15e8d03dd582dcf1d7374e2994e..542fb2cf04fe0c3e7836d530709e13fb3bbf3060 100644
--- a/htdocs/langs/el_GR/categories.lang
+++ b/htdocs/langs/el_GR/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Προμηθευτές
CatCusLinks=Πελάτες/Προοπτικές
CatProdLinks=Προϊόντα
CatMemberLinks=Σχέσεις μεταξύ των μελών και των κατηγοριών
-CatProdLinks=Προϊόντα
-CatCusLinks=Πελάτες/Προοπτικές
-CatSupLinks=Προμηθευτές
DeleteFromCat=Κατάργηση από την κατηγορία
DeletePicture=Διαγραφή εικόνας
ConfirmDeletePicture=Επιβεβαιώστε τη διαγραφή εικόνας
@@ -112,3 +109,4 @@ CategoriesSetup=Ρύθμισης κατηγοριών
CategorieRecursiv=Συνδέουν με το γονέα της κατηγορίας αυτόματα
CategorieRecursivHelp=Εάν είναι ενεργοποιημένο, το προϊόν θα συνδέεται επίσης με γονική κατηγορία κατά την προσθήκη σε μια υποκατηγορία
AddProductServiceIntoCategory=Προσθέστε το ακόλουθο προϊόν/υπηρεσία
+ShowCategory=Εμφάνιση κατηγορίας
diff --git a/htdocs/langs/el_GR/compta.lang b/htdocs/langs/el_GR/compta.lang
index a22a8a1d63813fde68b8d32ff9335fec9cbe18e0..2e5b6951bc6455c900806bb178a00f06151512f8 100644
--- a/htdocs/langs/el_GR/compta.lang
+++ b/htdocs/langs/el_GR/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s
SuppliersProductsSellSalesTurnover=The generated turnover by the sales of supplier's products.
CheckReceipt=Έλεγχος Πίστωσης
CheckReceiptShort=Check deposit
+LastCheckReceiptShort=Έλεγχος τελευταίων %s εισπράξεων
NewCheckReceipt=Νέα έκπτωση
NewCheckDeposit=Νέα κατάθεση επιταγής
NewCheckDepositOn=Create receipt for deposit on account: %s
@@ -196,14 +197,14 @@ CalculationRuleDescSupplier=σύμφωνα με τον προμηθευτή, ε
TurnoverPerProductInCommitmentAccountingNotRelevant=Αναφορά του κύκλου εργασιών ανά προϊόν, όταν χρησιμοποιείτε <b>ταμειακής λογιστικής</b> mode is not relevant. Η αναφορά αυτή είναι διαθέσιμη μόνο όταν χρησιμοποιείτε <b>λογιστικής δέσμευσης</b> τρόπος (ανατρέξτε στην ενότητα Ρύθμιση της μονάδας λογιστικής).
CalculationMode=Τρόπο υπολογισμού
AccountancyJournal=Λογιστικος Κωδικός περιοδικό
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
-ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
-CloneTaxForNextMonth=Clone it for next month
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για αγορά των προϊόντων
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Προεπιλεγμένος κωδικός λογιστικής για πώληση προϊόντων
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Προεπιλεγμένος κωδικός λογιστικής για αγορές υπηρεσιών
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Προεπιλεγμένος κωδικός λογιστικής για πώληση υπηρεσιών
+ACCOUNTING_VAT_ACCOUNT=Προεπιλεγμένος κωδικός λογιστικής για την είσπραξη του ΦΠΑ
+ACCOUNTING_VAT_BUY_ACCOUNT=Προεπιλεγμένος κωδικός λογιστικής για την καταβολή του ΦΠΑ
+ACCOUNTING_ACCOUNT_CUSTOMER=Κωδικός Λογιστικής από προεπιλογή για πελάτες
+ACCOUNTING_ACCOUNT_SUPPLIER=Κωδικός Λογιστικής από προεπιλογή για τους προμηθευτές
+CloneTax=Κλώνος για μια κοινωνική προσφορά
+ConfirmCloneTax=Επιβεβαιώστε τον κλώνο της κοινωνικής προσφοράς
+CloneTaxForNextMonth=Κλώνος για τον επόμενο μήνα
diff --git a/htdocs/langs/el_GR/contracts.lang b/htdocs/langs/el_GR/contracts.lang
index 41dd8d76b809e70e19f377d8bd01024184bb891a..6b3e508c9afe349e4c05147e9cc4b205729ef928 100644
--- a/htdocs/langs/el_GR/contracts.lang
+++ b/htdocs/langs/el_GR/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Περιοχή Συμβολαίων
ListOfContracts=Λίστα Συμβολαίων
-LastContracts=%s συμβόλαια που τροποποιήθηκαν πρόσφατα
+LastModifiedContracts=Last %s modified contracts
AllContracts=Όλα τα συμβόλαια
ContractCard=Κάρτέλα Συμβολαίου
ContractStatus=Κατάσταση συμβολαίου
@@ -27,7 +27,7 @@ MenuRunningServices=Ενεργές Υπηρεσίες
MenuExpiredServices=Ληγμένες Υπηρεσίες
MenuClosedServices=Τερματισμένες Υπηρεσίες
NewContract=Νέο Συμβόλαιο
-AddContract=Προσθήκη Συμβολαίου
+AddContract=Δημιουργία σύμβασης
SearchAContract=Εύρεση Συμβολαίου
DeleteAContract=Διαγραφή Συμβολαίου
CloseAContract=Τερματισμός Συμβολαίου
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines
ListOfRunningServices=Λίστα τρέχουσων υπηρεσιών
NotActivatedServices=Inactive services (among validated contracts)
BoardNotActivatedServices=Υπηρεσίες προς ενεργοποίηση σε επικυρωμένα συμβόλαια
-LastContracts=%s συμβόλαια που τροποποιήθηκαν πρόσφατα
+LastContracts=Last % contracts
LastActivatedServices=Last %s activated services
LastModifiedServices=Last %s modified services
EditServiceLine=Edit service line
diff --git a/htdocs/langs/el_GR/cron.lang b/htdocs/langs/el_GR/cron.lang
index 93eb1bcf4459081d13695ef09a206d11dbd9ac3f..a9a19f31b8923b5e14bb4a5886108f9158ad116b 100644
--- a/htdocs/langs/el_GR/cron.lang
+++ b/htdocs/langs/el_GR/cron.lang
@@ -1,22 +1,14 @@
# Dolibarr language file - Source file is en_US - cron
-#
# About page
-#
About = Πληροφορίες
CronAbout = Σχετικά με το Cron
CronAboutPage = Σχετικά με τη σελίδα Cron
-
-#
# Right
-#
Permission23101 = Διαβάστε την προγραμματισμένη εργασία
Permission23102 = Δημιουργία / ενημέρωση προγραμματισμένης εργασίας
Permission23103 = Διαγραφή προγραμματισμένης εργασίας
Permission23104 = Εκτέλεση Προγραμματισμένης εργασίας
-
-#
# Admin
-#
CronSetup= Προγραμματισμένη ρύθμιση διαχείρισης των εργασιών
URLToLaunchCronJobs=URL για να ελέγξετε και να ξεκινήσει μια περιοδική εργασία, εφόσον απαιτείται
OrToLaunchASpecificJob=Ή να ελέγξετε και να ξεκινήσει μία συγκεκριμένη εργασία
@@ -24,20 +16,11 @@ KeyForCronAccess=Κλειδί ασφαλείας για το URL για να ξ
FileToLaunchCronJobs=Γραμμής εντολών για να ξεκινήσει τις εργασίες
CronExplainHowToRunUnix=Σχετικά με το περιβάλλον Unix θα πρέπει να χρησιμοποιήσετε crontab να τρέχει γραμμή εντολών κάθε λίγα λεπτά
CronExplainHowToRunWin=Στο Microsoft (tm) των Windows environement, μπορείτε να χρησιμοποιήσετε τα εργαλεία Προγραμματισμένη εργασία ώστε να εκτελεστεί μια γραμμή εντολών κάθε λιγα λεπτά
-
-
-#
# Menu
-#
CronJobs=Προγραμματισμένες εργασίες
-CronListActive= Κατάλογος των ενεργών εργασιών
-CronListInactive= Λίστα με τις απενεργοποιημένες εργασίες
-CronListActive= Κατάλογος των ενεργών εργασιών
-
-
-#
+CronListActive=List of active/scheduled jobs
+CronListInactive=Λίστα με τις απενεργοποιημένες εργασίες
# Page list
-#
CronDateLastRun=Τελευταία εκτέλεση
CronLastOutput=Τελευταία εκτέλεση εξόδου
CronLastResult=Τελευταίος κωδικός αποτελέσματος
@@ -70,10 +53,7 @@ CronLabel=Περιγραφή
CronNbRun=Nb. έναρξης
CronEach=Κάθε
JobFinished=Ξεκίνησε και τελείωσε
-
-#
#Page card
-#
CronAdd= Προσθήκη εργασίας
CronHourStart= Έναρξη ώρας και ημερομηνία αποστολής
CronEvery= Εκτέλεση εργασίας κάθε
@@ -95,20 +75,12 @@ CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Doli
CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is <i>fecth</i>
CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
CronCommandHelp=Γραμμή εντολών του συστήματος προς εκτέλεση.
-
-#
# Info
-#
CronInfoPage=Πληροφορίες
-
-
-#
# Common
-#
CronType=Τύπος εργασίας
CronType_method=Καλέστε τη μέθοδο της κατηγορίας Dolibarr
CronType_command=Εντολή Shell
CronMenu=Μενού
CronCannotLoadClass=Cannot load class %s or object %s
-
UseMenuModuleToolsToAddCronJobs=Πηγαίνετε στο μενού "Home - Modules εργαλεία - Λίστα εργασιών" για να δείτε και να επεξεργαστείτε τις προγραμματισμένες εργασίες.
diff --git a/htdocs/langs/el_GR/donations.lang b/htdocs/langs/el_GR/donations.lang
index 112367eb07e1d0588626804614d78769da2f0e83..69898f3d4aae0e14a564f03ecd1761fc5d8b443d 100644
--- a/htdocs/langs/el_GR/donations.lang
+++ b/htdocs/langs/el_GR/donations.lang
@@ -4,7 +4,7 @@ Donations=Δωρεές
DonationRef=Δωρεά ref.
Donor=Δωρεά
Donors=Δωρεές
-AddDonation=Προσθήκη δωρεάς
+AddDonation=Create a donation
NewDonation=Νέα δωρεά
ShowDonation=Εμφάνιση δωρεάς
DonationPromise=Υπόσχεση δώρου
@@ -31,3 +31,8 @@ DonationRecipient=Δικαιούχος δωρεάς
ThankYou=Σας ευχαριστούμε
IConfirmDonationReception=Ο δικαιούχος δηλώνει αποδοχή, ως δωρεά, το ακόλουθο ποσό
MinimumAmount=Το ελάχιστο ποσό είναι %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/el_GR/externalsite.lang b/htdocs/langs/el_GR/externalsite.lang
index 461eaec865b34be8a5af53a8b00a92552ed445a0..97d9a9ed48b84c60a7d64c9e7e46c7947afd8764 100644
--- a/htdocs/langs/el_GR/externalsite.lang
+++ b/htdocs/langs/el_GR/externalsite.lang
@@ -2,3 +2,4 @@
ExternalSiteSetup=Ρύθμιση συνδέσμου σε εξωτερικό website
ExternalSiteURL=Εξωτερικές διεύθυνσης URL ιστοσελίδας
ExternalSiteModuleNotComplete=Το Module Εξωτερικά Site δεν έχει ρυθμιστεί σωστά.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/el_GR/holiday.lang b/htdocs/langs/el_GR/holiday.lang
index 924863ff589ae5eabcaeb9f667bd4ffb3ed6d93d..dd9c902036ab968d283505cc83bf75ca756876d9 100644
--- a/htdocs/langs/el_GR/holiday.lang
+++ b/htdocs/langs/el_GR/holiday.lang
@@ -1,13 +1,13 @@
# Dolibarr language file - Source file is en_US - holiday
HRM=HRM
-Holidays=Leaves
-CPTitreMenu=Leaves
+Holidays=Άδειες
+CPTitreMenu=Άδειες
MenuReportMonth=Μηνιαία αναφορά
-MenuAddCP=Make a leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
-NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
-NoCPforUser=You don't have any available day.
-AddCP=Make a leave request
+MenuAddCP=Κάντε αίτηση άδειας
+NotActiveModCP=Θα πρέπει να ενεργοποιήσετε τις Άδειες module για να δείτε αυτή τη σελίδα.
+NotConfigModCP=Μπορείτε να ρυθμίσετε το module Άδειες για να δείτε αυτή τη σελίδα.Για να το κάνετε αυτό, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> κάντε κλικ εδώ </ a>.
+NoCPforUser=Δεν έχετε διαθέσιμες ημέρες.
+AddCP=Κάντε αίτηση άδειας
Employe=Εργαζόμενος
DateDebCP=Ημερ. έναρξης
DateFinCP=Ημερ. τέλους
@@ -18,24 +18,24 @@ ApprovedCP=Εγκεκριμένο
CancelCP=Ακυρώθηκε
RefuseCP=Απόρριψη
ValidatorCP=Έγκριση
-ListeCP=List of leaves
+ListeCP=Λίστα των αδειών
ReviewedByCP=Θα πρέπει να επανεξεταστεί από
DescCP=Περιγραφή
-SendRequestCP=Create leave request
-DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Edit balance of leaves
-UpdateAllCP=Update the leaves
-SoldeCPUser=Leaves balance is <b>%s</b> days.
+SendRequestCP=Δημιουργήστε το αίτημα άδειας
+DelayToRequestCP=Tα αιτήματα πρέπει να γίνονται τουλάχιστον <b>%s ημέρα(ες)</b> πριν από τις.
+MenuConfCP=Επεξεργασία ισορροπίας των αδειών
+UpdateAllCP=Ενημέρωση των αδειών
+SoldeCPUser=Η ισορροπία των αδειών είναι <b>%s</b> ημέρες.
ErrorEndDateCP=Πρέπει να επιλέξετε μια ημερομηνία λήξης μεγαλύτερη από την ημερομηνία έναρξης.
ErrorSQLCreateCP=Παρουσιάστηκε σφάλμα στην SQL κατά τη διάρκεια της δημιουργίας:
-ErrorIDFicheCP=An error has occurred, the leave request does not exist.
+ErrorIDFicheCP=Παρουσιάστηκε σφάλμα, η αίτηση άδειας δεν υπάρχει.
ReturnCP=Επιστροφή στην προηγούμενη σελίδα
-ErrorUserViewCP=You are not authorized to read this leave request.
-InfosCP=Information of the leave request
+ErrorUserViewCP=Δεν έχετε άδεια για να διαβάσετε αυτή την αίτηση αδείας.
+InfosCP=Πληροφορίες για την αίτησης άδειας
InfosWorkflowCP=Πληροφορίες για την ροή εργασιών
RequestByCP=Ζητήθηκε από
-TitreRequestCP=Leave request
-NbUseDaysCP=Number of days of vacation consumed
+TitreRequestCP=Αφήστε το αίτημα
+NbUseDaysCP=Αριθμός των ημερών για τις άδειες που καταναλώνεται
EditCP=Επεξεργασία
DeleteCP=Διαγραφή
ActionValidCP=Επικύρωση
@@ -43,26 +43,25 @@ ActionRefuseCP=Απορρίφθηκε
ActionCancelCP=Άκυρο
StatutCP=Κατάσταση
SendToValidationCP=Στάλθηκε για επικύρωση
-TitleDeleteCP=Delete the leave request
-ConfirmDeleteCP=Confirm the deletion of this leave request?
-ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
-CantCreateCP=You don't have the right to make leave requests.
-InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=Ανανέωση
-CantUpdate=You cannot update this leave request.
+TitleDeleteCP=Διαγράψτε την αίτηση άδειας
+ConfirmDeleteCP=Επιβεβαιώστε τη διαγραφή αυτήν την αίτηση άδειας;
+ErrorCantDeleteCP=Σφάλμα δεν έχετε το δικαίωμα να διαγράψει αυτό το αίτημα αδείας.
+CantCreateCP=Δεν έχετε το δικαίωμα να ζητήσετε άδεια.
+InvalidValidatorCP=Μπορείτε να επιλέξετε ένα εκπρόσωπο να εγκρίνει την άδειά σας.
+CantUpdate=Δεν μπορείτε να ενημερώσετε αυτό το αίτημα άδειας.
NoDateDebut=Πρέπει να επιλέξετε μια ημερομηνία έναρξης.
NoDateFin=Πρέπει να επιλέξετε μια ημερομηνία λήξης.
-ErrorDureeCP=Το αίτημά σας για την άδεια δεν περιέχει εργάσιμη ημέρα.
-TitleValidCP=Εγκρίνετε το αίτημα για την άδεια
-ConfirmValidCP=Are you sure you want to approve the leave request?
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
+ConfirmValidCP=Είστε βέβαιοι ότι θέλετε να εγκρίνει την αίτηση άδειας;
DateValidCP=Ημερομηνία έγκρισης
-TitleToValidCP=Send leave request
-ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Απόρριψη αιτήματος αδειών
-ConfirmRefuseCP=Are you sure you want to refuse the leave request?
+TitleToValidCP=Στείλτε αίτηση άδειας
+ConfirmToValidCP=Είστε βέβαιοι ότι θέλετε να στείλετε την αίτηση άδειας;
+TitleRefuseCP=Refuse the leave request
+ConfirmRefuseCP=Είστε βέβαιοι ότι θέλετε να απορρίψει την αίτηση άδειας;
NoMotifRefuseCP=Πρέπει να επιλέξετε ένα λόγο απόρριψης της αίτησης.
-TitleCancelCP=Ακύρωση του αιτήματος τις άδειας
-ConfirmCancelCP=Are you sure you want to cancel the leave request?
+TitleCancelCP=Cancel the leave request
+ConfirmCancelCP=Είστε βέβαιοι ότι θέλετε να ακυρώσετε την αίτηση άδειας;
DetailRefusCP=Λόγος για την απόρριψη
DateRefusCP=Ημερομηνία της άρνησης
DateCancelCP=Ημερομηνία της ακύρωσης
@@ -72,42 +71,42 @@ MotifCP=Λόγος
UserCP=Χρήστης
ErrorAddEventToUserCP=Παρουσιάστηκε σφάλμα κατά την προσθήκη τις έκτακτης άδειας.
AddEventToUserOkCP=Η προσθήκη της έκτακτης άδειας έχει ολοκληρωθεί.
-MenuLogCP=View logs of leave requests
-LogCP=Log of updates of available vacation days
+MenuLogCP=Δείτε τα αρχεία καταγραφών των αιτήσεων άδειας
+LogCP=Αρχείο καταγραφής για ενημέρωση των διαθέσιμων ημερών των αδειών
ActionByCP=Διενεργείται από
UserUpdateCP=Για το χρήστη
PrevSoldeCP=Προηγούμενο Υπόλοιπο
NewSoldeCP=Νέο υπόλοιπο
-alreadyCPexist=Η αίτηση για την άδεια έχει ήδη γίνει για αυτή την περίοδο.
+alreadyCPexist=A leave request has already been done on this period.
UserName=Όνομα
Employee=Υπάλληλος
-FirstDayOfHoliday=First day of vacation
-LastDayOfHoliday=Last day of vacation
+FirstDayOfHoliday=Πρώτη μέρα των αδειών
+LastDayOfHoliday=Τελευταία μέρα των αδειών
HolidaysMonthlyUpdate=Μηνιαία ενημέρωση
ManualUpdate=Χειροκίνητη ενημέρωση
-HolidaysCancelation=Leave request cancelation
+HolidaysCancelation=Αφήστε το αίτημα ακύρωσης
## Configuration du Module ##
-ConfCP=Διαμόρφωση του module αδειών
+ConfCP=Configuration of leave request module
DescOptionCP=Περιγραφή της επιλογής
ValueOptionCP=Αξία
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
ConfirmConfigCP=Επικύρωση της διαμόρφωσης
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
UpdateConfCPOK=Ενημερώθηκε με επιτυχία.
ErrorUpdateConfCP=Παρουσιάστηκε σφάλμα κατά την ενημέρωση, παρακαλώ προσπαθήστε ξανά.
-AddCPforUsers=Παρακαλώ προσθέστε το υπόλοιπο αδειών των χρηστών από <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">κάνοντας κλικ εδώ</a> .
-DelayForSubmitCP=Προθεσμία υποβολής αιτήσεων για άδειες
-AlertapprobatortorDelayCP=Αποτρέψτε την έγκριση εάν η αίτηση άδειας δεν ταιριάζει με την προθεσμία
-AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
-nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
-Module27130Name= Management of leave requests
-Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
-TitleOptionEventCP=Settings of leave requets for events
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
+AlertValidatorDelayCP=Εμποδίστε τον εκπρόσωπο εάν η αίτηση άδειας υπερβαίνει καθυστέρηση
+AlertValidorSoldeCP=Εμποδίστε τον εκπρόσωπο εάν η αίτηση άδειας υπερβαίνει το υπόλοιπο
+nbUserCP=Αριθμός των χρηστών που υποστηρίζονται στο module αδειών
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
+Module27130Name= Διαχείριση των αιτήσεων αδειών
+Module27130Desc= Διαχείριση των αιτήσεων αδειών
+TitleOptionMainCP=Main settings of leave request
+TitleOptionEventCP=Ρυθμίσεις των αδειών αίτημα για εκδηλώσεις
ValidEventCP=Επικύρωση
UpdateEventCP=Ενημέρωση εκδηλώσεων
CreateEventCP=Δημιουργία
@@ -127,23 +126,23 @@ UpdateEventOptionCP=Ανανέωση
ErrorMailNotSend=Παρουσιάστηκε σφάλμα κατά την αποστολή e-mail:
NoCPforMonth=Όχι αυτό το μήνα.
nbJours=Αριθμός ημερών
-TitleAdminCP=Configuration of Leaves
+TitleAdminCP=Διαμόρφωση των αδειών
#Messages
Hello=Γεια σας
-HolidaysToValidate=Validate leave requests
-HolidaysToValidateBody=Below is a leave request to validate
-HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
-HolidaysValidated=Validated leave requests
-HolidaysValidatedBody=Your leave request for %s to %s has been validated.
-HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled leaved request
-HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
-Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+HolidaysToValidate=Επικύρωση των αιτήσεων για τις άδειες
+HolidaysToValidateBody=Παρακάτω είναι ένα αίτημα άδειας για την επικύρωση
+HolidaysToValidateDelay=Αυτή η αίτηση αδείας θα πραγματοποιηθεί εντός προθεσμίας μικρότερης των %s ημερών.
+HolidaysToValidateAlertSolde=Ο χρήστης που έκανε αυτό το αίτημα δεν έχει αρκετές διαθέσιμες ημέρες.
+HolidaysValidated=Επικυρώθηκαν οι αιτήσεις άδειας
+HolidaysValidatedBody=Η αίτηση αδείας %s στο %s έχει επικυρωθεί.
+HolidaysRefused=Αίτηση αρνήθηκε
+HolidaysRefusedBody=Η αίτηση αδείας σας για %s στο %s έχει απορριφθεί για τον ακόλουθο λόγο:
+HolidaysCanceled=Ακυρώθηκε το αίτημα αδείας
+HolidaysCanceledBody=Η αίτηση αδείας σας για %s στο %s έχει ακυρωθεί.
+Permission20000=Διαβάστε τη δική σας αίτηση άδειας
+Permission20001=Δημιουργία/τροποποίηση των αιτήσεων αδειών σας
+Permission20002=Δημιουργία/τροποποίηση των αιτήσεων αδειών για όλους
+Permission20003=Διαγραφή των αιτήσεων άδειας
+Permission20004=Ρύθμιση χρηστών για τις διαθέσιμες ημέρες αδείας
+Permission20005=Αναθεώρηση καταγραφής των τροποποιημένων αιτήσεων άδειας
+Permission20006=Μηνιαία έκθεση αδειών
diff --git a/htdocs/langs/el_GR/interventions.lang b/htdocs/langs/el_GR/interventions.lang
index e546e25d855ad5f5e1d1786660949f75b960b4f6..88304fbdc30d4f1be58ec528e63dca3870854db7 100644
--- a/htdocs/langs/el_GR/interventions.lang
+++ b/htdocs/langs/el_GR/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Παρέμβαση
Interventions=Παρεμβάσεις
InterventionCard=Καρτέλα παρέμβασης
NewIntervention=Νέα παρέμβαση
-AddIntervention=Προσθ. παρέμβασης
+AddIntervention=Create intervention
ListOfInterventions=Λίστα παρεμβάσεων
EditIntervention=Τροποποίηση παρέμβασης
ActionsOnFicheInter=Δράσεις για την παρέμβαση
@@ -30,6 +30,15 @@ StatusInterInvoiced=Τιμολογείται
RelatedInterventions=Οι παρεμβάσεις που σχετίζονται
ShowIntervention=Εμφάνιση παρέμβασης
SendInterventionRef=Υποβολή παρέμβασης %s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Αντιπρόσωπος που παρακολουθεί την παρέμβαση
TypeContact_fichinter_internal_INTERVENING=Παρεμβαίνων
diff --git a/htdocs/langs/el_GR/mails.lang b/htdocs/langs/el_GR/mails.lang
index 92d71df9b11becbb85c34713a7ce781056e75918..21f18dfbeb69c00f067c552e3deab30e83c2121c 100644
--- a/htdocs/langs/el_GR/mails.lang
+++ b/htdocs/langs/el_GR/mails.lang
@@ -115,7 +115,7 @@ SentBy=Στάλθηκε από
MailingNeedCommand=Για λόγους ασφαλείας, αποστολή ηλεκτρονικού ταχυδρομείου είναι καλύτερη όταν γίνεται από την γραμμή εντολών. Εάν έχετε ένα, ζητήστε από το διαχειριστή του διακομιστή σας για να ξεκινήσει την ακόλουθη εντολή για να στείλετε το ηλεκτρονικό ταχυδρομείο σε όλους τους παραλήπτες:
MailingNeedCommand2=Μπορείτε, ωστόσο, να τους στείλετε σε απευθείας σύνδεση με την προσθήκη της παραμέτρου MAILING_LIMIT_SENDBYWEB με την αξία του μέγιστου αριθμού των μηνυμάτων ηλεκτρονικού ταχυδρομείου που θέλετε να στείλετε από τη συνεδρία. Για το σκοπό αυτό, πηγαίνετε στο Αρχική - Ρυθμίσεις - Άλλες Ρυθμίσεις.
ConfirmSendingEmailing=Εάν δεν μπορείτε ή προτιμάτε την αποστολή τους με το πρόγραμμα περιήγησης σας, παρακαλώ επιβεβαιώστε ότι είστε σίγουροι ότι θέλετε να στείλετε μηνύματα ηλεκτρονικού ταχυδρομείου τώρα από τον browser σας;
-LimitSendingEmailing=Σημείωση: On line αποστολή emailings περιορίζονται για την ασφάλεια και τη λήξη χρόνου λόγοι για να <b>%s</b> παραλήπτες με την αποστολή συνεδρίας.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=Εκκαθάριση λίστας
ToClearAllRecipientsClickHere=Κάντε κλικ εδώ για να καταργήσετε τη λίστα παραληπτών για αυτό το ηλεκτρονικό ταχυδρομείο
ToAddRecipientsChooseHere=Προσθέστε παραλήπτες επιλέγοντας από τις λίστες
@@ -133,6 +133,9 @@ Notifications=Notifications
NoNotificationsWillBeSent=Δεν υπάρχουν ειδοποιήσεις μέσω ηλεκτρονικού ταχυδρομείου που έχουν προγραμματιστεί για αυτό το συμβάν και την εταιρεία
ANotificationsWillBeSent=1 ειδοποίηση θα σταλεί μέσω e-mail
SomeNotificationsWillBeSent=%s Θα αποστέλλονται ειδοποιήσεις μέσω e-mail
-AddNewNotification=Ενεργοποιήστε μια νέα αίτηση ειδοποίησης με email
-ListOfActiveNotifications=Λίστα όλων των ενεργών αιτήσεων ειδοποίησης με email
+AddNewNotification=Ενεργοποιήστε ένα νέο στόχο ειδοποίησης μέσω ηλεκτρονικού ταχυδρομείου
+ListOfActiveNotifications=Λίστα όλων των ενεργών στόχων ειδοποίησης μέσω ηλεκτρονικού ταχυδρομείου
ListOfNotificationsDone=Λίστα όλων των ειδοποιήσεων ηλεκτρονικού ταχυδρομείου που αποστέλλονται
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang
index 923228a3a947d4a85e21153efebf157a1802d8c5..4ca402fa4b9d34d6edfff8c59a529930cb93018a 100644
--- a/htdocs/langs/el_GR/main.lang
+++ b/htdocs/langs/el_GR/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Αποτυχία εύρεσης του χ
ErrorNoVATRateDefinedForSellerCountry=Σφάλμα, δεν ορίστηκαν ποσοστά φόρων για την χώρα '%s'.
ErrorNoSocialContributionForSellerCountry=Σφάλμα, δεν οριστήκε τύπος κοινωνικής εισφοράς για την χώρα '%s'.
ErrorFailedToSaveFile=Σφάλμα, αποτυχία αποθήκευσης αρχείου
-ErrorOnlyPngJpgSupported=Σφάλμα, υποστηρίζονται μόνο οι τύποι αρχείων .png και .jpg
-ErrorImageFormatNotSupported=Η έκδοση (αρθρώματα) της PHP που έχετε, δεν υποστηρίζει μετατροπές εικόνων αυτού του τύπου
SetDate=Ορισμός ημερομηνίας
SelectDate=Επιλέξτε μια ημερομηνία
SeeAlso=Δείτε επίσης %s
BackgroundColorByDefault=Προκαθορισμένο χρώμα φόντου
+FileNotUploaded=Το αρχείο δεν έχει μεταφορτωθεί
+FileUploaded=Το αρχείο ανέβηκε με επιτυχία
FileWasNotUploaded=Επιλέχθηκε ένα αρχείο για επισύναψη, αλλά δεν έχει μεταφερθεί ακόμη. Πατήστε στο "Επισύναψη Αρχείου".
NbOfEntries=Πλήθος εγγραφών
GoToWikiHelpPage=Βοήθεια (απαιτείται Internet)
@@ -266,6 +266,7 @@ Afternoon=Απόγευμα
Quadri=Τετραπλής
MonthOfDay=Μήνας από την ημέρα
HourShort=Ω
+MinuteShort=εκ
Rate=Βαθμός
UseLocalTax=με Φ.Π.Α
Bytes=Bytes
@@ -340,6 +341,7 @@ FullList=Πλήρης Λίστα
Statistics=Στατιστικά
OtherStatistics=Οι άλλες στατιστικές
Status=Κατάσταση
+Favorite=Αγαπημένα
ShortInfo=Info.
Ref=Κωδ.
RefSupplier=Αριθ. Τιμολογίου
@@ -365,6 +367,7 @@ ActionsOnCompany=Ενέργειες για αυτό το στοιχείο
ActionsOnMember=Εκδηλώσεις σχετικά με αυτό το μέλος
NActions=%s ενέργειες
NActionsLate=%s καθυστερ.
+RequestAlreadyDone=Η αίτηση έχει ήδη καταγραφεί
Filter=Φίλτρο
RemoveFilter=Αφαίρεση φίλτρου
ChartGenerated=Το γράφημα δημιουργήθηκε
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Extra setup χαρακτηριστικά
URLPhoto=URL της φωτογραφία / λογότυπο
SetLinkToThirdParty=Σύνδεση με άλλο τρίτο μέρος
CreateDraft=Δημιουργία σχεδίου
+SetToDraft=Επιστροφή στο προσχέδιο
ClickToEdit=Κάντε κλικ για να επεξεργαστείτε
ObjectDeleted=Αντικείμενο %s διαγράφεται
ByCountry=Με τη χώρα
@@ -678,7 +682,7 @@ ViewPrivateNote=Προβολή σημειώσεων
XMoreLines=%s γραμμή (ές) κρυμμένη
PublicUrl=Δημόσια URL
AddBox=Προσθήκη πεδίου
-
+SelectElementAndClickRefresh=Επιλέξτε ένα στοιχείο και κάντε κλικ στο κουμπί Ανανέωση
# Week day
Monday=Δευτέρα
Tuesday=Τρίτη
diff --git a/htdocs/langs/el_GR/margins.lang b/htdocs/langs/el_GR/margins.lang
index 3979cbf3431a72da01b1e659f89f4f59f6b35bdf..9fa082ec70288ffef6dd2b47f537eafb54e07bf2 100644
--- a/htdocs/langs/el_GR/margins.lang
+++ b/htdocs/langs/el_GR/margins.lang
@@ -8,26 +8,20 @@ MarginOnServices=Περιθώριο / Υπηρεσίες
MarginRate=Τιμή Περιθωρίου
MarkRate=Σημειώστε ποσοστό
DisplayMarginRates=Εμφάνιση ποσοστό κέρδους
-DisplayMarkRates=Εμφάνιση σημειωμένες τιμές
+DisplayMarkRates=Εμφάνιση σημειωμένων τιμών
InputPrice=Εισαγωγή τιμής
-
margin=Διαχείριση των ποσοστών κέρδους
margesSetup=Ρύθμιση της διαχείρισης ποσοστών κέρδους
-
MarginDetails=Λεπτομέρειες Περιθωρίων
-
ProductMargins=Περιθώρια προϊόντος
CustomerMargins=Περιθώρια πελατών
-SalesRepresentativeMargins=Sales representative margins
-
+SalesRepresentativeMargins=Περιθώρια αντιπρόσωπου πωλήσεων
ProductService=Προϊόν ή Υπηρεσία
AllProducts=Όλα τα προϊόντα και οι υπηρεσίες
ChooseProduct/Service=Επιλέξτε προϊόν ή υπηρεσία
-
StartDate=Ημερ. έναρξης
EndDate=Ημερ. λήξης
Launch=Έναρξη
-
ForceBuyingPriceIfNull=Υποχρεωτική τιμή αγοράς, αν η τιμή είναι μηδενική
ForceBuyingPriceIfNullDetails=Αν είναι "ON", το περιθώριο θα είναι μηδενικό στη γραμμή (τιμή αγοράς = τιμή πώλησης), αν ειναι ("OFF"), θα είναι ίση με την τιμή πώλησης (τιμή αγοράς = 0)
MARGIN_METHODE_FOR_DISCOUNT=Μέθοδος ποσοστού για της γενικές εκπτώσεις
@@ -35,16 +29,16 @@ UseDiscountAsProduct=Ως προϊόν
UseDiscountAsService=Ως υπηρεσία
UseDiscountOnTotal=Στο υποσύνολο
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Καθορίζει αν η συνολική έκπτωση που θεωρείται ως ένα προϊόν, μια υπηρεσία, ή μόνον επί του υποσυνόλου για τον υπολογισμό του περιθωρίου κέρδους.
-
MARGIN_TYPE=Τύπος περιθωρίου
MargeBrute=Αρχικό περιθώριο
MargeNette=Το καθαρό περιθώριο
MARGIN_TYPE_DETAILS=Αρχικό περιθώριο: τιμή πώλησης - τιμή αγοράς<br/>Το καθαρό περιθώριο: τιμή πώλησης - τιμή κόστους
-
CostPrice=Τιμή κόστους
BuyingCost=Τιμή κόστους
UnitCharges=Χρεώσεων
Charges=Επιβαρύνσεις
-
AgentContactType=Εμπορικός αντιπρόσωπος τύπο επαφής
-AgentContactTypeDetails=Ορίστε ποιο τύπο επαφής (που συνδέεται στα τιμολόγια) θα χρησιμοποιηθεί για την αναφορά του περιθωρίου των εμπορικών αντιπροσώπων
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/el_GR/orders.lang b/htdocs/langs/el_GR/orders.lang
index 1d044e9f82177dc2f5e8e8f11d74ddd5c601f763..bee3ae37dd936923dd9971f73b5501c95e23a95c 100644
--- a/htdocs/langs/el_GR/orders.lang
+++ b/htdocs/langs/el_GR/orders.lang
@@ -53,9 +53,9 @@ ShippingExist=Μια αποστολή, υπάρχει
DraftOrWaitingApproved=Draft or approved not yet ordered
DraftOrWaitingShipped=Draft or validated not yet shipped
MenuOrdersToBill=Παραγγελίες προς χρέωση
-MenuOrdersToBill2=Παραγγελίες για τιμολόγηση
+MenuOrdersToBill2=Billable orders
SearchOrder=Εύρεση παραγγελίας
-# SearchACustomerOrder=Search a customer order
+SearchACustomerOrder=Αναζητήστε μία παραγγελία πελάτη
ShipProduct=Ship product
Discount=Έκπτωση
CreateOrder=Δημιουργία παραγγελίας
@@ -65,7 +65,7 @@ ValidateOrder=Επικύρωση παραγγελίας
UnvalidateOrder=Για Unvalidate
DeleteOrder=Διαγραφή παραγγελίας
CancelOrder=Ακύρωση παραγγελίας
-AddOrder=Προσθήκη παραγγελίας
+AddOrder=Δημιουργία παραγγελίας
AddToMyOrders=Προσθήκη στις παραγγελίες μου
AddToOtherOrders=Προσθήκη στις άλλες παραγγελίες
AddToDraftOrders=Προσθήκη στο σχέδιο παραγγελιας
@@ -101,7 +101,6 @@ RelatedOrders=Σχετικές παραγγελίες
OnProcessOrders=Παραγγελίες σε εξέλιξη
RefOrder=Κωδ. παραγγελίας
RefCustomerOrder=Κωδ. πελάτη παραγγελίας
-CustomerOrder=Παραγγελία πελάτη
RefCustomerOrderShort=Ref. cust. order
SendOrderByMail=Αποστολή παραγγελίας με email
ActionsOnOrder=Ενέργειες στην παραγγελία
@@ -132,8 +131,6 @@ Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s'
Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s'
Error_OrderNotChecked=Δεν υπάρχουν παραγγελίες στο επιλεγμένο τιμολόγιο
-
-
# Sources
OrderSource0=Εμπορική πρόταση
OrderSource1=Internet
@@ -144,7 +141,6 @@ OrderSource5=Commercial
OrderSource6=Store
QtyOrdered=Qty ordered
AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order
-
# Documents models
PDFEinsteinDescription=Ολοκληρωμένο πρότυπο παραγγελίας (λογότυπο...)
PDFEdisonDescription=Απλό πρότυπο παραγγελίας
@@ -155,14 +151,12 @@ OrderByFax=Φαξ
OrderByEMail=EMail
OrderByWWW=Online
OrderByPhone=Τηλέφωνο
-
CreateInvoiceForThisCustomer=Τιμολογημένες παραγγελίες
NoOrdersToInvoice=Δεν υπάρχουν τιμολογημένες παραγγελίες
CloseProcessedOrdersAutomatically=Χαρακτηρίστε σε «εξέλιξη» όλες τις επιλεγμένες παραγγελίες.
-MenuOrdersToBill2=Παραγγελίες για τιμολόγηση
OrderCreation=Δημιουργία Παραγγελίας
Ordered=Παραγγελια
OrderCreated=Οι παραγγελίες σας έχουν δημιουργηθεί
OrderFail=Ένα σφάλμα συνέβη κατά τη διάρκεια την δημιουργία τις παραγγελίες
CreateOrders=Δημιουργία παραγγελιών
-# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+ToBillSeveralOrderSelectCustomer=Για να δημιουργήσετε ένα τιμολόγιο για αρκετές παραγγελίες, κάντε κλικ πρώτα στον πελάτη, στη συνέχεια, επιλέξτε "%s".
diff --git a/htdocs/langs/el_GR/oscommerce.lang b/htdocs/langs/el_GR/oscommerce.lang
deleted file mode 100644
index 53308cb42c97930e6b47735b4efc13ad05e29c01..0000000000000000000000000000000000000000
--- a/htdocs/langs/el_GR/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=OS Commerce εγκατάσταση μονάδας
-OSCommerceSetupSaved=OS Commerce setup saved
-OSCommerceServer=OS Commerce server host/ip
-OSCommerceDatabaseName=OS Commerce database name
-OSCommercePrefix=OS Commerce tables prefix
-OSCommerceUser=OS Commerce database login
diff --git a/htdocs/langs/el_GR/other.lang b/htdocs/langs/el_GR/other.lang
index 6f1b6962450a4e135ef9366be76b79217d5e7dc0..8fd2c21cf775ba8f27a7935469334710757a1573 100644
--- a/htdocs/langs/el_GR/other.lang
+++ b/htdocs/langs/el_GR/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=Κωδικός ασφαλείας
Calendar=Ημερολόγιο
-AddTrip=Προσθήκη ταξιδιού
Tools=Εργαλεία
ToolsDesc=Αυτή η περιοχή είναι αφιερωμένη στην ομάδα διάφορα εργαλεία που είναι διαθέσιμα δεν σε άλλες καταχωρήσεις μενού. <br><br> Αυτά τα εργαλεία είναι προσβάσιμα από το μενού στο πλάι.
Birthday=Γενέθλια
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Δημιουργία έργου
Notify_TASK_CREATE=Η εργασία δημιουργήθηκε
Notify_TASK_MODIFY=Η εργασία τροποποιήθηκε
Notify_TASK_DELETE=Η εργασία διαγράφηκε
+SeeModuleSetup=Προβολή ρύθμισης του module
NbOfAttachedFiles=Πλήθος επισυναπτώμενων αρχείων/εγγράφων
TotalSizeOfAttachedFiles=Συνολικό μέγεθος επισυναπτώμενων αρχείων/εγγράφων
MaxSize=Μέγιστο μέγεθος
@@ -80,6 +80,16 @@ ModifiedBy=Τροποποίηθηκε από %s
ValidatedBy=Επικυρώθηκε από %s
CanceledBy=Ακυρώθηκε από %s
ClosedBy=Έκλεισε από %s
+CreatedById=Ταυτότητα χρήστη που δημιούργησε
+ModifiedById=Ταυτότητα χρήστη που τελευταία αλλαγή
+ValidatedById=Ταυτότητα χρήστη που επικύρωσε
+CanceledById=Ταυτότητα χρήστη που ακύρωσε
+ClosedById=Ταυτότητα χρήστη που έκλεισε
+CreatedByLogin=Χρήστης σύνδεσης που δημιούργησε
+ModifiedByLogin=Χρήστης σύνδεσης που έκανε τελευταία αλλαγή
+ValidatedByLogin=Χρήστης σύνδεσης που επικύρωσε
+CanceledByLogin=Χρήστης σύνδεσης που ακύρωσε
+ClosedByLogin=Χρήστης σύνδεσης που έκλεισε
FileWasRemoved=File %s was removed
DirWasRemoved=Directory %s was removed
FeatureNotYetAvailableShort=Διαθέσιμο σε μία επόμενη έκδοση
@@ -193,25 +203,26 @@ ForgetIfNothing=Αν δεν ζητήσατε αυτή την αλλαγή, απ
##### Calendar common #####
AddCalendarEntry=Προσθήκη εγγραφής στο ημερολόγιο %s
-NewCompanyToDolibarr=Η εταιρία %s προστέθηκε στο Dolibarr
-ContractValidatedInDolibarr=Contract %s validated in Dolibarr
-ContractCanceledInDolibarr=Contract %s canceled in Dolibarr
-ContractClosedInDolibarr=Contract %s closed in Dolibarr
-PropalClosedSignedInDolibarr=Proposal %s signed in Dolibarr
-PropalClosedRefusedInDolibarr=Proposal %s refused in Dolibarr
-PropalValidatedInDolibarr=Proposal %s validated in Dolibarr
-InvoiceValidatedInDolibarr=Invoice %s validated in Dolibarr
-InvoicePaidInDolibarr=Invoice %s changed to paid in Dolibarr
-InvoiceCanceledInDolibarr=Invoice %s canceled in Dolibarr
-PaymentDoneInDolibarr=Payment %s done in Dolibarr
-CustomerPaymentDoneInDolibarr=Customer payment %s done in Dolibarr
-SupplierPaymentDoneInDolibarr=Supplier payment %s done in Dolibarr
-MemberValidatedInDolibarr=Member %s validated in Dolibarr
-MemberResiliatedInDolibarr=Member %s resiliated in Dolibarr
-MemberDeletedInDolibarr=Member %s deleted from Dolibarr
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added in Dolibarr
-ShipmentValidatedInDolibarr=Αποστολή %s επικυρωθεί Dolibarr
-ShipmentDeletedInDolibarr=Αποστολες %s διαγράφονται από Dolibarr
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
##### Export #####
Export=Εξαγωγή
ExportsArea=Exports area
diff --git a/htdocs/langs/el_GR/paybox.lang b/htdocs/langs/el_GR/paybox.lang
index b0479ba849e222169f6f0efd8c64e0d8e1cdd0a3..f5df39595f7db9b48718848e8b5f8f1a3d785ac4 100644
--- a/htdocs/langs/el_GR/paybox.lang
+++ b/htdocs/langs/el_GR/paybox.lang
@@ -35,3 +35,6 @@ MessageKO=Μήνυμα για την ακύρωση σελίδα επιστρο
NewPayboxPaymentReceived=Νέα πληρωμή Paybox που λήφθηκε
NewPayboxPaymentFailed=Νέα πληρωμή Paybox προσπάθησαν αλλά απέτυχαν
PAYBOX_PAYONLINE_SENDEMAIL=Στείλτε e-mail προειδοποιήσεις μετά από πληρωμή (επιτυχία ή όχι)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/el_GR/resource.lang b/htdocs/langs/el_GR/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..1139926a95ead7e2ea3aec0f82e8ec265b290983
--- /dev/null
+++ b/htdocs/langs/el_GR/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Πόροι
+MenuResourceAdd=Νέος πόρος
+MenuResourcePlanning=Προγραμματισμός των πόρων
+DeleteResource=Διαγραφή πόρων
+ConfirmDeleteResourceElement=Επιβεβαιώστε τη διαγραφή των πόρων για αυτό το στοιχείο
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Λίστα Πόρων
+ResourceSingular=Πόρος
+ResourceCard=Κάρτα Πόρων
+AddResource=Δημιουργήστε έναν πόρο
+ResourceFormLabel_ref=Όνομα Πόρου
+ResourceType=Τύπος Πόρου
+ResourceFormLabel_description=Η περιγραφή πόρου
+
+ResourcesLinkedToElement=Πόροι που σχετίζονται με το στοιχείο
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Μετάβαση στην ημερομηνία
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Ο Πόρος δημιουργήθηκε με επιτυχία
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Επιβεβαιώστε την διαγραφή αυτού του πόρου
+RessourceSuccessfullyDeleted=Ο Πόρος διαγράφηκε με επιτυχία
+DictionaryResourceType=Το είδος των πόρων
+
+DictionaryEMailTemplates=Μοντέλα των Emails
+
+SelectResource=Επιλέξτε πόρο
diff --git a/htdocs/langs/el_GR/sendings.lang b/htdocs/langs/el_GR/sendings.lang
index fffc1e4a735cbe9a80f38df4821250c6f83063e7..f0364df4db50b31f9391e4bbc46d14deacc364cc 100644
--- a/htdocs/langs/el_GR/sendings.lang
+++ b/htdocs/langs/el_GR/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=Προς το παρόν, η δημιουργί
RelatedShippings=Σχετικές αποστολές
ShipmentLine=Σειρά αποστολής
CarrierList=Κατάλογος των μεταφορέων
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
# Sending methods
SendingMethodCATCH=Πιάσε τον πελάτη
diff --git a/htdocs/langs/el_GR/stocks.lang b/htdocs/langs/el_GR/stocks.lang
index 5b63855fea82946759f21f042455a854f6c0d175..8c4c7dfb7e48afb2638a4ac6a31c706a669f2f95 100644
--- a/htdocs/langs/el_GR/stocks.lang
+++ b/htdocs/langs/el_GR/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Ετικέτα Αποθήκη απαιτείται
CorrectStock=Σωστή απόθεμα
ListOfWarehouses=Κατάλογος των αποθηκών
ListOfStockMovements=Κατάλογος των κινήσεων των αποθεμάτων
-StocksArea=Αποθέματα περιοχή
+StocksArea=Περιοχή αποθηκών
Location=Τοποθεσία
LocationSummary=Σύντομη τοποθεσία όνομα
NumberOfDifferentProducts=Αριθμός διαφορετικών προϊόντων
diff --git a/htdocs/langs/el_GR/users.lang b/htdocs/langs/el_GR/users.lang
index 0ef23155a7ed054c065d99908a7ec732423a0b06..318a2054c4d6955ba51c0ddceb139ad05114cc2f 100644
--- a/htdocs/langs/el_GR/users.lang
+++ b/htdocs/langs/el_GR/users.lang
@@ -63,7 +63,6 @@ ShowGroup=Εμφάνιση ομάδας
ShowUser=Εμφάνιση χρήστη
NonAffectedUsers=Non affected users
UserModified=User modified successfully
-GroupModified=Group modified successfully
PhotoFile=Photo file
UserWithDolibarrAccess=User with Dolibarr access
ListOfUsersInGroup=List of users in this group
@@ -103,7 +102,7 @@ UserDisabled=User %s disabled
UserEnabled=User %s activated
UserDeleted=User %s removed
NewGroupCreated=Group %s created
-GroupModified=Group modified successfully
+GroupModified=Group %s modified
GroupDeleted=Group %s removed
ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact ?
ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member ?
@@ -114,8 +113,10 @@ YourRole=Your roles
YourQuotaOfUsersIsReached=Your quota of active users is reached !
NbOfUsers=Nb των χρηστών
DontDowngradeSuperAdmin=Μόνο μια superadmin μπορεί να προβεί στην ανακατάταξη ενός superadmin
-HierarchicalResponsible=Ιεραρχική ευθύνη
+HierarchicalResponsible=Επόπτης
HierarchicView=Ιεραρχική προβολή
UseTypeFieldToChange=Χρησιμοποιήστε είδος πεδίου για να αλλάξετε
OpenIDURL=OpenID URL
LoginUsingOpenID=Χρησιμοποιήστε το OpenID για να συνδεθείτε
+WeeklyHours=Εβδομαδιαίες ώρες
+ColorUser=Χρώμα του χρήστη
diff --git a/htdocs/langs/el_GR/withdrawals.lang b/htdocs/langs/el_GR/withdrawals.lang
index 09b6ec0d2e2d5f52a6761e635cd4a541874d0ebf..68a92beb6cf6883187f4288f379cacfe21b7556d 100644
--- a/htdocs/langs/el_GR/withdrawals.lang
+++ b/htdocs/langs/el_GR/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=Παραλαβή
LastWithdrawalReceipts=Τελευταία εισπράξεις απόσυρση %s
WithdrawedBills=Αποσύρθηκε τιμολόγια
WithdrawalsLines=Απόσυρση γραμμές
-RequestStandingOrderToTreat=Αίτηση πάγιων εντολών για τη θεραπεία
-RequestStandingOrderTreated=Αίτηση για παραγγελίες που έλαβαν στέκεται
+RequestStandingOrderToTreat=Request for standing orders to process
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=Πάγιες εντολές πελατών
CustomerStandingOrder=Πελάτης πάγια εντολή
NbOfInvoiceToWithdraw=Nb. του τιμολογίου με το αίτημα απόσυρσης
@@ -40,14 +41,13 @@ TransMetod=Μέθοδος αποστολής
Send=Αποστολή
Lines=Γραμμές
StandingOrderReject=Εκδώσει απόρριψη
-InvoiceRefused=Τιμολόγιο αρνήθηκε
WithdrawalRefused=Απόσυρση απορρίφθηκε
WithdrawalRefusedConfirm=Είστε σίγουροι ότι θέλετε να εισάγετε μια απόρριψη αναμονής για την κοινωνία
RefusedData=Ημερομηνία της απόρριψης
RefusedReason=Λόγος απόρριψης
RefusedInvoicing=Χρέωσης για την απόρριψη
NoInvoiceRefused=Μην φορτίζετε την απόρριψη
-InvoiceRefused=Τιμολόγιο αρνήθηκε
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=Κατάσταση
StatusUnknown=Άγνωστος
StatusWaiting=Αναμονή
@@ -76,7 +76,7 @@ WithBankUsingRIB=Για τους τραπεζικούς λογαριασμούς
WithBankUsingBANBIC=Για τους τραπεζικούς λογαριασμούς που χρησιμοποιούν IBAN / BIC / SWIFT
BankToReceiveWithdraw=Τραπεζικός λογαριασμός για να λάβετε αποσύρει
CreditDate=Πιστωτικές με
-WithdrawalFileNotCapable=Δεν είναι δυνατή η δημιουργία αρχείου απόσυρση απόδειξη για τη χώρα σας
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
ShowWithdraw=Εμφάνιση Ανάληψη
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Ωστόσο, εάν το τιμολόγιο δεν έχει τουλάχιστον μία πληρωμή απόσυρσης ακόμη σε επεξεργασία, δεν θα πρέπει να οριστεί ως καταβληθέν θα επιτρέψει εκ των προτέρων την απόσυρση από την διαχείριση.
DoStandingOrdersBeforePayments=Αυτή η καρτέλα σας επιτρέπει να ζητήσετε μια πάγια εντολή. Από τη στιγμή που έχει ολοκληρωθεί, μπορείτε να πληκτρολογήσετε την πληρωμή για να κλείσει το τιμολόγιο.
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
old mode 100644
new mode 100755
index af61e62c31cd5919c395bf50619640460b7fb1e0..3f8c5aa4f6cabe2b1e593fc4dd89faea8c75c919
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -495,6 +495,8 @@ Module1780Name=Categories
Module1780Desc=Category management (products, suppliers and customers)
Module2000Name=WYSIWYG editor
Module2000Desc=Allow to edit some text area using an advanced editor
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
Module2300Name=Cron
Module2300Desc=Scheduled task management
Module2400Name=Agenda
@@ -503,6 +505,8 @@ Module2500Name=Electronic Content Management
Module2500Desc=Save and share documents
Module2600Name=WebServices
Module2600Desc=Enable the Dolibarr web services server
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
Module2700Name=Gravatar
Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
Module2800Desc=FTP Client
@@ -517,7 +521,7 @@ Module6000Desc=Workflow management
Module20000Name=Leave Requests management
Module20000Desc=Declare and follow employees leaves requests
Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
Module50000Name=PayBox
Module50000Desc=Module to offer an online payment page by credit card with PayBox
Module50100Name=Point of sales
diff --git a/htdocs/langs/en_US/contracts.lang b/htdocs/langs/en_US/contracts.lang
index 511516dc755e4f3aba2d67e91238426896629cbd..06c05e520fad602ebcd075316214c9abd157c3d7 100644
--- a/htdocs/langs/en_US/contracts.lang
+++ b/htdocs/langs/en_US/contracts.lang
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines
ListOfRunningServices=List of running services
NotActivatedServices=Inactive services (among validated contracts)
BoardNotActivatedServices=Services to activate among validated contracts
-LastContracts=Last % contracts
+LastContracts=Last %s contracts
LastActivatedServices=Last %s activated services
LastModifiedServices=Last %s modified services
EditServiceLine=Edit service line
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
old mode 100644
new mode 100755
index 0187c567eb6f790c53c31d8f5995528f6c4c0b93..35b7da137282f2dd4e05ea293c0942183548bb91
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -138,6 +138,24 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet
ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index b789f2f8423923d688278cc7c8dbc37ec52a304a..3593e4c879f3c325cafc6d13eba22d2121fd32d1 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -203,3 +203,4 @@ MembersByNature=Members by nature
VATToUseForSubscriptions=VAT rate to use for subscriptions
NoVatOnSubscription=No TVA for subscriptions
MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
\ No newline at end of file
diff --git a/htdocs/langs/en_US/oscommerce.lang b/htdocs/langs/en_US/oscommerce.lang
deleted file mode 100644
index 3ff9108ead4e2ba3a94229a24177998c14e624fc..0000000000000000000000000000000000000000
--- a/htdocs/langs/en_US/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=OS Commerce module setup
-OSCommerceSetupSaved=OS Commerce setup saved
-OSCommerceServer=OS Commerce server host/ip
-OSCommerceDatabaseName=OS Commerce database name
-OSCommercePrefix=OS Commerce tables prefix
-OSCommerceUser=OS Commerce database login
diff --git a/htdocs/langs/en_US/productbatch.lang b/htdocs/langs/en_US/productbatch.lang
index 07fb45985d5495596d8f1e1c73f01d6d6b68e905..3bc492db8e2c48897b58e1254255186c61a37c4c 100644
--- a/htdocs/langs/en_US/productbatch.lang
+++ b/htdocs/langs/en_US/productbatch.lang
@@ -1,19 +1,19 @@
# ProductBATCH language file - en_US - ProductBATCH
-CHARSET= UTF-8
-ProductStatusOnBatch= Managed
-ProductStatusNotOnBatch= Not Managed
-ProductStatusOnBatchShort= Managed
-ProductStatusNotOnBatchShort= Not Managed
-Batch=Batch
-atleast1batchfield= Eat-by date or Sell-by date or Batch number
-batch_number= Batch number
-l_eatby= Eat-by date
-l_sellby= Sell-by date
-DetailBatchNumber= Batch details
-DetailBatchFormat= E:%s S: %s BATCH: %s (Qty : %d)
-printBatch= Batch: %s
-printEatby= Eat-by: %s
-printSellby= Sell-by: %s
-printQty= Qty: %d
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=E:%s S: %s BATCH: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
AddDispatchBatchLine=Add a line for Shelf Life dispatching
-BatchDefaultNumber= Undefined
\ No newline at end of file
+BatchDefaultNumber=Undefined
\ No newline at end of file
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
old mode 100644
new mode 100755
index b38bcd150a96ae1292cba962adf6b62d4f2e8052..d3fa93e170210644a5695464c08057e7381308f3
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -242,3 +242,8 @@ ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
PriceByCustomerLog=Price by customer log
MinimumPriceLimit=Minimum price can't be lower that %s
MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/en_US/resource.lang b/htdocs/langs/en_US/resource.lang
old mode 100755
new mode 100644
diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang
index 20ebb652882193467bf30faf771973e9bcdc26e2..2c5560d1d24a94f5baee00ab54729c90a5c3fa85 100644
--- a/htdocs/langs/es_ES/accountancy.lang
+++ b/htdocs/langs/es_ES/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=Seleccione un plan contable
Validate=Validar
Addanaccount=Añadir una cuenta contable
AccountAccounting=Cuenta contable
-Ventilation=Contabilizar
+Ventilation=Breakdown
ToDispatch=A realizar
Dispatched=Realizadas
-CustomersVentilation=Contabilización ventas
-SuppliersVentilation=Contabilización compras
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
TradeMargin=Margen de beneficio
Reports=Informes
ByCustomerInvoice=Por facturas a clientes
@@ -45,9 +45,9 @@ WriteBookKeeping=Registrar los asientos en el libro mayor
Bookkeeping=Libro Mayor
AccountBalanceByMonth=Saldo mensual
-AccountingVentilation=Contabilización
-AccountingVentilationSupplier=Contabilización compras
-AccountingVentilationCustomer=Contabilización ventas
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
Line=Línea
CAHTF=Total (base imponible) compras a proveedor
@@ -56,7 +56,7 @@ InvoiceLinesDone=Líneas de facturas contabilizadas
IntoAccount=En la cuenta
Ventilate=Contabilizar
-VentilationAuto=Contabilización automática
+VentilationAuto=Automatic breakdown
Processing=Tratamiento
EndProcessing=Final del tratamiento
@@ -68,9 +68,9 @@ NotVentilatedinAccount=Cuenta sin contabilización en la contabilidad
ACCOUNTING_SEPARATORCSV=Separador CSV
-ACCOUNTING_LIMIT_LIST_VENTILATION=Número de elementos a contabilizar que se muestran por página (máximo recomendado: 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Ordenar las páginas de contabilización "A contabilizar" por los elementos más recientes
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Ordenar las páginas de contabilización "Contabilizadas" por los elementos más recientes
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
AccountLength=Longitud de las cuentas contables mostradas en Dolibarr
AccountLengthDesc=Función para simular una longitud de cuenta contable sustituyendo los espacios por cero. Esta función sólo afecta a la pantalla, no cambia las cuentas contables registradas en Dolibarr. Esta función es necesaria para la exportación, para ser compatible con algunos programas.
@@ -140,14 +140,14 @@ Active=Estado
NewFiscalYear=Nuevo año fiscal
-DescVentilCustomer=Consulte aquí la contabilización anual de sus facturas a clientes
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
TotalVente=Total ventas (base imponible)
TotalMarge=Total margen ventas
DescVentilDoneCustomer=Consulte aquí las líneas de facturas a clientes y sus cuentas contables
DescVentilTodoCustomer=Contabilice sus líneas de facturas a clientes con una cuenta contable
ChangeAccount=Cambie la cuenta para las líneas seleccionadas a la cuenta:
Vide=-
-DescVentilSupplier=Consulte aquí la contabilidad anual de sus facturas de proveedores
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
DescVentilTodoSupplier=Contabilize sus líneas de facturas de proveedores
DescVentilDoneSupplier=Consulte aquí la lista de facturas de proveedores y sus cuentas contables
@@ -155,4 +155,4 @@ ValidateHistory=Validar automáticamente
ErrorAccountancyCodeIsAlreadyUse=Error, no puede eliminar esta cuenta ya que está siendo usada
-FicheVentilation=Ficha contable
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 79935d143caab6e887ef3784b8bc89c3b08b0f80..8637f7088db25e6edb8f828e9bbf6534aa5bb91f 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -437,8 +437,8 @@ Module52Name=Stocks de productos
Module52Desc=Gestión de stocks de productos
Module53Name=Servicios
Module53Desc=Gestión de servicios
-Module54Name=Contratos
-Module54Desc=Gestión de contratos
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=Códigos de barras
Module55Desc=Gestión de los códigos de barras
Module56Name=Telefonía
@@ -475,8 +475,8 @@ Module320Name=Hilos RSS
Module320Desc=Adición de hilos de información RSS en las pantallas Dolibarr
Module330Name=Marcadores
Module330Desc=Gestión de marcadores
-Module400Name=Proyectos
-Module400Desc=Gestión de los proyectos en los otros módulos
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=Webcalendar
Module410Desc=Interfaz con el calendario Webcalendar
Module500Name=Gastos especiales (impuestos, gastos sociales, dividendos)
@@ -606,11 +606,11 @@ Permission151=Consultar domiciliaciones
Permission152=Crear/modificar domiciliaciones
Permission153=Enviar domiciliaciones
Permission154=Abonar/devolver domiciliaciones
-Permission161=Consultar contratos de servicio
-Permission162=Crear/modificar contratos de servicio
-Permission163=Activar los servicios de un contrato
-Permission164=Desactivar los servicios de un contrato
-Permission165=Eliminar contratos
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
Permission171=Leer honorarios (propios y de sus subordinados)
Permission172=Crear/modificar honorarios
Permission173=Eliminar honorarios
@@ -672,7 +672,7 @@ Permission300=Consultar códigos de barras
Permission301=Crear/modificar códigos de barras
Permission302=Eliminar código de barras
Permission311=Consultar servicios
-Permission312=Asignar servicios a un contrato
+Permission312=Assign service/subscription to contract
Permission331=Consultar marcadores
Permission332=Crear/modificar marcadores
Permission333=Eliminar marcadores
@@ -702,8 +702,8 @@ Permission701=Consultar donaciones
Permission702=Crear/modificar donaciones
Permission703=Eliminar donaciones
Permission1001=Consultar stocks
-Permission1002=Crear/modificar stocks
-Permission1003=Eliminar stocks
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=Consultar movimientos de stock
Permission1005=Crear/modificar movimientos de stock
Permission1101=Consultar ordenes de envío
@@ -1039,7 +1039,6 @@ YesInSummer=Sí en verano
OnlyFollowingModulesAreOpenedToExternalUsers=Tenga en cuenta que sólo los módulos siguientes están abiertos a usuarios externos (sean cuales sean los permisos de los usuarios):
SuhosinSessionEncrypt=Almacenamiento de sesiones cifradas por Suhosin
ConditionIsCurrently=Actualmente la condición es %s
-TestNotPossibleWithCurrentBrowsers=La detección automática no es posible con el navegador actual
YouUseBestDriver=Está usando el driver %s, actualmente es el mejor driver disponible.
YouDoNotUseBestDriver=Usa el driver %s aunque se recomienda usar el driver %s.
NbOfProductIsLowerThanNoPb=Tiene %s productos/servicios en su base de datos. No es necesaria ninguna optimización en particular.
@@ -1139,6 +1138,7 @@ AddDeliveryAddressAbility=Posibilidad de seleccionar una dirección de envío
UseOptionLineIfNoQuantity=Una línea de producto/servicio que tiene una cantidad nula se considera como una opción
FreeLegalTextOnProposal=Texto libre en presupuestos
WatermarkOnDraftProposal=Marca de agua en presupuestos borrador (en caso de estar vacío)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=Configuración del módulo pedidos
OrdersNumberingModules=Módulos de numeración de los pedidos
@@ -1160,7 +1160,7 @@ FicheinterNumberingModules=Módulos de numeración de las fichas de intervenció
TemplatePDFInterventions=Modelo de documentos de las fichas de intervención
WatermarkOnDraftInterventionCards=Marca de agua en fichas de intervención (en caso de estar vacío)
##### Contracts #####
-ContractsSetup=Configuración del módulo contratos
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=Módulos de numeración de los contratos
TemplatePDFContracts=Modelos de documento de contratos
FreeLegalTextOnContracts=Texto libre en contratos
@@ -1324,7 +1324,7 @@ FilesOfTypeNotCompressed=Archivos de tipo %s no son comprimidos por el servidor
CacheByServer=Caché mediante el servidor
CacheByClient=Caché mediante el navegador
CompressionOfResources=Compresión de las respuestas HTTP
-TestNotPossibleWithCurrentBrowsers=La detección automática no es posible con el navegador actual
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=Configuración del módulo Productos
ServiceSetup=Configuración del módulo Servicios
@@ -1415,8 +1415,9 @@ OSCommerceTestOk=La conexión al servidor '%s' sobre la base '%s' por el usuario
OSCommerceTestKo1=La conexión al servidor '%s' sobre la base '%s' por el usuario '%s' no se pudo efectuar.
OSCommerceTestKo2=La conexión al servidor '%s' por el usuario '%s' ha fallado.
##### Stock #####
-StockSetup=Configuración del módulo Stocks
-UserWarehouse=Utilizar los stocks personales de usuarios
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=Menú eliminado
TreeMenu=Estructura de los menús
@@ -1481,11 +1482,14 @@ ClickToDialDesc=Este módulo permite agregar un icono después del número de te
##### Point Of Sales (CashDesk) #####
CashDesk=TPV
CashDeskSetup=Configuración del módulo Terminal Punto de Venta
-CashDeskThirdPartyForSell=Tercero genérico a usar para la venta
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Cuenta por defecto a utilizar para los cobros en efectivo (caja)
CashDeskBankAccountForCheque= Cuenta por defecto a utilizar para los cobros con cheques
CashDeskBankAccountForCB= Cuenta por defecto a utilizar para los cobros con tarjeta de crédito
-CashDeskIdWareHouse=Almacén a utilizar para las ventas
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Configuración del módulo Marcadores
BookmarkDesc=Este módulo le permite gestionar los enlaces y accesos directos. También permite añadir cualquier página de Dolibarr o enlace web en el menú de acceso rápido de la izquierda.
@@ -1539,6 +1543,13 @@ ConfirmDeleteFiscalYear=¿Está seguro de querer eliminar este año fiscal?
Opened=Abierto
Closed=Cerrado
AlwaysEditable=Puede editarse siempre
-
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
Format=Formatear
TypePaymentDesc=0:Pago cliente,1:Pago proveedor,2:Tanto pago de cliente como de proveedor
diff --git a/htdocs/langs/es_ES/agenda.lang b/htdocs/langs/es_ES/agenda.lang
index c357756f95ac823b73128b35afb5640aefdfb2ec..c1085fe2b4c207aa5e8f19cbc7fd40c3c22de0dc 100644
--- a/htdocs/langs/es_ES/agenda.lang
+++ b/htdocs/langs/es_ES/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= Inclusión automática en la agenda
AgendaAutoActionDesc= Indique en esta pestaña los eventos para los que desea que Dolibarr cree automáticamente un evento en la agenda. Si no se marca nada (por defecto), solamente las acciones manuales se incluirán en la agenda.
AgendaSetupOtherDesc= Esta página le permite configurar algunas opciones que permiten exportar una vista de su agenda Dolibar a un calendario externo (thunderbird, google calendar, ...)
AgendaExtSitesDesc=Esta página le permite configurar calendarios externos para su visualización en la agenda de Dolibarr.
-ActionsEvents= Eventos para que Dolibarr cree un evento en la agenda de forma automática
-PropalValidatedInDolibarr= Presupuesto %s validado
-InvoiceValidatedInDolibarr= Factura %s validada
+ActionsEvents=Eventos para que Dolibarr cree un evento en la agenda de forma automática
+PropalValidatedInDolibarr=Presupuesto %s validado
+InvoiceValidatedInDolibarr=Factura %s validada
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=Factura %s devuelta a borrador
InvoiceDeleteDolibarr=Factura %s eliminada
OrderValidatedInDolibarr= Pedido %s validado
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Pedido %s aprobado
OrderRefusedInDolibarr=Pedido %s rechazado
OrderBackToDraftInDolibarr=Pedido %s devuelto a borrador
OrderCanceledInDolibarr=Pedido %s anulado
-InterventionValidatedInDolibarr=Intervención %s validada
ProposalSentByEMail=Presupuesto %s enviado por e-mail
OrderSentByEMail=Pedido de cliente %s enviado por e-mail
InvoiceSentByEMail=Factura a cliente %s enviada por e-mail
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=Pedido a proveedor %s enviada por e-mail
SupplierInvoiceSentByEMail=Factura de proveedor %s enviada por e-mail
ShippingSentByEMail=Expedición %s enviada por e-mail
ShippingValidated= Envío %s validado
-InterventionSentByEMail=Intervención %s enviada por e-mail
-InterventionClassifiedBilled=Intervención %s clasificada como Facturada
NewCompanyToDolibarr= Tercero creado
DateActionPlannedStart= Fecha de inicio prevista
DateActionPlannedEnd= Fecha de fin prevista
diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang
index e5f939a753f2b64ee6c2c6026daa622c46fa09de..2f90ce489e7a21f0c40c9706d1b98d1a6f11fa2f 100644
--- a/htdocs/langs/es_ES/bills.lang
+++ b/htdocs/langs/es_ES/bills.lang
@@ -137,8 +137,6 @@ BillFrom=Emisor
BillTo=Enviar a
ActionsOnBill=Eventos sobre la factura
NewBill=Nueva factura
-Prélèvements=Domiciliaciones
-Prélèvements=Domiciliaciones
LastBills=Las %s últimas facturas
LastCustomersBills=Las %s últimas facturas a clientes
LastSuppliersBills=Las %s últimas facturas de proveedores
@@ -219,8 +217,7 @@ NoInvoice=Ninguna factura
ClassifyBill=Clasificar la factura
SupplierBillsToPay=Facturas de proveedores a pagar
CustomerBillsUnpaid=Facturas a clientes pendientes de cobro
-DispenseMontantLettres=Las facturas redactadas por procesos mecánicos están exentas del orden en letras
-DispenseMontantLettres=Las facturas redactadas por procesos mecánicos están exentas del orden en letras
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=No percibido recuperable
SetConditions=Definir condiciones de pago
SetMode=Definir modo de pago
diff --git a/htdocs/langs/es_ES/categories.lang b/htdocs/langs/es_ES/categories.lang
index 289c20e07dcb08e57d2a87f76b668006332a4e81..51c6e4e094ba2f9a1d7352643bb5214c26125a48 100644
--- a/htdocs/langs/es_ES/categories.lang
+++ b/htdocs/langs/es_ES/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Proveedores
CatCusLinks=Clientes/Clientes potenciales
CatProdLinks=Productos
CatMemberLinks=Miembros
-CatProdLinks=Productos
-CatCusLinks=Clientes/Clientes potenciales
-CatSupLinks=Proveedores
DeleteFromCat=Eliminar de la categoría
DeletePicture=Eliminar imagen
ConfirmDeletePicture=¿Confirma la eliminación de la imagen?
@@ -112,3 +109,4 @@ CategoriesSetup=Configuración de categorías
CategorieRecursiv=Enlazar con la categoría padre automáticamente
CategorieRecursivHelp=Si está activado, el producto se enlazará a la categoría padre si lo añadimos a una subcategoría
AddProductServiceIntoCategory=Añadir el siguiente producto/servicio
+ShowCategory=Show category
diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang
index fb9abbabdd91ee4b80c9a5d1d9360ba95f7e8186..a8172d5d5b8de6dab9b6b65ecccade1dce849c48 100644
--- a/htdocs/langs/es_ES/compta.lang
+++ b/htdocs/langs/es_ES/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Código contable incorrecto para %s
SuppliersProductsSellSalesTurnover=Volumen de ventas generado por la venta de los productos de los proveedores
CheckReceipt=Lista de remesas
CheckReceiptShort=Remesas
+LastCheckReceiptShort=Last %s check receipts
NewCheckReceipt=Nueva remesa
NewCheckDeposit=Nuevo ingreso
NewCheckDepositOn=Crear nueva remesa en la cuenta: %s
diff --git a/htdocs/langs/es_ES/contracts.lang b/htdocs/langs/es_ES/contracts.lang
index 9ccf62cfcb42251ee46b56937e09d8f01cbf2955..af08e1c1aaf441314a4d0262b34add232869ea4c 100644
--- a/htdocs/langs/es_ES/contracts.lang
+++ b/htdocs/langs/es_ES/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Área contratos
ListOfContracts=Listado de contratos
-LastContracts=Los % últimos contratos
+LastModifiedContracts=Last %s modified contracts
AllContracts=Todos los contratos
ContractCard=Ficha contrato
ContractStatus=Estado del contrato
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Listado de líneas de contratos en servicio
ListOfRunningServices=Listado de servicios activos
NotActivatedServices=Servicios no activados (con los contratos validados)
BoardNotActivatedServices=Servicios a activar con los contratos validados
-LastContracts=Los % últimos contratos
+LastContracts=Last % contracts
LastActivatedServices=Los %s últimos servicios activados
LastModifiedServices=Los %s últimos servicios modificados
EditServiceLine=Edición línea del servicio
diff --git a/htdocs/langs/es_ES/cron.lang b/htdocs/langs/es_ES/cron.lang
index 2b83df7d11bfb520f2dd25a1aa831659aed4c8f7..75a14a528b78a7969a303af1ab32dc3b72f9e324 100644
--- a/htdocs/langs/es_ES/cron.lang
+++ b/htdocs/langs/es_ES/cron.lang
@@ -18,9 +18,8 @@ CronExplainHowToRunUnix=En entorno Unix debes usar crontab para ejecutar el coma
CronExplainHowToRunWin=En un entorno de Microsoft(tm) Windows puedes usar el programador de tareas para ejecutar el comando cada varios minutos
# Menu
CronJobs=Tareas programadas
-CronListActive= Tareas Activas
-CronListInactive= Tareas Inactivas
-CronListActive= Tareas Activas
+CronListActive=List of active/scheduled jobs
+CronListInactive=Tareas Inactivas
# Page list
CronDateLastRun=Últ. ejec.
CronLastOutput=Res. ult. ejec.
diff --git a/htdocs/langs/es_ES/donations.lang b/htdocs/langs/es_ES/donations.lang
index 064e6587789ea8289fbd9cd5656cadbf8400eb41..27cb070685b39b2d7f1227539b36cd291f5539f8 100644
--- a/htdocs/langs/es_ES/donations.lang
+++ b/htdocs/langs/es_ES/donations.lang
@@ -31,3 +31,8 @@ DonationRecipient=Beneficiario
ThankYou=Muchas gracias
IConfirmDonationReception=El beneficiario confirma la recepción, como donación, de la siguiente cantidad
MinimumAmount=El importe mínimo es %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/es_ES/externalsite.lang b/htdocs/langs/es_ES/externalsite.lang
index 65203ecbe52b2e5fb6d787d451661fad3c3dcb1e..d67d5d8125e1de3622db08c36ef4ab6fccffb652 100644
--- a/htdocs/langs/es_ES/externalsite.lang
+++ b/htdocs/langs/es_ES/externalsite.lang
@@ -2,3 +2,4 @@
ExternalSiteSetup=Configuración del enlace al sitio web externo
ExternalSiteURL=URL del sitio externo
ExternalSiteModuleNotComplete=El módulo Sitio web externo no ha sido configurado correctamente.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/es_ES/holiday.lang b/htdocs/langs/es_ES/holiday.lang
index 99c55188b5a5836c0fa08c113104521c621e48ef..c0fc36fcadaf5b518ee14bcea0fcd8438afcfd62 100644
--- a/htdocs/langs/es_ES/holiday.lang
+++ b/htdocs/langs/es_ES/holiday.lang
@@ -48,7 +48,6 @@ ConfirmDeleteCP=¿Está seguro de querer eliminar esta petición de días libres
ErrorCantDeleteCP=Error, no tiene permisos para eliminar esta petición de días libres.
CantCreateCP=No tiene permisos para realizar peticiones de días libres.
InvalidValidatorCP=Debe indicar un validador para su petición de días libres.
-UpdateButtonCP=Actualizar
CantUpdate=No puede actualizar esta petición de días libres.
NoDateDebut=Debe indicar una fecha de inicio.
NoDateFin=Debe indicar una fecha de fin.
diff --git a/htdocs/langs/es_ES/interventions.lang b/htdocs/langs/es_ES/interventions.lang
index f973ac56e78e668c65b3287d2c69706caf04c344..2db13d0c4874c648a2729507940a24997e0048ae 100644
--- a/htdocs/langs/es_ES/interventions.lang
+++ b/htdocs/langs/es_ES/interventions.lang
@@ -31,6 +31,14 @@ RelatedInterventions=Intervenciones adjuntas
ShowIntervention=Mostrar intervención
SendInterventionRef=Envío de la intervención %s
SendInterventionByMail=Enviar intervención por e-mail
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Responsable seguimiento de la intervención
TypeContact_fichinter_internal_INTERVENING=Interventor
diff --git a/htdocs/langs/es_ES/mails.lang b/htdocs/langs/es_ES/mails.lang
index 531f4ce42d5457d941f7062d731abd00ec88d953..65885aaa6d01c6c2fd84bb462126a3f0a3587eaf 100644
--- a/htdocs/langs/es_ES/mails.lang
+++ b/htdocs/langs/es_ES/mails.lang
@@ -115,7 +115,7 @@ SentBy=Enviado por
MailingNeedCommand=Por razones de seguridad, el envío de un E-Mailing en masa debe realizarse en línea de comandos. Pida a su administrador que lance el comando siguiente para para enviar la correspondencia a a todos los destinatarios:
MailingNeedCommand2=Puede enviar en línea añadiendo el parámetro MAILING_LIMIT_SENDBYWEB con un valor numérico que indica el máximo nº de e-mails a enviar por sesión. Para ello vaya a Inicio - Configuración - Varios.
ConfirmSendingEmailing=¿Confirma el envío del e-mailing?
-LimitSendingEmailing=El envío de un e-mailing desde las pantallas está limitado por razones de seguridad y de timeout a <b>%s</b> destinatarios por sesión de envío.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=Vaciar lista
ToClearAllRecipientsClickHere=Para vaciar la lista de los destinatarios de este E-Mailing, haga click en el botón
ToAddRecipientsChooseHere=Para añadir destinatarios, escoja los que figuran en las listas a continuación
@@ -136,3 +136,6 @@ SomeNotificationsWillBeSent=%s notificaciones van a ser enviadas por e-mail
AddNewNotification=Activar un nuevo destinatario de notificaciones
ListOfActiveNotifications=Listado de todos los destinatarios de notificaciones
ListOfNotificationsDone=Listado de notificaciones enviadas
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index 862ed1a9495640f9432c7e119fd092ee4b3ecd91..209c6be9ef7b68b13282e74b27f40d2f4c780062 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -367,6 +367,7 @@ ActionsOnCompany=Eventos respecto a este tercero
ActionsOnMember=Eventos respecto a este miembro
NActions=%s eventos
NActionsLate=%s en retraso
+RequestAlreadyDone=Request already recorded
Filter=Filtro
RemoveFilter=Eliminar filtro
ChartGenerated=Gráficos generados
diff --git a/htdocs/langs/es_ES/margins.lang b/htdocs/langs/es_ES/margins.lang
index f1c356ab87190bc01a9438145f5291ca20030255..f16c868e593b4b406f15e67a50122b0dcf3d6917 100644
--- a/htdocs/langs/es_ES/margins.lang
+++ b/htdocs/langs/es_ES/margins.lang
@@ -41,3 +41,4 @@ AgentContactType=Tipo de contacto comisionado
AgentContactTypeDetails=Indique qué tipo de contacto (enlazado a las facturas) será el utilizado para el informe de márgenes de agentes comerciales
rateMustBeNumeric=El margen debe ser un valor numérico
markRateShouldBeLesserThan100=El margen tiene que ser menor que 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/es_ES/orders.lang b/htdocs/langs/es_ES/orders.lang
index e725bd3af1dd93380a4e060e982d53d594b44c05..474753385dbcdefcdf55abdfe517cf31b68a0a72 100644
--- a/htdocs/langs/es_ES/orders.lang
+++ b/htdocs/langs/es_ES/orders.lang
@@ -53,7 +53,7 @@ ShippingExist=Existe una expedición
DraftOrWaitingApproved=Borrador o aprobado aún no controlado
DraftOrWaitingShipped=Borrador o validado aún no expedido
MenuOrdersToBill=Pedidos a facturar
-MenuOrdersToBill2=Pedidos facturables
+MenuOrdersToBill2=Billable orders
SearchOrder=Buscar un pedido
SearchACustomerOrder=Buscar un pedido de cliente
ShipProduct=Enviar producto
@@ -154,7 +154,6 @@ OrderByPhone=Teléfono
CreateInvoiceForThisCustomer=Facturar pedidos
NoOrdersToInvoice=Sin pedidos facturables
CloseProcessedOrdersAutomatically=Clasificar automáticamente como "Procesados" los pedidos seleccionados.
-MenuOrdersToBill2=Pedidos facturables
OrderCreation=Creación pedido
Ordered=Pedido
OrderCreated=Sus pedidos han sido creados
diff --git a/htdocs/langs/es_ES/oscommerce.lang b/htdocs/langs/es_ES/oscommerce.lang
deleted file mode 100644
index 5c2065a0cacd52a76a38deec540fc278e4d02735..0000000000000000000000000000000000000000
--- a/htdocs/langs/es_ES/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=Configuración del módulo OS Commerce
-OSCommerceSetupSaved=Configuración OS Commerce guardada
-OSCommerceServer=Nombre/IP servidor de la base de datos OS commerce
-OSCommerceDatabaseName=Nombre de la base de datos OS Commerce
-OSCommercePrefix=Prefijo tablas OS Commerce
-OSCommerceUser=Usuario de la base de datos OS Commerce
diff --git a/htdocs/langs/es_ES/other.lang b/htdocs/langs/es_ES/other.lang
index 9de70d01f95edaaeeca195c4c2c216eeda637082..1b2319ae9a14849f0da66ee389696268f8b9bf6c 100644
--- a/htdocs/langs/es_ES/other.lang
+++ b/htdocs/langs/es_ES/other.lang
@@ -203,25 +203,26 @@ ForgetIfNothing=Si usted no ha solicitado este cambio, simplemente ignore este e
##### Calendar common #####
AddCalendarEntry=Añadir entrada en el calendario
-NewCompanyToDolibarr=Empresa %s insertada en Dolibarr
-ContractValidatedInDolibarr=Contrato %s validado en Dolibarr
-ContractCanceledInDolibarr=Contrato %s anulado en Dolibarr
-ContractClosedInDolibarr=Contrato %s cerrado en Dolibarr
-PropalClosedSignedInDolibarr=Presupuesto %s firmado en Dolibarr
-PropalClosedRefusedInDolibarr=Presupuesto %s rechazado en Dolibarr
-PropalValidatedInDolibarr=Presupuesto %s validado en Dolibarr
-InvoiceValidatedInDolibarr=Factura %s validada en Dolibarr
-InvoicePaidInDolibarr=Factura %s pasada a pagada en Dolibarr
-InvoiceCanceledInDolibarr=Factura %s anulada en Dolibarr
-PaymentDoneInDolibarr=Pago %s realizado en Dolibarr
-CustomerPaymentDoneInDolibarr=Pago de cliente %s en Dolibarr
-SupplierPaymentDoneInDolibarr=Pago a proveedor %s en Dolibarr
-MemberValidatedInDolibarr=Miembro %s validado en Dolibarr
-MemberResiliatedInDolibarr=Miembro %s dado de baja en Dolibarr
-MemberDeletedInDolibarr=Miembro %s eliminado de Dolibarr
-MemberSubscriptionAddedInDolibarr=Subscripción del miembro % añadida en Dolibarr
-ShipmentValidatedInDolibarr=Expedición %s validada en Dolibarr
-ShipmentDeletedInDolibarr=Expedición %s eliminada de Dolibarr
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
##### Export #####
Export=Exportación
ExportsArea=Área de exportaciones
diff --git a/htdocs/langs/es_ES/paybox.lang b/htdocs/langs/es_ES/paybox.lang
index 830ff405ba335864ad7bacf15b177a3c7d12e72b..91846ce244e6377d3ac814e07027859d77929239 100644
--- a/htdocs/langs/es_ES/paybox.lang
+++ b/htdocs/langs/es_ES/paybox.lang
@@ -35,3 +35,6 @@ MessageKO=Mensaje en la página de retorno de pago cancelado
NewPayboxPaymentReceived=Nuevo pago Paybox recibido
NewPayboxPaymentFailed=Nuevo intento de pago Paybox sin éxito
PAYBOX_PAYONLINE_SENDEMAIL=E-Mail a avisar en caso de pago (con éxito o no)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/es_ES/resource.lang b/htdocs/langs/es_ES/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..d64075dfbf595897a63e3eebf19194d8f71030dd
--- /dev/null
+++ b/htdocs/langs/es_ES/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
diff --git a/htdocs/langs/es_ES/sendings.lang b/htdocs/langs/es_ES/sendings.lang
index 928dcdf2f8c84ffc4a8bc4f07823b70271aa3a90..9f6f20a1eb9b0368604523a6593af66753b60424 100644
--- a/htdocs/langs/es_ES/sendings.lang
+++ b/htdocs/langs/es_ES/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=De momento, la creación de una nueva expedició
RelatedShippings=Expedición(es) asociada(s)
ShipmentLine=Línea de expedición
CarrierList=Listado de transportistas
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
# Sending methods
SendingMethodCATCH=Recogido por el cliente
diff --git a/htdocs/langs/es_ES/stocks.lang b/htdocs/langs/es_ES/stocks.lang
index b9dca4b9cb86a63a1cf1500cfdca84d38bf2cc49..3a98d9a9add69a8c2190e9bacd082200df661d8d 100644
--- a/htdocs/langs/es_ES/stocks.lang
+++ b/htdocs/langs/es_ES/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=La etiqueta del almacén es obligatoria
CorrectStock=Corregir stock
ListOfWarehouses=Listado de almacenes
ListOfStockMovements=Listado de movimientos de stock
-StocksArea=Área stocks
+StocksArea=Warehouses area
Location=Lugar
LocationSummary=Nombre corto del lugar
NumberOfDifferentProducts=Número de productos diferentes
diff --git a/htdocs/langs/es_ES/users.lang b/htdocs/langs/es_ES/users.lang
index e27f8b111e5d4fc79f4d1506b551f7eb7f8f3ed1..b00190c30b304b88a21ad19869c780df41e5c875 100644
--- a/htdocs/langs/es_ES/users.lang
+++ b/htdocs/langs/es_ES/users.lang
@@ -63,7 +63,6 @@ ShowGroup=Ver grupo
ShowUser=Ver usuario
NonAffectedUsers=Usuarios no destinados al grupo
UserModified=Usuario correctamente modificado
-GroupModified=Grupo %s modificado
PhotoFile=Archivo foto
UserWithDolibarrAccess=Usuario con acceso a Dolibarr
ListOfUsersInGroup=Listado de usuarios de este grupo
@@ -103,7 +102,7 @@ UserDisabled=Usuario %s deshailitado
UserEnabled=Usuario %s activado
UserDeleted=Usuario %s eliminado
NewGroupCreated=Grupo %s creado
-GroupModified=Grupo %s modificado
+GroupModified=Group %s modified
GroupDeleted=Grupo %s eliminado
ConfirmCreateContact=¿Está seguro de querer crear una cuenta Dolibarr para este contacto?
ConfirmCreateLogin=¿Está seguro de que desea crear una cuenta Dolibarr para este miembro?
diff --git a/htdocs/langs/es_ES/withdrawals.lang b/htdocs/langs/es_ES/withdrawals.lang
index 5c241d7655335a55796bdc6f865d9be8da910f22..ab7be0799b4b699a7e92b6bfd0263978678723bc 100644
--- a/htdocs/langs/es_ES/withdrawals.lang
+++ b/htdocs/langs/es_ES/withdrawals.lang
@@ -16,6 +16,7 @@ WithdrawedBills=Facturas domiciliadas
WithdrawalsLines=Lineas de domiciliación
RequestStandingOrderToTreat=Peticiones de domiciliaciones a procesar
RequestStandingOrderTreated=Peticiones de domiciliaciones procesadas
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=Domiciliaciones de clientes
CustomerStandingOrder=Domiciliación cliente
NbOfInvoiceToWithdraw=Nº de facturas pendientes de domiciliación
@@ -40,14 +41,13 @@ TransMetod=Método envío
Send=Enviar
Lines=Líneas
StandingOrderReject=Emitir una devolución
-InvoiceRefused=Factura devuelta
WithdrawalRefused=Devolución de domiciliación
WithdrawalRefusedConfirm=¿Está seguro de querer crear una devolución de domiciliación para la empresa
RefusedData=Fecha de devolución
RefusedReason=Motivo de devolución
RefusedInvoicing=Facturación de la devolución
NoInvoiceRefused=No facturar la devolución
-InvoiceRefused=Factura devuelta
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=Estado
StatusUnknown=Desconocido
StatusWaiting=En espera
@@ -76,7 +76,7 @@ WithBankUsingRIB=Para las cuentas bancarias que utilizan CCC
WithBankUsingBANBIC=Para las cuentas bancarias que utilizan el código BAN/BIC/SWIFT
BankToReceiveWithdraw=Cuenta bancaria receptora de las domiciliaciones
CreditDate=Abonada el
-WithdrawalFileNotCapable=No es posible generar el fichero bancario de domiciliación para su país.
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
ShowWithdraw=Ver domiciliación
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Sin embargo, si la factura tiene pendiente algún pago por domiciliación, no será cerrada para permitir la gestión de la domiciliación.
DoStandingOrdersBeforePayments=Esta pestaña le permite realizar una petición de domiciliación. Una vez terminada, puede ingresar el pago en la factura para proceder a su cierre.
diff --git a/htdocs/langs/et_EE/accountancy.lang b/htdocs/langs/et_EE/accountancy.lang
index 8cab9d2b651d75b0721d76fda619e2034e4509b4..39c2732ec29852cf93d41614ed1812c2a4c1ce4f 100644
--- a/htdocs/langs/et_EE/accountancy.lang
+++ b/htdocs/langs/et_EE/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts
Validate=Validate
Addanaccount=Add an accounting account
AccountAccounting=Accounting account
-Ventilation=Ventilation
+Ventilation=Breakdown
ToDispatch=To dispatch
Dispatched=Dispatched
-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
TradeMargin=Trade margin
Reports=Reports
ByCustomerInvoice=By invoices customers
@@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger
Bookkeeping=General ledger
AccountBalanceByMonth=Account balance by month
-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
Line=Line
CAHTF=Total purchase supplier HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice
IntoAccount=In the accounting account
Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
+VentilationAuto=Automatic breakdown
Processing=Processing
EndProcessing=The end of processing
@@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account
ACCOUNTING_SEPARATORCSV=Separator CSV
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
@@ -140,14 +140,14 @@ Active=Statement
NewFiscalYear=New fiscal year
-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
TotalVente=Total turnover HT
TotalMarge=Total sales margin
DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
ChangeAccount=Change the accounting account for lines selected by the account:
Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
@@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically
ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index 830ae1158c0adfb9858d10a4fe4444f2c7da9bf0..521306c2df7f2e847c67675e4b106dbf85944148 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -437,8 +437,8 @@ Module52Name=Ladu
Module52Desc=Ladude haldamine (tooted)
Module53Name=Teenused
Module53Desc=Teenuste haldamine
-Module54Name=Lepingud
-Module54Desc=Lepingute ja teenuste haldamine
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=Vöötkoodid
Module55Desc=Vöötkoodide haldamine
Module56Name=Telefonitehnika
@@ -475,8 +475,8 @@ Module320Name=RSS voog
Module320Desc=Lisa RSS voog Dolibarri lehtedele
Module330Name=Järjehoidjad
Module330Desc=Järjehoidjate haldamine
-Module400Name=Projektid
-Module400Desc=Projektide haldamine teiste moodulite sees
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=Webcalendar
Module410Desc=WebCalendari integratsioon
Module500Name=Erikulud (maksud, sotsiaalmaks, dividendid)
@@ -484,7 +484,7 @@ Module500Desc=Erikulude: nt maksude, sotsiaalmaksude, dividendide ja palkade hal
Module510Name=Palgad
Module510Desc=Töötajate palkade ja palkade maksmise haldamine
Module600Name=Teated
-Module600Desc=Saada mõnede Dolibarri äritegevusega seotud sündmuste puhul teade kolmandate isikute kontaktidele
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Annetused
Module700Desc=Annetuste haldamine
Module1200Name=Mantis
@@ -514,16 +514,16 @@ Module5000Name=Multi-ettevõte
Module5000Desc=Võimaldab hallata mitut ettevõtet
Module6000Name=Töövoog
Module6000Desc=Töövoo haldamine
-Module20000Name=Puhkused
-Module20000Desc=Kinnita ja järgi töötajate puhkusi
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
Module39000Name=Product batch
Module39000Desc=Batch number, eat-by and sell-by date management on products
Module50000Name=Paybox
Module50000Desc=Moodul, mis pakub online-makse võimalust krediitkaardiga PayBoxi abil
Module50100Name=Kassa
Module50100Desc=Kassamoodul
-Module50200Name= Paypal
-Module50200Desc= Moodul, mis pakub online-makse võimalust krediitkaardiga Paypali abil
+Module50200Name=Paypal
+Module50200Desc=Moodul, mis pakub online-makse võimalust krediitkaardiga Paypali abil
Module50400Name=Accounting (advanced)
Module50400Desc=Accounting management (double parties)
Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=Püsikorralduste vaatamine
Permission152=Püsikorralduste nõuete loomine/muutmine
Permission153=Püsikorralduste kviitungite saatmine
Permission154=Püsikorralduste kviitungite krediteerimine/keeldumine
-Permission161=Lepingute vaatamine
-Permission162=Lepingute loomine/muutmine
-Permission163=Lepingu teenuse aktiveerimine
-Permission164=Lepingu teenuse keelamine
-Permission165=Lepingu kustutamine
-Permission171=Lähetuste vaatamine
-Permission172=Lähetuste loomine/muutmine
-Permission173=Lähetuste kustutamine
-Permission178=Lähetuste eksport
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Read trips and expenses (own and his subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
Permission180=Hankijate vaatamine
Permission181=Ostutellimuste vaatamine
Permission182=Ostutellimuste loomine/muutmine
@@ -671,7 +672,7 @@ Permission300=Vöötkoodide vaatamine
Permission301=Vöötkoodide loomine/muutmine
Permission302=Vöötkoodide kustutamine
Permission311=Teenuste vaatamine
-Permission312=Teenuste lisamine lepingutele
+Permission312=Assign service/subscription to contract
Permission331=Järjehoidjate vaatamine
Permission332=Järjehoidjate loomine/muutmine
Permission333=Järjehoidjate kustutamine
@@ -701,8 +702,8 @@ Permission701=Annetuste vaatamine
Permission702=Annetuste loomine/muutmine
Permission703=Annetuste kustutamine
Permission1001=Laojääkide vaatamine
-Permission1002=Laojääkide loomine/muutmine
-Permission1003=Laojääkide kustutamine
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=Lao liikumiste vaatamine
Permission1005=Lao liikumiste loomine/muutmine
Permission1101=Tarnekorralduste vaatamine
@@ -1038,7 +1039,6 @@ YesInSummer=Suviti 'jah'
OnlyFollowingModulesAreOpenedToExternalUsers=Märkus: välised kasutajad saavad kasutada vaid neid mooduleid (hoolimata nende kasutaja õigustest):
SuhosinSessionEncrypt=Sessiooni andmehoidla krüpteeritud Suhosini poolt
ConditionIsCurrently=Olek on hetkel %s
-TestNotPossibleWithCurrentBrowsers=Automaatne tuvastamine ei ole võimalik
YouUseBestDriver=Kasutad draiverit %s, mis on hetkel saadaolevatest parim.
YouDoNotUseBestDriver=Kasutad draiverit %s, kuid soovitatav on kasutada draiverit %s.
NbOfProductIsLowerThanNoPb=Andmebaasis on vaid %s toodet/teenust. See ei nõua mingit erilist optimeerimist.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=Tagasta raamatupidamise kood kujul:<br>%s millele jär
ModuleCompanyCodePanicum=Tagasta tühi raamatupidamise kood.
ModuleCompanyCodeDigitaria=Raamatupidamine kood sõltub kolmanda isiku koodist. Kood algab tähega "C", millele järgnevad kolmanda isiku koodi esimesed 5 tähte.
UseNotifications=Kasuta teateid
-NotificationsDesc=E-kirjade abil saadetavad teated võimaldavad mõningate Dolibarri sündmuste puhul automaatselt teatud kolmandatele isikutele (klientidele või hankijatele) e-kirju saata. Teadete saatmise aktiveerimine ja kontaktid, kellele kiri saadetakse lisatakse ühe isiku kaupa.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
ModelModules=Dokumendimallid
DocumentModelOdt=Loo dokumendid OpenDocument mallidest (.ODT või .ODS failid OpenOffices, KOffices, TextEditis jne)
WatermarkOnDraft=Mustandi vesimärk
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=Lisa kohale jõudmise kuupäeva võimekus
UseOptionLineIfNoQuantity=Toote/teenuse rida, mille koguseks on märgitud 0, peetakse lisavõimaluseks
FreeLegalTextOnProposal=Vaba tekst pakkumistel
WatermarkOnDraftProposal=Vesimärk pakkumiste mustanditel (puudub, kui tühi)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=Tellimuste haldamise seadistamine
OrdersNumberingModules=Tellimuste numeratsiooni mudelid
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Peida nimekirjas täidetud või tühistatud tellimused
ValidOrderAfterPropalClosed=Tellimuse kinnitamine pärast pakkumise sulgemist võimaldab vältida tellimuse sammu vahele jätmist
FreeLegalTextOnOrders=Vaba tekst tellimustel
WatermarkOnDraftOrders=Vesimärk tellimuste mustanditel (puudub, kui tühi)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
##### Clicktodial #####
ClickToDialSetup=Click To Dial mooduli seadistamine
ClickToDialUrlDesc=Url, mida kasutatakse telefoni pildi klõpsamisel. URLi sees saab kasutada järgmisi silte:<br><b>__PHONETO__</b> asendatakse helistatava inimese telefoninumbriga<br><b>__PHONEFROM__</b> asendatakse helistaja (Sinu) telefoninumbriga<br><b>__LOGIN__</b> asendatakse clicktodial kasutajanimega (määratletud Sinu kasutajakaardil)<br><b>__PASS__</b> asendatakse clicktodial parooliga (määratletud Sinu kasutajakaardil).
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=Sekkumiste numeratsiooni mudelid
TemplatePDFInterventions=Sekkumiste kaartide dokumentide mudelid
WatermarkOnDraftInterventionCards=Vesimärk sekkumiste kaartidel (puudub, kui tühi)
##### Contracts #####
-ContractsSetup=Lepingute mooduli seadistamine
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=Lepingute numeratsiooni moodulid
TemplatePDFContracts=Lepingute dokumentide mudelid
FreeLegalTextOnContracts=Vaba tekst lepingutes
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=%s tüüpi faile ei paki HTTP server kokk
CacheByServer=Serveri vahemäl
CacheByClient=Brauseri vahemälu
CompressionOfResources=HTTP vastuste kokku pakkimine
-TestNotPossibleWithCurrentBrowsers=Automaatne tuvastamine ei ole võimalik
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=Toodete mooduli seadistamine
ServiceSetup=Teenuste mooduli seadistamine
@@ -1382,9 +1384,10 @@ MailingSetup=E-posti mooduli sedistamine
MailingEMailFrom=Saatja aadress (Kellelt/From) e-posti mooduli poolt saadetud kirjadel
MailingEMailError=Tagastusaadress (Errors-to) vigadega e-kirjade jaoks
##### Notification #####
-NotificationSetup=E-posti abil teadete saatmise mooduli seadistamine
+NotificationSetup=EMail notification module setup
NotificationEMailFrom=Saatja e-post (Kellelt/From) teadete saatmisel e-kirjaga
-ListOfAvailableNotifications=Teadete nimekiri (see nimekiri sõltub aktiveeritud moodulitest)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
##### Sendings #####
SendingsSetup=Saatmiste mooduli seadistamine
SendingsReceiptModel=Saatekviitungi mudel
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=Ühendumine serveri '%s' andmebaasiga '%s' kasutajga '%s' õnne
OSCommerceTestKo1=Ühendumine serveriga '%s' õnnestus, kuid andmebaasi '%s' ei õnnestunud kätte saada.
OSCommerceTestKo2=Ühendumine serveriga '%s' kasutajaga '%s' ebaõnnestus.
##### Stock #####
-StockSetup=Laojääkide mooduli seadistamine
-UserWarehouse=Kasuta kasutaja isiklikke varusid
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=Menüü kustutatud
TreeMenu=Menüüpuud
@@ -1478,11 +1482,14 @@ ClickToDialDesc=See moodul võimaldab lisada ikooni pärast telefoninumbreid. Kl
##### Point Of Sales (CashDesk) #####
CashDesk=Müügikoht
CashDeskSetup=Müügikoha mooduli seadistamine
-CashDeskThirdPartyForSell=Üldine kolmas isik müümiseks
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Sularahamaksete vastu võtmiseks kasutatav konto
CashDeskBankAccountForCheque= Tšekimaksete vastu võtmiseks kasutatav konto
CashDeskBankAccountForCB= Krediitkaardimaksete vastu võtmiseks kasutatav konto
-CashDeskIdWareHouse=Müümiseks kasutatav ladu
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Järjehoidjate mooduli seadistamine
BookmarkDesc=See moodul võimaldab Sul hallata järjehoidjaid. Samuti võib vasakusse menüüsse lisada lühiteid suvalistele Dolibarri lehtedele või välistele lehtedele.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Kustuta majandusaasta
ConfirmDeleteFiscalYear=Kas oled kindel, et soovid selle majandusaasta kustutada?
Opened=Avatud
Closed=Suletud
-
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
Format=Formaat
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
diff --git a/htdocs/langs/et_EE/agenda.lang b/htdocs/langs/et_EE/agenda.lang
index 1c20d11fe652588e39b2437235afd281b5778bc0..33637161b3380d8ad3271ee994992cfab8b52f4a 100644
--- a/htdocs/langs/et_EE/agenda.lang
+++ b/htdocs/langs/et_EE/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= Automaatne täitmine
AgendaAutoActionDesc= Määratle siin need tegevused, mille kohta loob Dolibarr automaatselt päevakavasse tegevuse. Kui midagi pole märgistatud (vaikimisi), siis lisatakse päevakavasse ainult käsitsi lisatud tegevused.
AgendaSetupOtherDesc= Selle lehe abil saab seadistada tegevuste eksportimise Dolibarrist mõnda välisesse kalendrisse (Thunderbird, Google Calendar jne)
AgendaExtSitesDesc=See leht võimaldab määratleda väliseid kalendreid, mis saavad oma tegevusi lisada Dolibarri päevakavasse.
-ActionsEvents= Tegevused, mille kohta lisab Dolibarr automaatselt päevakavasse sündmuse.
-PropalValidatedInDolibarr= Pakkumine %s on kinnitatud
-InvoiceValidatedInDolibarr= Arve %s on kinnitatud
+ActionsEvents=Tegevused, mille kohta lisab Dolibarr automaatselt päevakavasse sündmuse.
+PropalValidatedInDolibarr=Pakkumine %s on kinnitatud
+InvoiceValidatedInDolibarr=Arve %s on kinnitatud
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=Arve %s on tagasi mustandi staatuses
InvoiceDeleteDolibarr=Arve %s on kustutatud
OrderValidatedInDolibarr= Tellimus %s on kinnitatud
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Tellimus %s on heaks kiidetud
OrderRefusedInDolibarr=Tellimus %s on tagasi lükatud
OrderBackToDraftInDolibarr=Tellimus %s on muudetud mustandiks
OrderCanceledInDolibarr=Tellimus %s on tühistatud
-InterventionValidatedInDolibarr=Sekkumine %s on kinnitatud
ProposalSentByEMail=Pakkumine %s on saadetud e-postiga
OrderSentByEMail=Tellimus %s on saadetud e-postiga
InvoiceSentByEMail=Arve %s on saadetud e-postiga
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=Ostutellimus %s on saadetud e-postiga
SupplierInvoiceSentByEMail=Ostuarve %s on saadetud e-postiga
ShippingSentByEMail=Saadetis %s on saadetud e-postiga
ShippingValidated= Kohaletoomine %s on kinnitatud
-InterventionSentByEMail=Sekkumine %s on saadetud e-postiga
-InterventionClassifiedBilled=Intervention %s classified as Billed
NewCompanyToDolibarr= Kolmas isik loodud
DateActionPlannedStart= Plaanitav alguskuupäev
DateActionPlannedEnd= Plaanitav lõppkuupäev
@@ -70,9 +68,9 @@ DateActionStart= Alguskuupäev
DateActionEnd= Lõppkuupäev
AgendaUrlOptions1=Otsingutulemuste piiramiseks võib kasutada ka järgmisi parameetreid:
AgendaUrlOptions2=<b>login=%s</b> tagastab vastusena kasutaja poolt algatatud, talle määratud ja lõpetatud sündmused<b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> tagastab vastusena ainult kasutaja poolt algatatud sündmused<b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
AgendaUrlOptions4=<b>logint=%s</b> tagastab vastusena ainult kasutajale määratud tegevused <b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> tagastab vastusena ainult kasutaja poolt lõpetatud tegevused <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
AgendaShowBirthdayEvents=Näita kontaktide sünnipäevi
AgendaHideBirthdayEvents=Peida kontaktide sünnipäevad
Busy=Hõivatud
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=URL .ical failile ligi pääsemiseks
ExtSiteNoLabel=Kirjeldus puudub
WorkingTimeRange=Working time range
WorkingDaysRange=Working days range
-AddEvent=Add event
+AddEvent=Create event
MyAvailability=My availability
diff --git a/htdocs/langs/et_EE/bills.lang b/htdocs/langs/et_EE/bills.lang
index eb9804dffc7065ce09e9f874bcfa439c4f197674..621b928f35b84f56c34d5d3e6dac2fa32d7db4cc 100644
--- a/htdocs/langs/et_EE/bills.lang
+++ b/htdocs/langs/et_EE/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Kreeditarve
InvoiceAvoirAsk=Kreeditarve parandab arve
InvoiceAvoirDesc=<b>Kreeditarve</b> on negatiivne arve, mida kasutatakse sellise probleemi lahendamiseks, kus arve summa ja reaalselt tasutud summa erinevad (kuna klient maksis ekslikult liiga palju või ei maksnud kõike ära, kuna ta tagastas mõned tooted).
invoiceAvoirWithLines=Loo kreeditarve algse arve ridade põhjal
-invoiceAvoirWithPaymentRestAmount=Loo kreeditarve algse arve summa põhjal
-invoiceAvoirLineWithPaymentRestAmount=Kreeditarve summa algse arve summa põhjal
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
ReplaceInvoice=Asendusarve arve %s
ReplacementInvoice=Asendusarve
ReplacedByInvoice=Asendatud arvega %s
@@ -87,7 +87,7 @@ ClassifyCanceled=Liigita 'Hüljatud'
ClassifyClosed=Liigita 'Suletud'
ClassifyUnBilled=Classify 'Unbilled'
CreateBill=Loo arve
-AddBill=Lisa arve või kreeditarve
+AddBill=Create invoice or credit note
AddToDraftInvoices=Lisa arve mustandile
DeleteBill=Kustuta arve
SearchACustomerInvoice=Otsi müügiarvet
@@ -99,7 +99,7 @@ DoPaymentBack=Soorita tagasimakse
ConvertToReduc=Teisenda tuleviku allahindluseks
EnterPaymentReceivedFromCustomer=Sisesta kliendilt saadud makse
EnterPaymentDueToCustomer=Soorita kliendile makse
-DisabledBecauseRemainderToPayIsZero=Blokeeritud, sest maksmata summa on 0
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
Amount=Summa
PriceBase=Baashind
BillStatus=Arve staatus
@@ -137,8 +137,6 @@ BillFrom=Kellelt
BillTo=Kellele
ActionsOnBill=Tegevused arvel
NewBill=Uus arve
-Prélèvements=Püsikorraldus
-Prélèvements=Püsikorraldus
LastBills=Viimased %s arvet
LastCustomersBills=Viimased %s müügiarvet
LastSuppliersBills=Viimased %s ostuarvet
@@ -156,9 +154,9 @@ ConfirmCancelBill=Kas oled täesti kindel, et soovid tühistada arve <b>%s</b>?
ConfirmCancelBillQuestion=Miks Sa tahad selle arve liigitada hüljatuks?
ConfirmClassifyPaidPartially=Kas oled täiesti kindel, et soovid arve <b>%s</b> märkida makstuks?
ConfirmClassifyPaidPartiallyQuestion=See arve ei ole täielikult tasutud. Mis on selle arve sulgemise põhjus?
-ConfirmClassifyPaidPartiallyReasonAvoir=Makstava summa jääk <b>(%s %s)</b> on allahindlus, sest makse on tehtud enne tähtaega. Ma reguleerin käibemaksu kreeditarvega.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Makstava summa jääk <b>(%s %s)</b> on allahindlus, sest makse on tehtud enne tähtaega. Nõustun sellelt allahindluselt käibemaksu kaotusega.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Makstava summa jääk <b>(%s %s)</b> on allahindlus, sest makse on tehtud enne tähtaega. Ma saan sellelt allahindluselt käibemaksu tagasi kreeditarveta.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
ConfirmClassifyPaidPartiallyReasonBadCustomer=Halb klient
ConfirmClassifyPaidPartiallyReasonProductReturned=Tooted osaliselt tagastatud
ConfirmClassifyPaidPartiallyReasonOther=Summa hüljatud muul põhjusel
@@ -191,9 +189,9 @@ AlreadyPaid=Juba makstud
AlreadyPaidBack=Juba tagasi makstud
AlreadyPaidNoCreditNotesNoDeposits=Juba makstud (kreeditarvete ja deposiitideta)
Abandoned=Hüljatud
-RemainderToPay=Makstava summa jääk
-RemainderToTake=Võetava summa jääk
-RemainderToPayBack=Tagasimakstava summa jääk
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
Rest=Ootel
AmountExpected=Väidetav väärtus
ExcessReceived=Liigne saadud
@@ -219,19 +217,18 @@ NoInvoice=Ühtki arvet ei ole
ClassifyBill=Liigita arve
SupplierBillsToPay=Maksmata ostuarveid
CustomerBillsUnpaid=Maksmata müügiarveid
-DispenseMontantLettres=Tabuleerimise teel koostatud arvetele ei rakendata tähtede järjekorda
-DispenseMontantLettres=Tabuleerimise teel koostatud arvetele ei rakendata tähtede järjekorda
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=Tagastamatu
SetConditions=Määra maksetingimusi
SetMode=Määra makseviis
Billed=Arve esitatud
-RepeatableInvoice=Ettemääratud arve
-RepeatableInvoices=Ettemääratud arved
-Repeatable=Ettemääratud
-Repeatables=Ettemääratud
-ChangeIntoRepeatableInvoice=Teisenda ettemääratuks
-CreateRepeatableInvoice=Loo ettemääratud arve
-CreateFromRepeatableInvoice=Loo ettemääratud arvest
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
CustomersInvoicesAndInvoiceLines=Müügiarved ja arvete read
CustomersInvoicesAndPayments=Müügiarved ja maksed
ExportDataset_invoice_1=Müügiarvete nimekiri ja arvete read
diff --git a/htdocs/langs/et_EE/boxes.lang b/htdocs/langs/et_EE/boxes.lang
index 3524f0ed0ed28024047f66db564ee45113df3be2..58d9ff2eabee1b0032d8a1e7189ef54a0be9121c 100644
--- a/htdocs/langs/et_EE/boxes.lang
+++ b/htdocs/langs/et_EE/boxes.lang
@@ -12,13 +12,14 @@ BoxLastProspects=Viimati muudetud huvilised
BoxLastCustomers=Viimati muudetud kliendid
BoxLastSuppliers=Viimati muudetud hankijad
BoxLastCustomerOrders=Viimased tellimused
+BoxLastValidatedCustomerOrders=Last validated customer orders
BoxLastBooks=Viimased raamatud
BoxLastActions=Viimased sündmused
BoxLastContracts=Viimased lepingud
BoxLastContacts=Viimased kontaktid/aadressid
BoxLastMembers=Viimased liikmed
BoxFicheInter=Viimased sekkumised
-# BoxCurrentAccounts=Opened accounts balance
+BoxCurrentAccounts=Avatud kontode saldo
BoxSalesTurnover=Müügikäive
BoxTotalUnpaidCustomerBills=Kokku tasumata müügiarveid
BoxTotalUnpaidSuppliersBills=Kokku maksmata ostuarveid
@@ -27,26 +28,29 @@ BoxTitleNbOfCustomers=Kliente
BoxTitleLastRssInfos=Viimased %s uudised allikast %s
BoxTitleLastProducts=Viimased %s muudetud toodet/teenust
BoxTitleProductsAlertStock=Laojäägi häirega tooted
-BoxTitleLastCustomerOrders=Viimased %s muudetud müügitellimust
+BoxTitleLastCustomerOrders=Viimased %s kliendi tellimust
+BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders
BoxTitleLastSuppliers=Viimased %s registreeritud hankijat
BoxTitleLastCustomers=Viimased %s registreeritud klienti
BoxTitleLastModifiedSuppliers=Viimased %s muudetud hankijat
BoxTitleLastModifiedCustomers=Viimased %s muudetud klienti
-BoxTitleLastCustomersOrProspects=Viimased %s muudetud klienti või huvilist
-BoxTitleLastPropals=Viimased %s salvestatud pakkumist
+BoxTitleLastCustomersOrProspects=Last %s customers or prospects
+BoxTitleLastPropals=Viimased %s pakkumist
+BoxTitleLastModifiedPropals=Last %s modified proposals
BoxTitleLastCustomerBills=Viimased %s müügiarvet
+BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices
BoxTitleLastSupplierBills=Viimased %s ostuarvet
-BoxTitleLastProspects=Viimased %s salvestatud huvilist
+BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices
BoxTitleLastModifiedProspects=Viimased %s muudetud huvilist
BoxTitleLastProductsInContract=Viimased %s lepingulist toodet/teenust
-BoxTitleLastModifiedMembers=Viimased %s muudetud liiget
+BoxTitleLastModifiedMembers=Last %s members
BoxTitleLastFicheInter=Viimased %s muudetud sekkumist
-BoxTitleOldestUnpaidCustomerBills=Vanimad %s tasumata müügiarvet
-BoxTitleOldestUnpaidSupplierBills=Vanimad %s maksmata ostuarvet
-# BoxTitleCurrentAccounts=Opened account's balances
+BoxTitleOldestUnpaidCustomerBills=Vanemad %s maksmata klientide arved
+BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
+BoxTitleCurrentAccounts=Avatud kontode saldod
BoxTitleSalesTurnover=Müügikäive
-BoxTitleTotalUnpaidCustomerBills=Tasumata müügiarved
-BoxTitleTotalUnpaidSuppliersBills=Maksmata ostuarved
+BoxTitleTotalUnpaidCustomerBills=Maksmata klientide arved
+BoxTitleTotalUnpaidSuppliersBills=Maksmata tarnijate arved
BoxTitleLastModifiedContacts=Viimased %s muudetud kontakti/aadressi
BoxMyLastBookmarks=Minu viimased %s järjehoidjat
BoxOldestExpiredServices=Vanimad aktiivsed aegunud teenused
@@ -76,7 +80,8 @@ NoContractedProducts=Lepingulisi tooteid/teenuseid ei ole
NoRecordedContracts=Lepinguid pole salvestatud
NoRecordedInterventions=Sekkumisi pole salvestatud
BoxLatestSupplierOrders=Viimased ostutellimused
-BoxTitleLatestSupplierOrders=Viimased %s ostutellimust
+BoxTitleLatestSupplierOrders=Last %s supplier orders
+BoxTitleLatestModifiedSupplierOrders=Last %s modified supplier orders
NoSupplierOrder=Ostutellimusi pole salvestatud
BoxCustomersInvoicesPerMonth=Müügiarveid kuus
BoxSuppliersInvoicesPerMonth=Ostuarveid kuus
diff --git a/htdocs/langs/et_EE/categories.lang b/htdocs/langs/et_EE/categories.lang
index 27a785e02d2af73176f7788c0ba4aa49a520eecb..328c06c3a0387519be9388be77c2c66e2ed914f9 100644
--- a/htdocs/langs/et_EE/categories.lang
+++ b/htdocs/langs/et_EE/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Hankijate ja kategooriate vahelised seosed
CatCusLinks=Klientide/huviliste ja kategooriate vahelised sosed
CatProdLinks=Toodete/teenuste ja kategooriate vahelised seosed
CatMemberLinks=Liikmete ja kategooriate vahelised seosed
-CatProdLinks=Toodete/teenuste ja kategooriate vahelised seosed
-CatCusLinks=Klientide/huviliste ja kategooriate vahelised sosed
-CatSupLinks=Hankijate ja kategooriate vahelised seosed
DeleteFromCat=Eemalda kategooriast
DeletePicture=Pildi kustutamine
ConfirmDeletePicture=Kinnitada pildi kustutamine?
@@ -112,3 +109,4 @@ CategoriesSetup=Kategooriate seadistamine
CategorieRecursiv=Link with parent category automatically
CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category
diff --git a/htdocs/langs/et_EE/compta.lang b/htdocs/langs/et_EE/compta.lang
index 9bf7a32486f621dc3dc460a75fcf2bcd9f44e96f..ef36af93d4af6677af4b05d6986b1bbf1b578804 100644
--- a/htdocs/langs/et_EE/compta.lang
+++ b/htdocs/langs/et_EE/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Ebaõige kliendi raamatupidamise kood: %s
SuppliersProductsSellSalesTurnover=Hankija toodete müümisega tekkinud käive.
CheckReceipt=Tšeki deponeerimine
CheckReceiptShort=Tšeki deponeerimine
+LastCheckReceiptShort=Last %s check receipts
NewCheckReceipt=Uus allahindlus
NewCheckDeposit=Uus tšeki deponeerimine
NewCheckDepositOn=Loo kviitung kontole deponeerimise eest: %s
@@ -187,7 +188,7 @@ AccountancyDashboard=Raamatupidamise kokkuvõte
ByProductsAndServices=Toodete ja teenuste kaupa
RefExt=Väline viide
ToCreateAPredefinedInvoice=Ettemääratud arve loomiseks loo tavaline arve ja vahepeal arvet kinnitamata klõpsa nupul "Teisenda ettemääratud arveks"
-LinkedOrder=Link to order
+LinkedOrder=Viide tellimusele
ReCalculate=Arvuta uuesti
Mode1=Meetod 1
Mode2=Meetod 2
diff --git a/htdocs/langs/et_EE/contracts.lang b/htdocs/langs/et_EE/contracts.lang
index 9b3d08292cf8c657e9afab452e38351a862f151c..a141c00a1e97834e58d8b67dca585de098753dc9 100644
--- a/htdocs/langs/et_EE/contracts.lang
+++ b/htdocs/langs/et_EE/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Lepingute ala
ListOfContracts=Lepingute nimekiri
-LastContracts=Viimased %s muudetud lepingut
+LastModifiedContracts=Last %s modified contracts
AllContracts=Kõik lepingud
ContractCard=Lepingu kaart
ContractStatus=Lepingu olek
@@ -27,7 +27,7 @@ MenuRunningServices=Aktiivsed teenused
MenuExpiredServices=Aegunud teenused
MenuClosedServices=Suletud teenused
NewContract=Uus leping
-AddContract=Lisa leping
+AddContract=Create contract
SearchAContract=Otsi lepingut
DeleteAContract=Kustuta leping
CloseAContract=Sulge leping
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Aktiivsete lepinguridade nimekiri
ListOfRunningServices=Aktiivsete teenuste nimekiri
NotActivatedServices=Mitteaktiivsed teenused (kinnitatud lepingutel)
BoardNotActivatedServices=Teenused, mida aktiveerida kinnitatud lepingutel
-LastContracts=Viimased %s muudetud lepingut
+LastContracts=Last % contracts
LastActivatedServices=Viimased %s aktiveeritud teenust
LastModifiedServices=Viimased %s muudetud teenust
EditServiceLine=Muuda teenuse rida
diff --git a/htdocs/langs/et_EE/cron.lang b/htdocs/langs/et_EE/cron.lang
index 5267ee8765ee2837f7a1a76da19d2cd45f1cc6d2..72240998cace614d56b5407c553665a2b08db441 100644
--- a/htdocs/langs/et_EE/cron.lang
+++ b/htdocs/langs/et_EE/cron.lang
@@ -1,22 +1,14 @@
# Dolibarr language file - Source file is en_US - cron
-#
# About page
-#
About = Mooduli kohta
CronAbout = Cron mooduli kohta
CronAboutPage = Croni info kohta
-
-#
# Right
-#
Permission23101 = Loe plaanitud tegevus
Permission23102 = Loo/uuenda plaanitud tegevust
Permission23103 = Kustuta plaanitud tegevus
Permission23104 = Käivita plaanitud tegevus
-
-#
# Admin
-#
CronSetup= Plaanitavata programmide haldamise seadistamine
URLToLaunchCronJobs=Croni poolt kontrollitavate ja käivitatavate programmide jaoks vajalik URL
OrToLaunchASpecificJob=Või mõne kindla programmi kontrollimiseks ja käivitamiseks
@@ -24,20 +16,11 @@ KeyForCronAccess=Croni käivitatavate programmide URLile ligipääsu turvavõti
FileToLaunchCronJobs=Käsurea käsk cron programmide käivitamiseks
CronExplainHowToRunUnix=Unix keskonnas on soovitatav kasutada crontabi käsurealt käivitatavate käskude jooksutamiseks
CronExplainHowToRunWin=Microsoft(tm) Windows keskkonnas võib kasutada Toiminguajasti tööriista kindlate intervallide tagant käivitavate tegevuste plaanimiseks.
-
-
-#
# Menu
-#
CronJobs=Plaanitud käivitused
-CronListActive= Sisse lülitatud tööde nimekiri
-CronListInactive= Välja lülitatud tööde nimekiri
-CronListActive= Sisse lülitatud tööde nimekiri
-
-
-#
+CronListActive=List of active/scheduled jobs
+CronListInactive=Välja lülitatud tööde nimekiri
# Page list
-#
CronDateLastRun=Viimane käivitus
CronLastOutput=Viimase käivituse väljund
CronLastResult=Viimane vastuse kood
@@ -70,10 +53,7 @@ CronLabel=Kirjeldus
CronNbRun=Käivituste arv
CronEach=Iga
JobFinished=Tegevus käivitatud ja lõpetatud
-
-#
#Page card
-#
CronAdd= Lisa programme
CronHourStart= Tegevuse algusaeg ja -kuupäev
CronEvery= Ja käivita iga tegevus
@@ -95,20 +75,12 @@ CronObjectHelp=Laetava objekti nimi. <BR> Näiteks Dolibarri Product objekti /ht
CronMethodHelp=Kasutatava objekti korral käivitatav meetod. <BR> Näiteks Dolibarr Product objekti /htdocs/product/class/product.class.php meetodi fetch kasutamisel on meetodi väärtuseks <i>fetch</i>
CronArgsHelp=Meetodile antavad argumendid. <BR> Näiteks Dolibarri Product objekti /htdocs/product/class/product.class.php meetodi fetch kasutamisel võivad parameetrite väärtusteks olla <i>0, ProductRef</i>.
CronCommandHelp=Käivitatav süsteemi käsk.
-
-#
# Info
-#
CronInfoPage=Informatsioon
-
-
-#
# Common
-#
CronType=Tegevuse tüüp
CronType_method=Dolibarri klassi väljakutsutav meetod
CronType_command=Käsurea käsk
CronMenu=Cro
CronCannotLoadClass=Klassi %s või objekti %s laadimine ebaõnnestus
-
UseMenuModuleToolsToAddCronJobs=Mine menüüsse "Kodu - Moodulite tööriistad - Tegevuste nimekiri" planeeritud tegevuste vaatamiseks ja muutmiseks.
diff --git a/htdocs/langs/et_EE/donations.lang b/htdocs/langs/et_EE/donations.lang
index c48ea815122f2270a577f2e6c8cd0ef8bf198527..ed140f372d808b707b9ef4ac7625675f88eb8c30 100644
--- a/htdocs/langs/et_EE/donations.lang
+++ b/htdocs/langs/et_EE/donations.lang
@@ -4,7 +4,7 @@ Donations=Annetused
DonationRef=Annetuse viide
Donor=Annetaja
Donors=Annetajad
-AddDonation=Lisa annetus
+AddDonation=Create a donation
NewDonation=Uus annetus
ShowDonation=Kuva annetus
DonationPromise=Annetuse lubadus
@@ -31,3 +31,8 @@ DonationRecipient=Annetuse saaja
ThankYou=Täname Teid
IConfirmDonationReception=Saaja kinnitab saadava summa vastu võtmist annetusena summas
MinimumAmount=Minimum amount is %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/et_EE/externalsite.lang b/htdocs/langs/et_EE/externalsite.lang
index cdbec0bece4753fe8608648081b746cb338344d3..d4a0b2c3ee19ddee1b68540f0bde857f70d41821 100644
--- a/htdocs/langs/et_EE/externalsite.lang
+++ b/htdocs/langs/et_EE/externalsite.lang
@@ -2,3 +2,4 @@
ExternalSiteSetup=Seadista link välisele lehele
ExternalSiteURL=Välise lehe URL
ExternalSiteModuleNotComplete=ExternalSite moodul ei ole õigesti seadistatud.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/et_EE/holiday.lang b/htdocs/langs/et_EE/holiday.lang
index f553c68d1036041605d6ff993a89e0aab14cb6c9..c1b981dc57d8491c2b2b91ec73529040a6afeae5 100644
--- a/htdocs/langs/et_EE/holiday.lang
+++ b/htdocs/langs/et_EE/holiday.lang
@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
CantCreateCP=You don't have the right to make leave requests.
InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=Uuenda
CantUpdate=You cannot update this leave request.
NoDateDebut=Pead valima alguskuupäeva.
NoDateFin=Pead valima lõppkuupäeva.
-ErrorDureeCP=Puhkusetaotlus ei sisalda ühtki tööpäeva.
-TitleValidCP=Kiida puhkusetaotlus heaks
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
ConfirmValidCP=Are you sure you want to approve the leave request?
DateValidCP=Kuupäev heaks kiidetud
TitleToValidCP=Send leave request
ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Keeldu puhkusetaotlusest
+TitleRefuseCP=Refuse the leave request
ConfirmRefuseCP=Are you sure you want to refuse the leave request?
NoMotifRefuseCP=Keeldumiseks peab valima põhjuse.
-TitleCancelCP=Tühista puhkusetaotlus
+TitleCancelCP=Cancel the leave request
ConfirmCancelCP=Are you sure you want to cancel the leave request?
DetailRefusCP=Keeldumise põhjus
DateRefusCP=Keeldumise kuupäev
@@ -78,7 +77,7 @@ ActionByCP=Sooritas
UserUpdateCP=Kasutajale
PrevSoldeCP=Eelmine saldo
NewSoldeCP=Uus saldo
-alreadyCPexist=Antud perioodi jaoks on juba puhkusetaotlus esitatud.
+alreadyCPexist=A leave request has already been done on this period.
UserName=Nimi
Employee=Töötaja
FirstDayOfHoliday=First day of vacation
@@ -88,25 +87,25 @@ ManualUpdate=Käsitsi uuendus
HolidaysCancelation=Leave request cancelation
## Configuration du Module ##
-ConfCP=Puhkuste mooduli seadistamine
+ConfCP=Configuration of leave request module
DescOptionCP=Valiku kirjeldus
ValueOptionCP=Väärtus
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
ConfirmConfigCP=Valideeri seadistus
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
UpdateConfCPOK=Edukalt uuendatud.
ErrorUpdateConfCP=Uuendamise ajal tekkis viga, palun proovi uuesti.
-AddCPforUsers=Palun lisa kasutajate puhkuste saldo <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">siia klõpsates</a>.
-DelayForSubmitCP=Puhkusetaotluste esitamise tähtaeg
-AlertapprobatortorDelayCP=Peata heakskiit, kui puhkusetaotlus ei vasta tähtajale
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
Module27130Name= Management of leave requests
Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
TitleOptionEventCP=Settings of leave requets for events
ValidEventCP=Kinnita
UpdateEventCP=Uuenda tegevused
diff --git a/htdocs/langs/et_EE/interventions.lang b/htdocs/langs/et_EE/interventions.lang
index 1d89a7a0bee64b32dc85a2698e075973d4ce44b7..fc1c006e81e203bbcc33eaa6d6f0095c5306a2a9 100644
--- a/htdocs/langs/et_EE/interventions.lang
+++ b/htdocs/langs/et_EE/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Sekkumine
Interventions=Sekkumised
InterventionCard=Sekkumise kaart
NewIntervention=Uus sekkumine
-AddIntervention=Lisa sekkumine
+AddIntervention=Create intervention
ListOfInterventions=Sekkumiste nimekiri
EditIntervention=Muuda sekkumist
ActionsOnFicheInter=Sekkumise tegevused
@@ -30,6 +30,15 @@ StatusInterInvoiced=Arve esitatud
RelatedInterventions=Seotud sekkumised
ShowIntervention=Näita sekkumist
SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Sekkumise järelkontrolliga tegelev müügiesindaja
TypeContact_fichinter_internal_INTERVENING=Sekkuv
diff --git a/htdocs/langs/et_EE/mails.lang b/htdocs/langs/et_EE/mails.lang
index 40d75731c49cd7bbcea55691f86eefdd738ea814..ec69991524d52b1657aac7e6abe132f90f2c870f 100644
--- a/htdocs/langs/et_EE/mails.lang
+++ b/htdocs/langs/et_EE/mails.lang
@@ -115,7 +115,7 @@ SentBy=Saatis
MailingNeedCommand=Turvalisuse põhjustel on parem, kui e-postitused saadetakse käsurealt. Võimalusel palu serveri administraatoril käivitada järgmine käsk kõigile saajatele e-postituse saatmiseks:
MailingNeedCommand2=Siiski saab neid saata online-režiimis, kui lisate parameetri MAILING_LIMIT_SENDBYWEB maksimaalse kirjade arvuga, mida sessiooni kohta saata. Selleks mine menüüsse Kodu->Seadistamine->Muu.
ConfirmSendingEmailing=Kui see ei ole võimalik või eelistad nende saatmist läbi veebibrauseri, siis kinnita, et oled nõus e-postituse saatmisega kohe praegu läbi brauseri?
-LimitSendingEmailing=Märkus: on-line e-postituste saatmine on turvalisuse ja aegumise põhjustel piiratud <b>%s</b> saajale sessiooni kohta.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=Tühjenda nimekir
ToClearAllRecipientsClickHere=Klõpsa siia antud e-postituse saajate nimekirja tühjendamiseks
ToAddRecipientsChooseHere=Lisa saajaid, valides nad nimekirjadest
@@ -133,6 +133,9 @@ Notifications=Teated
NoNotificationsWillBeSent=Selle tegevuse ja ettevõttega ei ole plaanis saata ühtki e-kirja teadet
ANotificationsWillBeSent=E-posti teel saadetakse 1 teade
SomeNotificationsWillBeSent=E-posti teel saadetakse %s teadet
-AddNewNotification=Aktiveeri uus e-kirja teate taotlus
-ListOfActiveNotifications=Loetle kõik aktiivsed e-posti teate taotlused
+AddNewNotification=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
ListOfNotificationsDone=Loetle kõik saadetud e-posti teated
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang
index 5a4cf43522f029042556627dd27ae5ba1a47b15f..d1d99f01b74ebec08ad6f3181b53ef4e238a0feb 100644
--- a/htdocs/langs/et_EE/main.lang
+++ b/htdocs/langs/et_EE/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Kasutajat <b>%s</b> ei leitud Dolibarri an
ErrorNoVATRateDefinedForSellerCountry=Viga: riigi '%s' jaoks ei ole käibemaksumäärasid määratletud.
ErrorNoSocialContributionForSellerCountry=Viga: riigi '%s' jaoks ei ole määratletud sotsiaalmaksu määrasid.
ErrorFailedToSaveFile=Viga: faili salvestamine ebaõnnestus.
-ErrorOnlyPngJpgSupported=Viga: toetatud on vaid .png ja .jpg formaadis pildifailid.
-ErrorImageFormatNotSupported=Sinu PHP ei toeta antud formaadis piltide teisendamiseks tarvilikke funktsioone.
SetDate=Sea kuupäev
SelectDate=Vali kuupäev
SeeAlso=Vaata lisaks %s
BackgroundColorByDefault=Vaikimisi taustavärv
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
FileWasNotUploaded=Fail on valitud manustamiseks, kuid on veel üles laadimata. Klõpsa "Lisa fail" nupul selle lisamiseks.
NbOfEntries=Kannete arv
GoToWikiHelpPage=Loe online abi (vajab võrguühendust)
@@ -266,6 +266,7 @@ Afternoon=Pärastlõuna
Quadri=Kvartal
MonthOfDay=Kuu päev
HourShort=H
+MinuteShort=mn
Rate=Määr
UseLocalTax=Maks sisse arvestatud
Bytes=Baiti
@@ -340,6 +341,7 @@ FullList=Täielik nimekiri
Statistics=Statistika
OtherStatistics=Muu statistika
Status=Staatus
+Favorite=Favorite
ShortInfo=Inform
Ref=Viide
RefSupplier=Hankija viide
@@ -356,7 +358,7 @@ ActionNotApplicable=Ei ole kohaldatav
ActionRunningNotStarted=Alustada
ActionRunningShort=Alustatud
ActionDoneShort=Lõpetatud
-ActionUncomplete=Uncomplete
+ActionUncomplete=Lõpuni viimata
CompanyFoundation=Ettevõte/ühendus
ContactsForCompany=Selle kolmanda isikuga seotud kontaktid
ContactsAddressesForCompany=Selle kolmanda isikuga seotud kontaktid/aadressid
@@ -365,6 +367,7 @@ ActionsOnCompany=Selle kolmanda isikuga seotud tegevused
ActionsOnMember=Selle liikmega seotud tegevused
NActions=%s tegevust
NActionsLate=%s hiljaks jäänud
+RequestAlreadyDone=Request already recorded
Filter=Filtreeri
RemoveFilter=Eemalda filter
ChartGenerated=Graafik loodud
@@ -508,7 +511,7 @@ NbOfCustomers=Klientide arv
NbOfLines=Ridade arv
NbOfObjects=Objektide arv
NbOfReferers=Viitajate arv
-Referers=Refering objects
+Referers=Viitavad objektid
TotalQuantity=Üldkogus
DateFromTo=Alates %s kuni %s
DateFrom=Alates %s
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Lisaatribuutide seadistamine
URLPhoto=Foto/logo URL
SetLinkToThirdParty=Seosta muu kolmanda isikuga
CreateDraft=Loo mustand
+SetToDraft=Back to draft
ClickToEdit=Klõpsa muutmiseks
ObjectDeleted=Objekt %s kustutatud
ByCountry=Riigi järgi
@@ -672,13 +676,13 @@ HelpCopyToClipboard=Lõikelauale kopeerimiseks kasuta Ctrl+C klahvikombinatsioon
SaveUploadedFileWithMask=Salvesta fail serverisse nimega "<strong>%s</strong>" (muul juhul "%s")
OriginFileName=Faili algne nimi
SetDemandReason=Määratle allikas
-SetBankAccount=Define Bank Account
-AccountCurrency=Account Currency
+SetBankAccount=Määratle pangakonto
+AccountCurrency=Konto valuuta
ViewPrivateNote=Vaata märkmeid
XMoreLines=%s joon(t) varjatud
PublicUrl=Avalik link
-AddBox=Add box
-
+AddBox=Lisa kast
+SelectElementAndClickRefresh=Select an element and click Refresh
# Week day
Monday=Esmaspäev
Tuesday=Teisipäev
diff --git a/htdocs/langs/et_EE/margins.lang b/htdocs/langs/et_EE/margins.lang
index 17570d1a9dec40c223e1b5b0e4f994de4ae85485..1042f5c96cbdab7bfb3eb1630a569a0fa9806e27 100644
--- a/htdocs/langs/et_EE/margins.lang
+++ b/htdocs/langs/et_EE/margins.lang
@@ -38,4 +38,7 @@ BuyingCost=Tootmishind
UnitCharges=Ühiku kulud
Charges=Kulud
AgentContactType=Müügiagendi kontakti liik
-AgentContactTypeDetails=Määratle, millist kontakti tüüpi (arvetel lingitud) kasutatakse müügiagentide marginaalide aruande tarbeks
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/et_EE/orders.lang b/htdocs/langs/et_EE/orders.lang
index 28ba86947e71633549e463e09ebcdf78a4b637e0..55b48bf91f09bdc84bfc2a2e2419502794bdd4c9 100644
--- a/htdocs/langs/et_EE/orders.lang
+++ b/htdocs/langs/et_EE/orders.lang
@@ -53,7 +53,7 @@ ShippingExist=Saadetis on olemas
DraftOrWaitingApproved=Mustand või heaks kiidetud pole veel tellitud
DraftOrWaitingShipped=Mustand või kinnitatud pole veel saadetud
MenuOrdersToBill=Saadetud tellimused
-MenuOrdersToBill2=Arve koostamist vajavad tellimused
+MenuOrdersToBill2=Billable orders
SearchOrder=Otsi tellimust
SearchACustomerOrder=Otsi müügitellimust
ShipProduct=Saada toode
@@ -65,7 +65,7 @@ ValidateOrder=Kinnita tellimus
UnvalidateOrder=Ava tellimus
DeleteOrder=Kustuta tellimus
CancelOrder=Tühista tellimus
-AddOrder=Lisa tellimus
+AddOrder=Create order
AddToMyOrders=Lisa minu tellimustele
AddToOtherOrders=Lisa muudele tellimustele
AddToDraftOrders=Lisa tellimuse mustandile
@@ -154,7 +154,6 @@ OrderByPhone=Telefon
CreateInvoiceForThisCustomer=Koosta tellimuste kohta arved
NoOrdersToInvoice=Pole ühtki tellimust, mille kohta arve esitada
CloseProcessedOrdersAutomatically=Liigita kõik valitud tellimused "Töödeldud".
-MenuOrdersToBill2=Arve koostamist vajavad tellimused
OrderCreation=Tellimuse loomine
Ordered=Tellitud
OrderCreated=Sinu tellimused on loodud
diff --git a/htdocs/langs/et_EE/oscommerce.lang b/htdocs/langs/et_EE/oscommerce.lang
deleted file mode 100644
index 4804395c119f99037c4de5431ab0177c96eb9fb1..0000000000000000000000000000000000000000
--- a/htdocs/langs/et_EE/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OSCommerce
-OSCommerceSetup=OSCommerce mooduli seadistamine
-OSCommerceSetupSaved=OSCommercei seadistus salvestatud
-OSCommerceServer=OSCommerce serveri host/IP
-OSCommerceDatabaseName=OSCommercei andmebaasi nimi
-OSCommercePrefix=OSCommercei tabelite prefiks
-OSCommerceUser=OSCommercei andmebaasi kasutajanimi
diff --git a/htdocs/langs/et_EE/other.lang b/htdocs/langs/et_EE/other.lang
index 8f73ab088a06e57d84bc3f184b5a5ef5f579dbca..6a0f355dfa71517def41b9b6e324b1822888cb4f 100644
--- a/htdocs/langs/et_EE/other.lang
+++ b/htdocs/langs/et_EE/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=Turvakood
Calendar=Kalender
-AddTrip=Lisa reis
Tools=Tööriistad
ToolsDesc=Siia alla on grupeeritud erinevad tööriistad, mis ei ole muudest menüükannetest kättesaadavad.<br><br>Tööriistadele saab ligi küljel asuvast menüüst.
Birthday=Sünnipäev
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation
Notify_TASK_CREATE=Task created
Notify_TASK_MODIFY=Task modified
Notify_TASK_DELETE=Task deleted
+SeeModuleSetup=See module setup
NbOfAttachedFiles=Manusena lisatud faile/dokumente
TotalSizeOfAttachedFiles=Manusena lisatud failide/dokumentide kogusuurus
MaxSize=Maksimaalne suurus
@@ -80,6 +80,16 @@ ModifiedBy=Muutis %s
ValidatedBy=Kinnitas %s
CanceledBy=Tühistas %s
ClosedBy=Sulges %s
+CreatedById=User id who created
+ModifiedById=User id who made last change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made last change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
FileWasRemoved=Fail %s oli eemaldatud
DirWasRemoved=Kaust %s oli eemaldatud
FeatureNotYetAvailableShort=Saadaval järgmises versioonis
@@ -193,25 +203,26 @@ ForgetIfNothing=Kui Sina ei palunud seda muudatust, siis ignoreeri antud kirja j
##### Calendar common #####
AddCalendarEntry=Lisa kirje kalendrisse %s
-NewCompanyToDolibarr=Ettevõte %s lisatud Dolibarri
-ContractValidatedInDolibarr=Leping %s Dolibarris kinnitatud
-ContractCanceledInDolibarr=Leping %s Dolibarris tühistatud
-ContractClosedInDolibarr=Leping %s Dolibarris suletud
-PropalClosedSignedInDolibarr=Pakkumine %s Dolibarris allkirjastatud
-PropalClosedRefusedInDolibarr=Pakkumine %s Dolibarris tagasi lükatud
-PropalValidatedInDolibarr=Pakkumine %s Dolibarris kinnitatud
-InvoiceValidatedInDolibarr=Arve %s Dolibarris kinnitatud
-InvoicePaidInDolibarr=Arve %s märgitud makstuks Dolibarris
-InvoiceCanceledInDolibarr=Arve %s Dolibarris tühistatud
-PaymentDoneInDolibarr=Makse %s Dolibarris sooritatud
-CustomerPaymentDoneInDolibarr=Kliendi makse %s Dolibarris sooritatud
-SupplierPaymentDoneInDolibarr=Hankija makse %s Dolibarris sooritatud
-MemberValidatedInDolibarr=Liige %s Dolibarris kinnitatud
-MemberResiliatedInDolibarr=Liige %s Dolibarris tühistatud
-MemberDeletedInDolibarr=Liige %s Dolibarris kustutatud
-MemberSubscriptionAddedInDolibarr=Liikme %s liikmemaks Dolibarris lisatud
-ShipmentValidatedInDolibarr=Saatmine %s Dolibarris kinnitatud
-ShipmentDeletedInDolibarr=Saatmine %s Dolibarrist kustutatud
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
##### Export #####
Export=Eksport
ExportsArea=Ekspordi ala
diff --git a/htdocs/langs/et_EE/paybox.lang b/htdocs/langs/et_EE/paybox.lang
index ec7bb38492ba596c2d23a413aa476c4b3b94521a..0791b83838130b167ef2df553ff0d5a3b4e0f43c 100644
--- a/htdocs/langs/et_EE/paybox.lang
+++ b/htdocs/langs/et_EE/paybox.lang
@@ -35,3 +35,6 @@ MessageKO=Tühistatud makse lehel olev sõnum
NewPayboxPaymentReceived=Uus Payboxi makse vastu võetud
NewPayboxPaymentFailed=Uut Payboxi makset prooviti sooritada, kuid see ebaõnnestus
PAYBOX_PAYONLINE_SENDEMAIL=E-posti aadress, kuhu saadetakse sõnum pärast makset (õnnestus või mitte)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/et_EE/resource.lang b/htdocs/langs/et_EE/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..d64075dfbf595897a63e3eebf19194d8f71030dd
--- /dev/null
+++ b/htdocs/langs/et_EE/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
diff --git a/htdocs/langs/et_EE/sendings.lang b/htdocs/langs/et_EE/sendings.lang
index 0b787d804e34b1ec2177abd7109da44563a803f9..4d441895359f6620b86bf232ebc74edfa4ec7109 100644
--- a/htdocs/langs/et_EE/sendings.lang
+++ b/htdocs/langs/et_EE/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=Praegu luuakse saadetised tellimuse kaardilt.
RelatedShippings=Seotud saatmised
ShipmentLine=Saadetise rida
CarrierList=Vedajate nimekiri
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
# Sending methods
SendingMethodCATCH=Kliendi saak
diff --git a/htdocs/langs/et_EE/stocks.lang b/htdocs/langs/et_EE/stocks.lang
index 965a1679d0f5cc3b77d3693e0f9fda5a3e0b1b86..064f62cc80317a114bc23979acaddb56a167f042 100644
--- a/htdocs/langs/et_EE/stocks.lang
+++ b/htdocs/langs/et_EE/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Lao nimi on nõutud
CorrectStock=Paranda laojääk
ListOfWarehouses=Ladude nimekiri
ListOfStockMovements=Laojääkide nimekiri
-StocksArea=Laojääkide ala
+StocksArea=Warehouses area
Location=Asukoht
LocationSummary=Asukoha lühike nimi
NumberOfDifferentProducts=Erinevate toodete arv
diff --git a/htdocs/langs/et_EE/users.lang b/htdocs/langs/et_EE/users.lang
index 9fd068063768c58fbc9da1de2e0cb3d15a600763..bae0b660b1fe9c272cde75d1d84530076e457644 100644
--- a/htdocs/langs/et_EE/users.lang
+++ b/htdocs/langs/et_EE/users.lang
@@ -63,7 +63,6 @@ ShowGroup=Näita gruppi
ShowUser=Näita kasutajat
NonAffectedUsers=Sidumata kasutajad
UserModified=Kasutaja edukalt muudetud
-GroupModified=Grupp edukalt muudetud
PhotoFile=Foto fai
UserWithDolibarrAccess=Dolibarri juurdepääsuga kasutaja
ListOfUsersInGroup=Selles grupis olevate kasutajate nimekiri
@@ -103,7 +102,7 @@ UserDisabled=Keelati kasutaja %s
UserEnabled=Aktiveeriti kasutaja %s
UserDeleted=Kustutati kasutaja %s
NewGroupCreated=Loodi grupp %s
-GroupModified=Grupp edukalt muudetud
+GroupModified=Group %s modified
GroupDeleted=Kustutati grupp %s
ConfirmCreateContact=Kas oled täiesti kindel, et soovid sellele kontaktile luua Dolibarri konto?
ConfirmCreateLogin=Kas oled täesti kindel, et soovid sellele liikmele luua Dolibarri konto?
@@ -114,8 +113,10 @@ YourRole=Sinu rollid
YourQuotaOfUsersIsReached=Sinu aktiivsete kasutajate kvoot on täis!
NbOfUsers=Kasutajaid
DontDowngradeSuperAdmin=Ainult superadministraator saab ära võtta superadministraatori õigusi
-HierarchicalResponsible=Vahetu vastutav struktuuris
+HierarchicalResponsible=Supervisor
HierarchicView=Struktuuri vaade
UseTypeFieldToChange=Kasuta muutmiseks 'Liik' välja
OpenIDURL=OpenID URL
LoginUsingOpenID=Kasuta sisselogimiseks OpenIDd
+WeeklyHours=Weekly hours
+ColorUser=Color of the user
diff --git a/htdocs/langs/et_EE/withdrawals.lang b/htdocs/langs/et_EE/withdrawals.lang
index 877cbb7facefd8d6a0d91fda010e9fe4a4e1e8f4..91e9f23d8db7638d4d148ce053d8e85ebd144e93 100644
--- a/htdocs/langs/et_EE/withdrawals.lang
+++ b/htdocs/langs/et_EE/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=Kviitung
LastWithdrawalReceipts=Viimased %s väljamaksete kviitungit
WithdrawedBills=Väljamakstud arved
WithdrawalsLines=Väljamaksete read
-RequestStandingOrderToTreat=Näita täitmata püsikorraldusi
-RequestStandingOrderTreated=Näita täidetud püsikorraldused
+RequestStandingOrderToTreat=Request for standing orders to process
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=Klientide püsikorraldused
CustomerStandingOrder=Kliendi püsikorraldus
NbOfInvoiceToWithdraw=Väljamakse taotlusega seotud arveid
@@ -40,14 +41,13 @@ TransMetod=Saatmise meetod
Send=Saada
Lines=Read
StandingOrderReject=Väljasta keeldumine
-InvoiceRefused=Arve tagasi lükatud
WithdrawalRefused=Väljamaksest keeldutud
WithdrawalRefusedConfirm=Kas oled kindel, et soovid sisestada väljamakse tagasilükkamise üksusele
RefusedData=Keeldumise kuupäev
RefusedReason=Keeldumise põhjus
RefusedInvoicing=Keeldumise eest arve esitamine
NoInvoiceRefused=Ära esita arvet keeldumise eest
-InvoiceRefused=Arve tagasi lükatud
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=Staatus
StatusUnknown=Teadmata
StatusWaiting=Ootel
@@ -76,7 +76,7 @@ WithBankUsingRIB=Pankadele, mis kasutavad RIB
WithBankUsingBANBIC=Pankadele, mis kasutavad IBAN/BIC/SWIFT
BankToReceiveWithdraw=Pangakonto, kuhu väljamakse teha
CreditDate=Krediteeri
-WithdrawalFileNotCapable=Ei suutnud luua antud riigis kehtivat väljamakse kviitungi faili
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
ShowWithdraw=Näita väljamakset
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Juhul kui arvel on vähemalt üks töötlemata väljamakse, ei märgita seda makstuks, et lubada eelnevat väljamakse haldamist.
DoStandingOrdersBeforePayments=See sakk võimaldab taotleda püsikorraldust. Pärast selle lõpetamist saad sisestada makse arve sulgemiseks.
diff --git a/htdocs/langs/eu_ES/accountancy.lang b/htdocs/langs/eu_ES/accountancy.lang
index 8cab9d2b651d75b0721d76fda619e2034e4509b4..39c2732ec29852cf93d41614ed1812c2a4c1ce4f 100644
--- a/htdocs/langs/eu_ES/accountancy.lang
+++ b/htdocs/langs/eu_ES/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts
Validate=Validate
Addanaccount=Add an accounting account
AccountAccounting=Accounting account
-Ventilation=Ventilation
+Ventilation=Breakdown
ToDispatch=To dispatch
Dispatched=Dispatched
-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
TradeMargin=Trade margin
Reports=Reports
ByCustomerInvoice=By invoices customers
@@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger
Bookkeeping=General ledger
AccountBalanceByMonth=Account balance by month
-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
Line=Line
CAHTF=Total purchase supplier HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice
IntoAccount=In the accounting account
Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
+VentilationAuto=Automatic breakdown
Processing=Processing
EndProcessing=The end of processing
@@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account
ACCOUNTING_SEPARATORCSV=Separator CSV
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
@@ -140,14 +140,14 @@ Active=Statement
NewFiscalYear=New fiscal year
-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
TotalVente=Total turnover HT
TotalMarge=Total sales margin
DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
ChangeAccount=Change the accounting account for lines selected by the account:
Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
@@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically
ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang
index 0ff71f9e2c246bb113c636a531df8f0a8db456e0..af502ac572036d7509297ac6e32d661e16d6bf94 100644
--- a/htdocs/langs/eu_ES/admin.lang
+++ b/htdocs/langs/eu_ES/admin.lang
@@ -1,123 +1,123 @@
# Dolibarr language file - Source file is en_US - admin
Foundation=Fundazioa
Version=Bertsioa
-VersionProgram=programa bertsioa
+VersionProgram=Programa bertsioa
VersionLastInstall=Bertsioaren lehenengo instalazioa
-VersionLastUpgrade=Bertsioaren askenengo eguneraketa
-VersionExperimental=esperimentala
-VersionDevelopment=garapena
-VersionUnknown=ezezaguna
-VersionRecommanded=gomendatua
+VersionLastUpgrade=Bertsioaren azkeneko eguneraketa
+VersionExperimental=Esperimentala
+VersionDevelopment=Garapena
+VersionUnknown=Ezezaguna
+VersionRecommanded=Gomendatua
SessionId=Sesioaren ID
SessionSaveHandler=Kudeatzailea sesioak gordetzeko
-SessionSavePath=sesio biltegiaren lokalizazioa
-PurgeSessions=sesio garbiketa
-ConfirmPurgeSessions=benetan garbitu nahi dituzu sesio guztiak? hauxe erabiltzaile guztiak (zu izan ezik) kaleratuko ditu.
+SessionSavePath=Sesio biltegiaren kokapena
+PurgeSessions=Sesio garbiketa
+ConfirmPurgeSessions=Benetan garbitu nahi dituzu sesio guztiak? Honek erabiltzaile guztiak (zu izan ezik) kaleratuko ditu.
NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow to list all running sessions.
-LockNewSessions=blokeatu konexio berriak
-ConfirmLockNewSessions=Ziur zaude, blokeatu nahi dituzula zure dolibarr-eko konexio berriak. Bakarrik <b>%s</b> erabiltzailea, konexioa burutu ahal izango du honen ondorioz.
-UnlockNewSessions=Kendu konexioaren blokeoa
-YourSession=zure sesioa
-Sessions=erabiltzaileen sesioa
-WebUserGroup=Web server user/group
+LockNewSessions=Konexio berriak blokeatu
+ConfirmLockNewSessions=Ziur zaude, blokeatu nahi dituzula zure dolibarr-eko konexio berriak. Bakarrik <b>%s</b> erabiltzaileak, konexioa burutu ahal izango du honen ondorioz.
+UnlockNewSessions=Konexioaren blokeoa kendu
+YourSession=Zure sesioa
+Sessions=Erabiltzaileen sesioa
+WebUserGroup=Web-zerbitzariaren erabiltzailea/taldea
NoSessionFound=Your PHP seems to not allow to list active sessions. Directory used to save sessions (<b>%s</b>) might be protected (For example, by OS permissions or by PHP directive open_basedir).
HTMLCharset=Charset for generated HTML pages
DBStoringCharset=Database charset to store data
DBSortingCharset=Database charset to sort data
-WarningModuleNotActive=Module <b>%s</b> must be enabled
+WarningModuleNotActive=<b>%s</b> moduluak gaituta egon behar du
WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page.
-DolibarrSetup=Dolibarr install or upgrade
-DolibarrUser=Dolibarr user
-InternalUser=Internal user
-ExternalUser=External user
-InternalUsers=Internal users
-ExternalUsers=External users
-GlobalSetup=Global setup
-GUISetup=Display
+DolibarrSetup=Dolibarr instalatu edo eguneratu
+DolibarrUser=Dolibarr erabiltzailea
+InternalUser=Barneko erabiltzailea
+ExternalUser=Kanpoko erabiltzailea
+InternalUsers=Barneko erabiltzaileak
+ExternalUsers=Kanpoko erabiltzaileak
+GlobalSetup=Konfigurazio orokorra
+GUISetup=Itxura
SetupArea=Setup area
FormToTestFileUploadForm=Form to test file upload (according to setup)
IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any usage of update tool.
-SecuritySetup=Security setup
-ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
-ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
+SecuritySetup=Segurtasunaren konfigurazioa
+ErrorModuleRequirePHPVersion=Errorea, modulu honek PHP-ren %s bertsioa -edo handiagoa- behar du
+ErrorModuleRequireDolibarrVersion=Errorea, modulu honek Dolibarr-en %s bertsioa -edo handiagoa- behar du
ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is not supported.
DictionarySetup=Dictionary setup
Dictionary=Dictionaries
Chartofaccounts=Chart of accounts
Fiscalyear=Fiscal years
ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
-ErrorCodeCantContainZero=Code can't contain value 0
+ErrorCodeCantContainZero=Kodeak ezin du 0 balioa izan
DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
-ConfirmAjax=Use Ajax confirmation popups
+ConfirmAjax=Ajax berrespen pop-up-ak erabili
UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
UseSearchToSelectCompany=Use autocompletion fields to choose third parties instead of using a list box.
ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it
UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
-SearchFilter=Search filters options
+SearchFilter=Bilaketa-iragazien aukerak
NumberOfKeyToSearch=Nbr of characters to trigger search: %s
ViewFullDateActions=Show full dates events in the third sheet
-NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
-JavascriptDisabled=JavaScript disabled
-UsePopupCalendar=Use popup for dates input
-UsePreviewTabs=Use preview tabs
-ShowPreview=Show preview
-PreviewNotAvailable=Preview not available
-ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
+NotAvailableWhenAjaxDisabled=Ajax ezgaituta dagoenean ez dago erabilgarri
+JavascriptDisabled=JavaScript ezgaituta
+UsePopupCalendar=Datak sartzeko popup-a erabili
+UsePreviewTabs=Aurreikuspen fitxak erabili
+ShowPreview=Aurreikuspena aurkeztu
+PreviewNotAvailable=Aurreikuspena ez dago eskuragarri
+ThemeCurrentlyActive=Aktibatuta dagoen gaia
+CurrentTimeZone=TimeZone PHP (zerbitzaria)
MySQLTimeZone=TimeZone MySql (database)
TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
Space=Space
-Table=Table
-Fields=Fields
-Index=Index
-Mask=Mask
-NextValue=Next value
+Table=Taula
+Fields=Eremuak
+Index=Aurkibidea
+Mask=Maskara
+NextValue=Hurrengo balioa
NextValueForInvoices=Next value (invoices)
NextValueForCreditNotes=Next value (credit notes)
NextValueForDeposit=Next value (deposit)
NextValueForReplacements=Next value (replacements)
MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to <b>%s</b> %s, whatever this parameter's value is
-NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
-MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any upload)
-UseCaptchaCode=Use graphical code (CAPTCHA) on login page
-UseAvToScanUploadedFiles=Use anti-virus to scan uploaded files
-AntiVirusCommand= Full path to antivirus command
+NoMaxSizeByPHPLimit=Oharra: zure PHP konfigurazioan ez da limiterik ezarri
+MaxSizeForUploadedFiles=Igotako fitxategien tamaina maximoa (0 fitxategiak igotzea ezgaitzeko)
+UseCaptchaCode=Sarrera orrian kode grafikoa (CAPTCHA) erabili
+UseAvToScanUploadedFiles=Igotako fitxategiak aztertzeko anti-birusa erabili
+AntiVirusCommand= Biruskontrako komandoaren kokapen osoa
AntiVirusCommandExample= Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
AntiVirusParam= More parameters on command line
AntiVirusParamExample= Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
-ComptaSetup=Accounting module setup
-UserSetup=User management setup
-MenuSetup=Menu management setup
-MenuLimits=Limits and accuracy
+ComptaSetup=Kontabilitate moduluaren konfigurazia
+UserSetup=Erabiltzaileen kudeaketaren konfigurazioa
+MenuSetup=Menuen kudeaketaren konfigurazioa
+MenuLimits=Limiteak eta bereizmena
MenuIdParent=Parent menu ID
DetailMenuIdParent=ID of parent menu (empty for a top menu)
DetailPosition=Sort number to define menu position
PersonalizedMenusNotSupported=Personalized menus not supported
-AllMenus=All
-NotConfigured=Module not configured
-Setup=Setup
-Activation=Activation
-Active=Active
-SetupShort=Setup
-OtherOptions=Other options
-OtherSetup=Other setup
-CurrentValueSeparatorDecimal=Decimal separator
-CurrentValueSeparatorThousand=Thousand separator
+AllMenus=Guztiak
+NotConfigured=Konfiguratu gabeko modulua
+Setup=Konfigurazioa
+Activation=Aktibazioa
+Active=Aktibo
+SetupShort=Konfigurazioa
+OtherOptions=Beste aukerak
+OtherSetup=Beste konfigurazioa
+CurrentValueSeparatorDecimal=Bereizle hamartarra
+CurrentValueSeparatorThousand=Milakoen bereizlea
Destination=Destination
IdModule=Module ID
IdPermissions=Permissions ID
-Modules=Modules
-ModulesCommon=Main modules
-ModulesOther=Other modules
-ModulesInterfaces=Interfaces modules
+Modules=Moduluak
+ModulesCommon=Modulu nagusiak
+ModulesOther=Beste moduluak
+ModulesInterfaces=Interfaze moduluak
ModulesSpecial=Modules very specific
-ParameterInDolibarr=Parameter %s
-LanguageParameter=Language parameter %s
-LanguageBrowserParameter=Parameter %s
-LocalisationDolibarrParameters=Localisation parameters
+ParameterInDolibarr=%s parametroa
+LanguageParameter=%s hizkuntza parametroa
+LanguageBrowserParameter=%s parametroa
+LocalisationDolibarrParameters=Lokalizazio parametroak
ClientTZ=Client Time Zone (user)
ClientHour=Client time (user)
OSTZ=Server OS Time Zone
@@ -125,68 +125,68 @@ PHPTZ=PHP server Time Zone
PHPServerOffsetWithGreenwich=PHP server offset width Greenwich (seconds)
ClientOffsetWithGreenwich=Client/Browser offset width Greenwich (seconds)
DaylingSavingTime=Daylight saving time
-CurrentHour=PHP Time (server)
+CurrentHour=PHP Denbora (zerbitzaria)
CompanyTZ=Company Time Zone (main company)
CompanyHour=Company Time (main company)
CurrentSessionTimeOut=Current session timeout
YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
OSEnv=OS Environment
-Box=Box
-Boxes=Boxes
+Box=Kutxa
+Boxes=Kutxak
MaxNbOfLinesForBoxes=Max number of lines for boxes
-PositionByDefault=Default order
-Position=Position
+PositionByDefault=Lehenetsitako ordena
+Position=Posizioa
MenusDesc=Menus managers define content of the 2 menu bars (horizontal bar and vertical bar).
MenusEditorDesc=The menu editor allow you to define personalized entries in menus. Use it carefully to avoid making dolibarr unstable and menu entries permanently unreachable.<br>Some modules add entries in the menus (in menu <b>All</b> in most cases). If you removed some of these entries by mistake, you can restore them by disabling and reenabling the module.
-MenuForUsers=Menu for users
-LangFile=.lang file
-System=System
-SystemInfo=System information
-SystemTools=System tools
-SystemToolsArea=System tools area
-SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for.
-Purge=Purge
+MenuForUsers=Erabiltzaileentzat menua
+LangFile=.lang fitxategia
+System=Sistema
+SystemInfo=Sistemaren informazioa
+SystemTools=Sistemaren tresnak
+SystemToolsArea=Sistemaren tresnen gunea
+SystemToolsAreaDesc=Gune honek kudeaketarako aukerak eskaintzen ditu. Bilatzen ari zarena aukeratzeko menua erabili.
+Purge=Garbitu
PurgeAreaDesc=This page allows you to delete all files built or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files built by the web server.
PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk to loose data)
PurgeDeleteTemporaryFiles=Delete all temporary files (no risk to loose data)
PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory <b>%s</b>. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted.
-PurgeRunNow=Purge now
-PurgeNothingToDelete=No directory or file to delete.
-PurgeNDirectoriesDeleted=<b>%s</b> files or directories deleted.
-PurgeAuditEvents=Purge all security events
+PurgeRunNow=Orain garbitu
+PurgeNothingToDelete=Ez dago ezabatzeko karpeta edo fitxategirik
+PurgeNDirectoriesDeleted=<b>%s</b> fitxategi edo karpetak ezabatu dira.
+PurgeAuditEvents=Garbitu segurtasuneko gertaera guztiak
ConfirmPurgeAuditEvents=Are you sure you want to purge all security events ? All security logs will be deleted, no other data will be removed.
-NewBackup=New backup
-GenerateBackup=Generate backup
-Backup=Backup
-Restore=Restore
+NewBackup=Segurtasun-kopia berria
+GenerateBackup=Segurtasun-kopia egin
+Backup=Segurtasun-kopia
+Restore=Berrezarri
RunCommandSummary=Backup has been launched with the following command
RunCommandSummaryToLaunch=Backup can be launched with the following command
WebServerMustHavePermissionForCommand=Your web server must have the permission to run such commands
-BackupResult=Backup result
-BackupFileSuccessfullyCreated=Backup file successfully generated
-YouCanDownloadBackupFile=Generated files can now be downloaded
-NoBackupFileAvailable=No backup files available.
-ExportMethod=Export method
-ImportMethod=Import method
+BackupResult=Segurtasun-kopiaren emaitza
+BackupFileSuccessfullyCreated=Segurtasun-kopia ondo egin da
+YouCanDownloadBackupFile=Sortutako fitxategiak orain jaitsi ditzakezu
+NoBackupFileAvailable=Ez dago segurtasun-kopiarik eskuragarri
+ExportMethod=Esportatzeko metodoa
+ImportMethod=Inportatzeko metodoa
ToBuildBackupFileClickHere=To build a backup file, click <a href="%s">here</a>.
ImportMySqlDesc=To import a backup file, you must use mysql command from command line:
ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line:
ImportMySqlCommand=%s %s < mybackupfile.sql
ImportPostgreSqlCommand=%s %s mybackupfile.sql
FileNameToGenerate=File name to generate
-Compression=Compression
+Compression=Konpresioa
CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
ExportCompatibility=Compatibility of generated export file
-MySqlExportParameters=MySQL export parameters
-PostgreSqlExportParameters= PostgreSQL export parameters
+MySqlExportParameters=MySQL esportatzeko parametroak
+PostgreSqlExportParameters= PostgreSQL esportatzeko parametroak
UseTransactionnalMode=Use transactional mode
FullPathToMysqldumpCommand=Full path to mysqldump command
FullPathToPostgreSQLdumpCommand=Full path to pg_dump command
-ExportOptions=Export Options
+ExportOptions=Esportatzeko aukerak
AddDropDatabase=Add DROP DATABASE command
AddDropTable=Add DROP TABLE command
-ExportStructure=Structure
+ExportStructure=Egitura
Datas=Data
NameColumn=Name columns
ExtendedInsert=Extended INSERT
@@ -194,11 +194,11 @@ NoLockBeforeInsert=No lock commands around INSERT
DelayedInsert=Delayed insert
EncodeBinariesInHexa=Encode binary data in hexadecimal
IgnoreDuplicateRecords=Ignore errors of duplicate records (INSERT IGNORE)
-Yes=Yes
-No=No
-AutoDetectLang=Autodetect (browser language)
-FeatureDisabledInDemo=Feature disabled in demo
-Rights=Permissions
+Yes=Bai
+No=Ez
+AutoDetectLang=Berez antzeman (nabigatzailean hizkuntza)
+FeatureDisabledInDemo=Demo-an ezgaitutako aukera
+Rights=Baimenak
BoxesDesc=Boxes are screen area that show a piece of information on some pages. You can choose between showing the box or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off in column "Status" to enable a module/feature.
@@ -206,36 +206,36 @@ ModulesInterfaceDesc=The Dolibarr modules interface allows you to add features d
ModulesSpecialDesc=Special modules are very specific or seldom used modules.
ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for a particular business.
ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet...
-ModulesMarketPlaces=More modules...
+ModulesMarketPlaces=Modulu gehiago...
DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
WebSiteDesc=Web site providers you can search to find more modules...
-URL=Link
-BoxesAvailable=Boxes available
-BoxesActivated=Boxes activated
-ActivateOn=Activate on
-ActiveOn=Activated on
-SourceFile=Source file
-AutomaticIfJavascriptDisabled=Automatic if Javascript is disabled
-AvailableOnlyIfJavascriptNotDisabled=Available only if JavaScript is not disabled
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
-Required=Required
+URL=Esteka
+BoxesAvailable=Eskuragarri dauden kutxak
+BoxesActivated=Aktibatutako kutxak
+ActivateOn=Aktibatu on
+ActiveOn=Aktibatuta on
+SourceFile=Iturri-fitxategia
+AutomaticIfJavascriptDisabled=Automatikoa JavaScript ezgaituta badago
+AvailableOnlyIfJavascriptNotDisabled=Eskuragarri soilik JavaScript ezgaituta ez badago
+AvailableOnlyIfJavascriptAndAjaxNotDisabled=Eskuragarri soilik JavaScript ezgaituta ez badago
+Required=Beharrezkoa
UsedOnlyWithTypeOption=Used by some agenda option only
-Security=Security
-Passwords=Passwords
+Security=Segurtasuna
+Passwords=Pasahitzak
DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activated recommended)
InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="..."</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s"</b>
InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:..."</b><br>by<br><b>$dolibarr_main_db_pass="%s"</b>
ProtectAndEncryptPdfFiles=Protection of generated pdf files (Activated NOT recommended, breaks mass pdf generation)
ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature make building of a global cumulated pdf not working (like unpaid invoices).
-Feature=Feature
-DolibarrLicense=License
-DolibarrProjectLeader=Project leader
-Developpers=Developers/contributors
-OtherDeveloppers=Other developers/contributors
+Feature=Aukera
+DolibarrLicense=Lizentzia
+DolibarrProjectLeader=Proiektuaren burua
+Developpers=Garatzaileak/laguntzaileak
+OtherDeveloppers=Beste garatzaileak/languntzaileak
OfficialWebSite=Dolibarr international official web site
OfficialWebSiteFr=French official web site
-OfficialWiki=Dolibarr documentation on Wiki
+OfficialWiki=Dolibarr-en dokumentazioa Wiki-an
OfficialDemo=Dolibarr online demo
OfficialMarketPlace=Official market place for external modules/addons
OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
@@ -249,12 +249,12 @@ CurrentTopMenuHandler=Current top menu handler
CurrentLeftMenuHandler=Current left menu handler
CurrentMenuHandler=Current menu handler
CurrentSmartphoneMenuHandler=Current smartphone menu handler
-MeasuringUnit=Measuring unit
-Emails=E-mails
-EMailsSetup=E-mails setup
+MeasuringUnit=Neurri-unitatea
+Emails=E-postak
+EMailsSetup=E-posten konfigurazioa
EMailsDesc=This page allows you to overwrite your PHP parameters for e-mails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless.
-MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_PORT=SMTP/SMTPS ataka (berez php.ini fitxategian adierazita: <b>%s</b>)
+MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS zerbitzaria (berez php.ini fitxategian adierazita: <b>%s</b>)
MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
MAIN_MAIL_EMAIL_FROM=Sender e-mail for automatic emails (By default in php.ini: <b>%s</b>)
@@ -265,42 +265,42 @@ MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders
MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to
MAIN_DISABLE_ALL_MAILS=Disable all e-mails sendings (for test purposes or demos)
MAIN_MAIL_SENDMODE=Method to use to send EMails
-MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
-MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
-MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encrypt
+MAIN_MAIL_SMTPS_ID=SMTP ID-a autentifikazio behar bada
+MAIN_MAIL_SMTPS_PW=SMTP parahitza autentifikazioa behar bada
+MAIN_MAIL_EMAIL_TLS= TLS (SSL) enkriptazioa erabili
MAIN_DISABLE_ALL_SMS=Disable all SMS sendings (for test purposes or demos)
-MAIN_SMS_SENDMODE=Method to use to send SMS
+MAIN_SMS_SENDMODE=SMS-ak bidaltzeko erabiliko den modua
MAIN_MAIL_SMS_FROM=Default sender phone number for Sms sending
FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
SubmitTranslation=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on www.dolibarr.org forum.
-ModuleSetup=Module setup
-ModulesSetup=Modules setup
-ModuleFamilyBase=System
+ModuleSetup=Moduluaren konfigurazioa
+ModulesSetup=Moduluen konfigurazioa
+ModuleFamilyBase=Sistema
ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilyProducts=Products Management
-ModuleFamilyHr=Human Resource Management
-ModuleFamilyProjects=Projects/Collaborative work
-ModuleFamilyOther=Other
-ModuleFamilyTechnic=Multi-modules tools
-ModuleFamilyExperimental=Experimental modules
+ModuleFamilyProducts=Produktuak Kudeatzea
+ModuleFamilyHr=Pertsonak Kudeatzea
+ModuleFamilyProjects=Proiektuak/Lan-taldeak
+ModuleFamilyOther=Besteak
+ModuleFamilyTechnic=Modulu-anitzen tresnak
+ModuleFamilyExperimental=Modulu esperimentalak
ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
ModuleFamilyECM=Electronic Content Management (ECM)
-MenuHandlers=Menu handlers
-MenuAdmin=Menu editor
+MenuHandlers=Menu maneiatzailea
+MenuAdmin=Menu editorea
DoNotUseInProduction=Do not use in production
ThisIsProcessToFollow=This is setup to process:
-StepNb=Step %s
+StepNb=%s pausua
FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
-DownloadPackageFromWebSite=Download package.
+DownloadPackageFromWebSite=Paketea jaitsi
UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr's root directory <b>%s</b>
SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
NotExistsDirect=The alternative root directory is not defined.<br>
InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
-YouCanSubmitFile=Select module:
-CurrentVersion=Dolibarr current version
+YouCanSubmitFile=Modulua aukeratu:
+CurrentVersion=Dolibarr-en uneko bertsioa
CallUpdatePage=Go to the page that updates the database structure and datas: %s.
-LastStableVersion=Last stable version
+LastStableVersion=Azkeneko bertsio egonkorra
GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
@@ -312,8 +312,8 @@ GenericNumRefModelDesc=Returns a customizable number according to a defined mask
ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
DoTestServerAvailability=Test server connectivity
-DoTestSend=Test sending
-DoTestSendHTML=Test sending HTML
+DoTestSend=Bidalketa frogatu
+DoTestSendHTML=HTML bidalketa frogatu
ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
@@ -323,11 +323,11 @@ UseACacheDelay= Delay for caching export response in seconds (0 or empty for no
DisableLinkToHelpCenter=Hide link "<b>Need help or support</b>" on login page
DisableLinkToHelp=Hide link "<b>%s Online help</b>" on left menu
AddCRIfTooLong=There is no automatic wrapping, so if line is out of page on documents because too long, you must add yourself carriage returns in the textarea.
-ModuleDisabled=Module disabled
-ModuleDisabledSoNoEvent=Module disabled so event never created
+ModuleDisabled=Ezgaitutako modulua
+ModuleDisabledSoNoEvent=Modulua ezgaituta dagoenez ez da inoiz gertaerarik sortu
ConfirmPurge=Are you sure you want to execute this purge ?<br>This will delete definitely all your data files with no way to restore them (ECM files, attached files...).
-MinLength=Minimum length
-LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
+MinLength=Gutxieneko luzeera
+LanguageFilesCachedIntoShmopSharedMemory=.lang fitxategiak memoria partekatuan kargatu dira
ExamplesWithCurrentSetup=Examples with current running setup
ListOfDirectories=List of OpenDocument templates directories
ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b>.
@@ -335,14 +335,14 @@ NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directo
ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
-FirstnameNamePosition=Position of Name/Lastname
+FirstnameNamePosition=Izena/Abizena-ren kokapena
DescWeather=The following pictures will be shown on dashboard when number of late actions reach the following values:
KeyForWebServicesAccess=Key to use Web Services (parameter "dolibarrkey" in webservices)
TestSubmitForm=Input test form
ThisForceAlsoTheme=Using this menu manager will also use its own theme whatever is user choice. Also this menu manager specialized for smartphones does not works on all smartphone. Use another menu manager if you experience problems on yours.
-ThemeDir=Skins directory
+ThemeDir=Gaien kokapena
ConnectionTimeout=Connexion timeout
-ResponseTimeout=Response timeout
+ResponseTimeout=Erantzuteko denbora-muga
SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__
ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first before using this feature.
SecurityToken=Key to secure URLs
@@ -354,41 +354,41 @@ HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF
HideDescOnPDF=Hide products description on generated PDF
HideRefOnPDF=Hide products ref. on generated PDF
HideDetailsOnPDF=Hide products lines details on generated PDF
-Library=Library
+Library=Liburutegia
UrlGenerationParameters=Parameters to secure URLs
SecurityTokenIsUnique=Use a unique securekey parameter for each URL
-EnterRefToBuildUrl=Enter reference for object %s
-GetSecuredUrl=Get calculated URL
+EnterRefToBuildUrl=%s objektuen erreferentzia sartu
+GetSecuredUrl=Kalkulatutako URL-a hartu
ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons
OldVATRates=Old VAT rate
NewVATRates=New VAT rate
PriceBaseTypeToChange=Modify on prices with base reference value defined on
MassConvert=Launch mass convert
-String=String
-TextLong=Long text
-Int=Integer
-Float=Float
-DateAndTime=Date and hour
+String=Katea
+TextLong=Testu luzea
+Int=Zenbaki osoa
+Float=Zenbaki hamartarra
+DateAndTime=Data eta ordua
Unique=Unique
-Boolean=Boolean (Checkbox)
-ExtrafieldPhone = Phone
-ExtrafieldPrice = Price
-ExtrafieldMail = Email
-ExtrafieldSelect = Select list
-ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
+Boolean=Boolearra (Checkbox)
+ExtrafieldPhone = Telefonoa
+ExtrafieldPrice = Prezioa
+ExtrafieldMail = E-posta
+ExtrafieldSelect = Aukeren zerrenda
+ExtrafieldSelectList = Taulatik aukeratu
+ExtrafieldSeparator=Bereizlea
ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
+ExtrafieldRadio=Radio botoia
ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-LibraryToBuildPDF=Library used to build PDF
+LibraryToBuildPDF=PDF-ak sortzeko erabilitako liburutegia
WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (vat is not applied on local tax)<br>2 : local tax apply on products and services before vat (vat is calculated on amount + localtax)<br>3 : local tax apply on products without vat (vat is not applied on local tax)<br>4 : local tax apply on products before vat (vat is calculated on amount + localtax)<br>5 : local tax apply on services without vat (vat is not applied on local tax)<br>6 : local tax apply on services before vat (vat is calculated on amount + localtax)
SMS=SMS
LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
-RefreshPhoneLink=Refresh link
+RefreshPhoneLink=Esteka freskatu
LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
KeepEmptyToUseDefault=Keep empty to use default value
DefaultLink=Default link
@@ -405,42 +405,42 @@ NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into bar
NoRecordWithoutBarcodeDefined=No record with no barcode value defined.
# Modules
-Module0Name=Users & groups
-Module0Desc=Users and groups management
+Module0Name=Erabiltzaileak & Taldeak
+Module0Desc=Erabiltzaile eta taldeen kudeaketa
Module1Name=Third parties
Module1Desc=Companies and contact management (customers, prospects...)
-Module2Name=Commercial
-Module2Desc=Commercial management
-Module10Name=Accounting
+Module2Name=Komertziala
+Module2Desc=Kudeaketa komertziala
+Module10Name=Kontabilitatea
Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
-Module20Name=Proposals
-Module20Desc=Commercial proposal management
+Module20Name=Proposamenak
+Module20Desc=Proposamen komertzialak kudeatzea
Module22Name=Mass E-mailings
Module22Desc=Mass E-mailing management
-Module23Name= Energy
+Module23Name= Energia
Module23Desc= Monitoring the consumption of energies
-Module25Name=Customer Orders
-Module25Desc=Customer order management
-Module30Name=Invoices
+Module25Name=Bezeroen Eskaerak
+Module25Desc=Bezeroen eskaerak kudeatzea
+Module30Name=Fakturak
Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
-Module40Name=Suppliers
+Module40Name=Hornitzaileak
Module40Desc=Supplier management and buying (orders and invoices)
-Module42Name=Logs
+Module42Name=Log
Module42Desc=Logging facilities (file, syslog, ...)
-Module49Name=Editors
-Module49Desc=Editor management
-Module50Name=Products
-Module50Desc=Product management
+Module49Name=Editoreak
+Module49Desc=Editoreak kudeatzea
+Module50Name=Produktuak
+Module50Desc=Produktuak kudeatzea
Module51Name=Mass mailings
Module51Desc=Mass paper mailing management
-Module52Name=Stocks
-Module52Desc=Stock management (products)
-Module53Name=Services
-Module53Desc=Service management
-Module54Name=Contracts
-Module54Desc=Contract and service management
-Module55Name=Barcodes
-Module55Desc=Barcode management
+Module52Name=Stock-ak
+Module52Desc=Stock-ak kudeatzea (produktuak)
+Module53Name=Zerbitzuak
+Module53Desc=Zerbitzuak kudeatzea
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
+Module55Name=Barra-kodeak
+Module55Desc=Barra-kodeak kudeatzea
Module56Name=Telephony
Module56Desc=Telephony integration
Module57Name=Standing orders
@@ -453,59 +453,59 @@ Module70Name=Interventions
Module70Desc=Intervention management
Module75Name=Expense and trip notes
Module75Desc=Expense and trip notes management
-Module80Name=Shipments
-Module80Desc=Shipments and delivery order management
-Module85Name=Banks and cash
-Module85Desc=Management of bank or cash accounts
-Module100Name=External site
+Module80Name=Bidalketak
+Module80Desc=Bidalketa eta banaketa eskerak kudeatzea
+Module85Name=Bankuak eta eskudirua
+Module85Desc=Banku edo eskudiru kontuak kudeatzea
+Module100Name=Kanpoko tokia
Module100Desc=This module include an external web site or page into Dolibarr menus and view it into a Dolibarr frame
-Module105Name=Mailman and SPIP
+Module105Name=Mailman eta SPIP
Module105Desc=Mailman or SPIP interface for member module
Module200Name=LDAP
-Module200Desc=LDAP directory synchronisation
+Module200Desc=LDAP direktorioa sinkronizatzea
Module210Name=PostNuke
-Module210Desc=PostNuke integration
-Module240Name=Data exports
+Module210Desc=PostNuke integrazioa
+Module240Name=Daten esportazioa
Module240Desc=Tool to export Dolibarr datas (with assistants)
-Module250Name=Data imports
+Module250Name=Daten inportazioa
Module250Desc=Tool to import datas in Dolibarr (with assistants)
-Module310Name=Members
+Module310Name=Kideak
Module310Desc=Foundation members management
-Module320Name=RSS Feed
+Module320Name=RSS kanala
Module320Desc=Add RSS feed inside Dolibarr screen pages
-Module330Name=Bookmarks
-Module330Desc=Bookmark management
-Module400Name=Projects
-Module400Desc=Project management inside other modules
-Module410Name=Webcalendar
-Module410Desc=Webcalendar integration
+Module330Name=Laster-markak
+Module330Desc=Laster-markak kudeatzea
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
+Module410Name=Web-egutegia
+Module410Desc=Web-egutegiaren integrazioa
Module500Name=Special expenses (tax, social contributions, dividends)
Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
Module510Name=Salaries
Module510Desc=Management of employees salaries and payments
-Module600Name=Notifications
-Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts
-Module700Name=Donations
-Module700Desc=Donation management
+Module600Name=Jakinarazpenak
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
+Module700Name=Diru-emateak
+Module700Desc=Diru-emateak kudeatzea
Module1200Name=Mantis
Module1200Desc=Mantis integration
-Module1400Name=Accounting
+Module1400Name=Kontabilitatea
Module1400Desc=Accounting management (double parties)
-Module1780Name=Categories
-Module1780Desc=Category management (products, suppliers and customers)
-Module2000Name=WYSIWYG editor
+Module1780Name=Kategoriak
+Module1780Desc=Kategoriak kudeatzea (produktuak, hornitzaileak eta bezeroak)
+Module2000Name=WYSIWYG editorea
Module2000Desc=Allow to edit some text area using an advanced editor
Module2300Name=Cron
Module2300Desc=Scheduled task management
Module2400Name=Agenda
-Module2400Desc=Events/tasks and agenda management
+Module2400Desc=Gertaera/Atazak eta agenda kudeatzea
Module2500Name=Electronic Content Management
-Module2500Desc=Save and share documents
-Module2600Name=WebServices
+Module2500Desc=Dokumentuak gorde eta partekatu
+Module2600Name=Web-zerbitzuak
Module2600Desc=Enable the Dolibarr web services server
Module2700Name=Gravatar
Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
-Module2800Desc=FTP Client
+Module2800Desc=FTP Bezeroa
Module2900Name=GeoIPMaxmind
Module2900Desc=GeoIP Maxmind conversions capabilities
Module3100Name=Skype
@@ -514,35 +514,35 @@ Module5000Name=Multi-company
Module5000Desc=Allows you to manage multiple companies
Module6000Name=Workflow
Module6000Desc=Workflow management
-Module20000Name=Holidays
-Module20000Desc=Declare and follow employees holidays
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
Module39000Name=Product batch
Module39000Desc=Batch number, eat-by and sell-by date management on products
Module50000Name=PayBox
Module50000Desc=Module to offer an online payment page by credit card with PayBox
Module50100Name=Point of sales
Module50100Desc=Point of sales module
-Module50200Name= Paypal
-Module50200Desc= Module to offer an online payment page by credit card with Paypal
+Module50200Name=Paypal
+Module50200Desc=Module to offer an online payment page by credit card with Paypal
Module50400Name=Accounting (advanced)
Module50400Desc=Accounting management (double parties)
Module54000Name=PrintIPP
Module54000Desc=Print via Cups IPP Printer.
Module55000Name=Open Poll
Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
-Module59000Name=Margins
-Module59000Desc=Module to manage margins
+Module59000Name=Marjinak
+Module59000Desc=Marjinak kudeatzeko modulua
Module60000Name=Commissions
Module60000Desc=Module to manage commissions
Module150010Name=Batch number, eat-by date and sell-by date
Module150010Desc=batch number, eat-by date and sell-by date management for product
-Permission11=Read customer invoices
-Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
-Permission14=Validate customer invoices
-Permission15=Send customer invoices by email
+Permission11=Bezeroen fakturak ikusi
+Permission12=Bezeroen fakturak sortu/aldatu
+Permission13=Bezeroaren fakturak baliogabetu
+Permission14=Bezeroaren fakturak balioztatu
+Permission15=Bezeroaren faktura e-postaz bidali
Permission16=Create payments for customer invoices
-Permission19=Delete customer invoices
+Permission19=Bezeroaren fakturak ezabatu
Permission21=Read commercial proposals
Permission22=Create/modify commercial proposals
Permission24=Validate commercial proposals
@@ -550,11 +550,11 @@ Permission25=Send commercial proposals
Permission26=Close commercial proposals
Permission27=Delete commercial proposals
Permission28=Export commercial proposals
-Permission31=Read products
+Permission31=Produktuak ikusi
Permission32=Create/modify products
-Permission34=Delete products
+Permission34=Produktuak ezabatu
Permission36=See/manage hidden products
-Permission38=Export products
+Permission38=Produktuak esportatu
Permission41=Read projects (shared project and projects i'm contact for)
Permission42=Create/modify projects (shared project and projects i'm contact for)
Permission44=Delete projects (shared project and projects i'm contact for)
@@ -606,15 +606,16 @@ Permission151=Read standing orders
Permission152=Create/modify a standing orders request
Permission153=Transmission standing orders receipts
Permission154=Credit/refuse standing orders receipts
-Permission161=Read contracts
-Permission162=Create/modify contracts
-Permission163=Activate a service of a contract
-Permission164=Disable a service of a contract
-Permission165=Delete contracts
-Permission171=Read trips
-Permission172=Create/modify trips
-Permission173=Delete trips
-Permission178=Export trips
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Read trips and expenses (own and his subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
Permission180=Read suppliers
Permission181=Read supplier orders
Permission182=Create/modify supplier orders
@@ -671,7 +672,7 @@ Permission300=Read bar codes
Permission301=Create/modify bar codes
Permission302=Delete bar codes
Permission311=Read services
-Permission312=Assign service to contract
+Permission312=Assign service/subscription to contract
Permission331=Read bookmarks
Permission332=Create/modify bookmarks
Permission333=Delete bookmarks
@@ -701,8 +702,8 @@ Permission701=Read donations
Permission702=Create/modify donations
Permission703=Delete donations
Permission1001=Read stocks
-Permission1002=Create/modify stocks
-Permission1003=Delete stocks
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=Read stock movements
Permission1005=Create/modify stock movements
Permission1101=Read delivery orders
@@ -739,10 +740,10 @@ Permission2403=Delete actions (events or tasks) linked to his account
Permission2411=Read actions (events or tasks) of others
Permission2412=Create/modify actions (events or tasks) of others
Permission2413=Delete actions (events or tasks) of others
-Permission2501=Read/Download documents
-Permission2502=Download documents
-Permission2503=Submit or delete documents
-Permission2515=Setup documents directories
+Permission2501=Dokumentuak ikusi/jaitsi
+Permission2502=Dokumentuak jaitsi
+Permission2503=Dokumentuak bidali edo ezabatzea
+Permission2515=Dokumentuen karpetak konfiguratzea
Permission2801=Use FTP client in read mode (browse and download only)
Permission2802=Use FTP client in write mode (delete or upload files)
Permission50101=Use Point of sales
@@ -782,7 +783,7 @@ SetupSaved=Setup saved
BackToModuleList=Back to modules list
BackToDictionaryList=Back to dictionaries list
VATReceivedOnly=Special rate not charged
-VATManagement=VAT Management
+VATManagement=BEZ-a kudeatzea
VATIsUsedDesc=The VAT rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If the seller is not subjected to VAT, then VAT by default=0. End of rule.<br>If the (selling country= buying country), then the VAT by default=VAT of the product in the selling country. End of rule. <br>If seller and buyer in the European Community and goods are transport products (car, ship, plane), the default VAT=0 ( The VAT should be paid by the buyer at the customoffice of his country and not at the seller). End of rule.<br>If seller and buyer in the European Community and buyer is not a company, then the VAT by default=VAT of product sold. End of rule.<br>If seller and buyer in the European Community and buyer is a company, then the VAT by default=0. End of rule.<br>Else the proposed default VAT=0. End of rule.
VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies.
VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared.
@@ -1038,7 +1039,6 @@ YesInSummer=Yes in summer
OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
SuhosinSessionEncrypt=Session storage encrypted by Suhosin
ConditionIsCurrently=Condition is currently %s
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
YouUseBestDriver=You use driver %s that is best driver available currently.
YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by
ModuleCompanyCodePanicum=Return an empty accountancy code.
ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
UseNotifications=Use notifications
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events, to third parties (customers or suppliers) that are configured to. Choice of active notification and targets contacts is made one third party at time.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
ModelModules=Documents templates
DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
WatermarkOnDraft=Watermark on draft document
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=Add delivery date ability
UseOptionLineIfNoQuantity=A line of product/service with a zero amount is considered as an option
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list
ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order
FreeLegalTextOnOrders=Free text on orders
WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
##### Clicktodial #####
ClickToDialSetup=Click To Dial module setup
ClickToDialUrlDesc=Url called when a click on phone picto is done. In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
@@ -1158,25 +1160,25 @@ FicheinterNumberingModules=Intervention numbering models
TemplatePDFInterventions=Intervention card documents models
WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
##### Contracts #####
-ContractsSetup=Contracts module setup
-ContractsNumberingModules=Contracts numbering modules
+ContractsSetup=Contracts/Subscriptions module setup
+ContractsNumberingModules=Kontratuak zenbakitzeko moduluak
TemplatePDFContracts=Contracts documents models
FreeLegalTextOnContracts=Free text on contracts
WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
##### Members #####
-MembersSetup=Members module setup
-MemberMainOptions=Main options
+MembersSetup=Kideak moduluaren konfigurazioa
+MemberMainOptions=Aukera nagusiak
AddSubscriptionIntoAccount=Suggest by default to create a bank transaction, in bank module, when adding a new payed subscription
-AdherentLoginRequired= Manage a Login for each member
-AdherentMailRequired=EMail required to create a new member
+AdherentLoginRequired= Kide bakoitzarentzat Sarrera bat kudeatu
+AdherentMailRequired=Kide berria sortzeko e-posta beharrezkoa da
MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
##### LDAP setup #####
-LDAPSetup=LDAP Setup
-LDAPGlobalParameters=Global parameters
-LDAPUsersSynchro=Users
-LDAPGroupsSynchro=Groups
-LDAPContactsSynchro=Contacts
-LDAPMembersSynchro=Members
+LDAPSetup=LDAP konfigurazioa
+LDAPGlobalParameters=Parametro orokorrak
+LDAPUsersSynchro=Erabiltzaileak
+LDAPGroupsSynchro=Taldeak
+LDAPContactsSynchro=Kontratuak
+LDAPMembersSynchro=Kideak
LDAPSynchronization=LDAP synchronisation
LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
LDAPToDolibarr=LDAP -> Dolibarr
@@ -1283,13 +1285,13 @@ LDAPFieldTown=Town
LDAPFieldTownExample=Example : l
LDAPFieldCountry=Country
LDAPFieldCountryExample=Example : c
-LDAPFieldDescription=Description
-LDAPFieldDescriptionExample=Example : description
+LDAPFieldDescription=Deskribapena
+LDAPFieldDescriptionExample=Adibidea : deskribapena
LDAPFieldGroupMembers= Group members
LDAPFieldGroupMembersExample= Example : uniqueMember
-LDAPFieldBirthdate=Birthdate
-LDAPFieldBirthdateExample=Example :
-LDAPFieldCompany=Company
+LDAPFieldBirthdate=Jaiotze-data
+LDAPFieldBirthdateExample=Adibidea :
+LDAPFieldCompany=Erakundea
LDAPFieldCompanyExample=Example : o
LDAPFieldSid=SID
LDAPFieldSidExample=Example : objectsid
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
CacheByServer=Cache by server
CacheByClient=Cache by browser
CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=Products module setup
ServiceSetup=Services module setup
@@ -1344,12 +1346,12 @@ SyslogSetup=Logs module setup
SyslogOutput=Logs outputs
SyslogSyslog=Syslog
SyslogFacility=Facility
-SyslogLevel=Level
-SyslogSimpleFile=File
-SyslogFilename=File name and path
+SyslogLevel=Maila
+SyslogSimpleFile=Fitxategia
+SyslogFilename=Fitxategiaren izena eta kokapena
YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
-ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+ErrorUnknownSyslogConstant=%s konstantea ez da Syslog-eko konstante ezaguna
+OnlyWindowsLOG_USER=Windows-ek LOG_USER soilik jasaten du
##### Donations #####
DonationsSetup=Donation module setup
DonationsReceiptModel=Template of donation receipt
@@ -1361,30 +1363,31 @@ UseBarcodeInProductModule=Use bar codes for products
CodeBarGenerator=Barcode generator
ChooseABarCode=No generator defined
FormatNotSupportedByGenerator=Format not supported by this generator
-BarcodeDescEAN8=Barcode of type EAN8
-BarcodeDescEAN13=Barcode of type EAN13
-BarcodeDescUPC=Barcode of type UPC
-BarcodeDescISBN=Barcode of type ISBN
-BarcodeDescC39=Barcode of type C39
-BarcodeDescC128=Barcode of type C128
+BarcodeDescEAN8=EAN8 motako barra-kodea
+BarcodeDescEAN13=EAN13 motako barra-kodea
+BarcodeDescUPC=UPC motako barra-kodea
+BarcodeDescISBN=ISBN motako barra-kodea
+BarcodeDescC39=C39 motako barra-kodea
+BarcodeDescC128=C128 motako barra-kodea
GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types)
-BarcodeInternalEngine=Internal engine
+BarcodeInternalEngine=Barne-eragilea
BarCodeNumberManager=Manager to auto define barcode numbers
##### Prelevements #####
WithdrawalsSetup=Withdrawal module setup
##### ExternalRSS #####
ExternalRSSSetup=External RSS imports setup
-NewRSS=New RSS Feed
+NewRSS=RSS kanal berria
RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
+RSSUrlExample=RSS kanal interesgarri bat
##### Mailing #####
-MailingSetup=EMailing module setup
+MailingSetup=EMailing moduluaren konfigurazioa
MailingEMailFrom=Sender EMail (From) for emails sent by emailing module
MailingEMailError=Return EMail (Errors-to) for emails with errors
##### Notification #####
-NotificationSetup=Notification bu email module setup
+NotificationSetup=EMail notification module setup
NotificationEMailFrom=Sender EMail (From) for emails sent for notifications
-ListOfAvailableNotifications=List of available notifications (This list depends on activated modules)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
##### Sendings #####
SendingsSetup=Sending module setup
SendingsReceiptModel=Sending receipt model
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe
OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
##### Stock #####
-StockSetup=Configuration module stock
-UserWarehouse=Use user personal stocks
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=Menu deleted
TreeMenu=Tree menus
@@ -1478,11 +1482,14 @@ ClickToDialDesc=This module allows to add an icon after phone numbers. A click o
##### Point Of Sales (CashDesk) #####
CashDesk=Point of sales
CashDeskSetup=Point of sales module setup
-CashDeskThirdPartyForSell=Generic third party to use for sells
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Default account to use to receive cash payments
CashDeskBankAccountForCheque= Default account to use to receive payments by cheque
CashDeskBankAccountForCB= Default account to use to receive payments by credit cards
-CashDeskIdWareHouse=Warehouse to use for sells
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Bookmark module setup
BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Delete fiscal year
ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
Opened=Opened
Closed=Closed
-
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
diff --git a/htdocs/langs/eu_ES/agenda.lang b/htdocs/langs/eu_ES/agenda.lang
index 9b3efc07dabbe9581725281613818cea48764551..1ed4e637d146d23c70eb1cad90469a4841a9678d 100644
--- a/htdocs/langs/eu_ES/agenda.lang
+++ b/htdocs/langs/eu_ES/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= Automatic filling
AgendaAutoActionDesc= Define here events for which you want Dolibarr to create automatically an event in agenda. If nothing is checked (by default), only manual actions will be included in agenda.
AgendaSetupOtherDesc= This page provides options to allow export of your Dolibarr events into an external calendar (thunderbird, google calendar, ...)
AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda.
-ActionsEvents= Events for which Dolibarr will create an action in agenda automatically
-PropalValidatedInDolibarr= Proposal %s validated
-InvoiceValidatedInDolibarr= Invoice %s validated
+ActionsEvents=Events for which Dolibarr will create an action in agenda automatically
+PropalValidatedInDolibarr=Proposal %s validated
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
InvoiceDeleteDolibarr=Invoice %s deleted
OrderValidatedInDolibarr= Order %s validated
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Order %s approved
OrderRefusedInDolibarr=Order %s refused
OrderBackToDraftInDolibarr=Order %s go back to draft status
OrderCanceledInDolibarr=Order %s canceled
-InterventionValidatedInDolibarr=Intervention %s validated
ProposalSentByEMail=Commercial proposal %s sent by EMail
OrderSentByEMail=Customer order %s sent by EMail
InvoiceSentByEMail=Customer invoice %s sent by EMail
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=Supplier order %s sent by EMail
SupplierInvoiceSentByEMail=Supplier invoice %s sent by EMail
ShippingSentByEMail=Shipping %s sent by EMail
ShippingValidated= Shipping %s validated
-InterventionSentByEMail=Intervention %s sent by EMail
-InterventionClassifiedBilled=Intervention %s classified as Billed
NewCompanyToDolibarr= Third party created
DateActionPlannedStart= Planned start date
DateActionPlannedEnd= Planned end date
@@ -70,9 +68,9 @@ DateActionStart= Start date
DateActionEnd= End date
AgendaUrlOptions1=You can also add following parameters to filter output:
AgendaUrlOptions2=<b>login=%s</b> to restrict output to actions created by, assigned to or done by user <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions created by user <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> to restrict output to actions done by user <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
AgendaShowBirthdayEvents=Show birthday's contacts
AgendaHideBirthdayEvents=Hide birthday's contacts
Busy=Busy
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=URL to access .ical file
ExtSiteNoLabel=No Description
WorkingTimeRange=Working time range
WorkingDaysRange=Working days range
-AddEvent=Add event
+AddEvent=Create event
MyAvailability=My availability
diff --git a/htdocs/langs/eu_ES/bills.lang b/htdocs/langs/eu_ES/bills.lang
index 1edd72130768502f868a057917ba530eeb280671..81b7515a8b8c3c3aa8a2d9e46e3fe9ccad263f59 100644
--- a/htdocs/langs/eu_ES/bills.lang
+++ b/htdocs/langs/eu_ES/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Credit note
InvoiceAvoirAsk=Credit note to correct invoice
InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example).
invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
-invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
ReplaceInvoice=Replace invoice %s
ReplacementInvoice=Replacement invoice
ReplacedByInvoice=Replaced by invoice %s
@@ -87,7 +87,7 @@ ClassifyCanceled=Classify 'Abandoned'
ClassifyClosed=Classify 'Closed'
ClassifyUnBilled=Classify 'Unbilled'
CreateBill=Create Invoice
-AddBill=Add invoice or credit note
+AddBill=Create invoice or credit note
AddToDraftInvoices=Add to draft invoice
DeleteBill=Delete invoice
SearchACustomerInvoice=Search for a customer invoice
@@ -99,7 +99,7 @@ DoPaymentBack=Do payment back
ConvertToReduc=Convert into future discount
EnterPaymentReceivedFromCustomer=Enter payment received from customer
EnterPaymentDueToCustomer=Make payment due to customer
-DisabledBecauseRemainderToPayIsZero=Disabled because remainder to pay is zero
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
Amount=Amount
PriceBase=Price base
BillStatus=Invoice status
@@ -137,8 +137,6 @@ BillFrom=From
BillTo=To
ActionsOnBill=Actions on invoice
NewBill=New invoice
-Prélèvements=Standing order
-Prélèvements=Standing order
LastBills=Last %s invoices
LastCustomersBills=Last %s customers invoices
LastSuppliersBills=Last %s suppliers invoices
@@ -156,9 +154,9 @@ ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b> ?
ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned' ?
ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid ?
ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice ?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
@@ -191,9 +189,9 @@ AlreadyPaid=Already paid
AlreadyPaidBack=Already paid back
AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposits)
Abandoned=Abandoned
-RemainderToPay=Remainder to pay
-RemainderToTake=Remainder to take
-RemainderToPayBack=Remainder to pay back
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
Rest=Pending
AmountExpected=Amount claimed
ExcessReceived=Excess received
@@ -219,19 +217,18 @@ NoInvoice=No invoice
ClassifyBill=Classify invoice
SupplierBillsToPay=Suppliers invoices to pay
CustomerBillsUnpaid=Unpaid customers invoices
-DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters
-DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=Non-recoverable
SetConditions=Set payment terms
SetMode=Set payment mode
Billed=Billed
-RepeatableInvoice=Pre-defined invoice
-RepeatableInvoices=Pre-defined invoices
-Repeatable=Pre-defined
-Repeatables=Pre-defined
-ChangeIntoRepeatableInvoice=Convert into pre-defined
-CreateRepeatableInvoice=Create pre-defined invoice
-CreateFromRepeatableInvoice=Create from pre-defined invoice
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines
CustomersInvoicesAndPayments=Customer invoices and payments
ExportDataset_invoice_1=Customer invoices list and invoice's lines
diff --git a/htdocs/langs/eu_ES/categories.lang b/htdocs/langs/eu_ES/categories.lang
index ed61bfc08a61b4e5bfdadecfe7f6a15298afc6e3..22914931db137a565a45daad16b9b04fbd08465b 100644
--- a/htdocs/langs/eu_ES/categories.lang
+++ b/htdocs/langs/eu_ES/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories
CatCusLinks=Links between customers/prospects and categories
CatProdLinks=Links between products/services and categories
CatMemberLinks=Links between members and categories
-CatProdLinks=Links between products/services and categories
-CatCusLinks=Links between customers/prospects and categories
-CatSupLinks=Links between suppliers and categories
DeleteFromCat=Remove from category
DeletePicture=Picture delete
ConfirmDeletePicture=Confirm picture deletion?
@@ -112,3 +109,4 @@ CategoriesSetup=Categories setup
CategorieRecursiv=Link with parent category automatically
CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category
diff --git a/htdocs/langs/eu_ES/compta.lang b/htdocs/langs/eu_ES/compta.lang
index 3929cfde0367b6f5d8dc7945385de4877d9e4759..9fe5eff520d881c617f38aa7d9db675ec18f118a 100644
--- a/htdocs/langs/eu_ES/compta.lang
+++ b/htdocs/langs/eu_ES/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s
SuppliersProductsSellSalesTurnover=The generated turnover by the sales of supplier's products.
CheckReceipt=Check deposit
CheckReceiptShort=Check deposit
+LastCheckReceiptShort=Last %s check receipts
NewCheckReceipt=New discount
NewCheckDeposit=New check deposit
NewCheckDepositOn=Create receipt for deposit on account: %s
diff --git a/htdocs/langs/eu_ES/contracts.lang b/htdocs/langs/eu_ES/contracts.lang
index e5ad112b222db93bedf8e6ded250a39d062215c6..511516dc755e4f3aba2d67e91238426896629cbd 100644
--- a/htdocs/langs/eu_ES/contracts.lang
+++ b/htdocs/langs/eu_ES/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Contracts area
ListOfContracts=List of contracts
-LastContracts=Last %s modified contracts
+LastModifiedContracts=Last %s modified contracts
AllContracts=All contracts
ContractCard=Contract card
ContractStatus=Contract status
@@ -27,7 +27,7 @@ MenuRunningServices=Running services
MenuExpiredServices=Expired services
MenuClosedServices=Closed services
NewContract=New contract
-AddContract=Add contract
+AddContract=Create contract
SearchAContract=Search a contract
DeleteAContract=Delete a contract
CloseAContract=Close a contract
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines
ListOfRunningServices=List of running services
NotActivatedServices=Inactive services (among validated contracts)
BoardNotActivatedServices=Services to activate among validated contracts
-LastContracts=Last %s modified contracts
+LastContracts=Last % contracts
LastActivatedServices=Last %s activated services
LastModifiedServices=Last %s modified services
EditServiceLine=Edit service line
diff --git a/htdocs/langs/eu_ES/cron.lang b/htdocs/langs/eu_ES/cron.lang
index 1be23d72ca326eec0911d33ce575292516014918..195ad43c87c41ae0938fa27745ba14209fbac724 100644
--- a/htdocs/langs/eu_ES/cron.lang
+++ b/htdocs/langs/eu_ES/cron.lang
@@ -1,114 +1,86 @@
# Dolibarr language file - Source file is en_US - cron
-#
# About page
-#
-# About = About
-# CronAbout = About Cron
-# CronAboutPage = Cron about page
-
-#
+About = About
+CronAbout = About Cron
+CronAboutPage = Cron about page
# Right
-#
-# Permission23101 = Read Scheduled task
-# Permission23102 = Create/update Scheduled task
-# Permission23103 = Delete Scheduled task
-# Permission23104 = Execute Scheduled task
-
-#
+Permission23101 = Read Scheduled task
+Permission23102 = Create/update Scheduled task
+Permission23103 = Delete Scheduled task
+Permission23104 = Execute Scheduled task
# Admin
-#
-# CronSetup= Scheduled job management setup
-# URLToLaunchCronJobs=URL to check and launch cron jobs if required
-# OrToLaunchASpecificJob=Or to check and launch a specific job
-# KeyForCronAccess=Security key for URL to launch cron jobs
-# FileToLaunchCronJobs=Command line to launch cron jobs
-# CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes
-# CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
-
-
-#
+CronSetup= Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch cron jobs if required
+OrToLaunchASpecificJob=Or to check and launch a specific job
+KeyForCronAccess=Security key for URL to launch cron jobs
+FileToLaunchCronJobs=Command line to launch cron jobs
+CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
# Menu
-#
-# CronJobs=Scheduled jobs
-# CronListActive= List of active jobs
-# CronListInactive= List of disabled jobs
-# CronListActive= List of active jobs
-
-
-#
+CronJobs=Scheduled jobs
+CronListActive=List of active/scheduled jobs
+CronListInactive=List of disabled jobs
# Page list
-#
-# CronDateLastRun=Last run
-# CronLastOutput=Last run output
-# CronLastResult=Last result code
-# CronListOfCronJobs=List of scheduled jobs
-# CronCommand=Command
-# CronList=Jobs list
-# CronDelete= Delete cron jobs
-# CronConfirmDelete= Are you sure you want to delete this cron job ?
-# CronExecute=Launch job
-# CronConfirmExecute= Are you sure to execute this job now
-# CronInfo= Jobs allow to execute task that have been planned
-# CronWaitingJobs=Wainting jobs
-# CronTask=Job
-# CronNone= None
-# CronDtStart=Start date
-# CronDtEnd=End date
-# CronDtNextLaunch=Next execution
-# CronDtLastLaunch=Last execution
-# CronFrequency=Frequancy
-# CronClass=Classe
-# CronMethod=Method
-# CronModule=Module
-# CronAction=Action
-# CronStatus=Status
-# CronStatusActive=Enabled
-# CronStatusInactive=Disabled
-# CronNoJobs=No jobs registered
-# CronPriority=Priority
-# CronLabel=Description
-# CronNbRun=Nb. launch
-# CronEach=Every
-# JobFinished=Job launched and finished
-
-#
+CronDateLastRun=Last run
+CronLastOutput=Last run output
+CronLastResult=Last result code
+CronListOfCronJobs=List of scheduled jobs
+CronCommand=Command
+CronList=Jobs list
+CronDelete= Delete cron jobs
+CronConfirmDelete= Are you sure you want to delete this cron job ?
+CronExecute=Launch job
+CronConfirmExecute= Are you sure to execute this job now
+CronInfo= Jobs allow to execute task that have been planned
+CronWaitingJobs=Wainting jobs
+CronTask=Job
+CronNone= None
+CronDtStart=Start date
+CronDtEnd=End date
+CronDtNextLaunch=Next execution
+CronDtLastLaunch=Last execution
+CronFrequency=Frequancy
+CronClass=Classe
+CronMethod=Method
+CronModule=Module
+CronAction=Action
+CronStatus=Status
+CronStatusActive=Enabled
+CronStatusInactive=Disabled
+CronNoJobs=No jobs registered
+CronPriority=Priority
+CronLabel=Description
+CronNbRun=Nb. launch
+CronEach=Every
+JobFinished=Job launched and finished
#Page card
-#
-# CronAdd= Add jobs
-# CronHourStart= Start Hour and date of task
-# CronEvery= And execute task each
-# CronObject= Instance/Object to create
-# CronArgs=Parameters
-# CronSaveSucess=Save succesfully
-# CronNote=Comment
-# CronFieldMandatory=Fields %s is mandatory
-# CronErrEndDateStartDt=End date cannot be before start date
-# CronStatusActiveBtn=Enable
-# CronStatusInactiveBtn=Disable
-# CronTaskInactive=This job is disabled
-# CronDtLastResult=Last result date
-# CronId=Id
-# CronClassFile=Classes (filename.class.php)
-# CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-# CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-# CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-# CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is <i>fecth</i>
-# CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-# CronCommandHelp=The system command line to execute.
-
-#
+CronAdd= Add jobs
+CronHourStart= Start Hour and date of task
+CronEvery= And execute task each
+CronObject= Instance/Object to create
+CronArgs=Parameters
+CronSaveSucess=Save succesfully
+CronNote=Comment
+CronFieldMandatory=Fields %s is mandatory
+CronErrEndDateStartDt=End date cannot be before start date
+CronStatusActiveBtn=Enable
+CronStatusInactiveBtn=Disable
+CronTaskInactive=This job is disabled
+CronDtLastResult=Last result date
+CronId=Id
+CronClassFile=Classes (filename.class.php)
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
+CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronCommandHelp=The system command line to execute.
# Info
-#
-# CronInfoPage=Information
-
-
-#
+CronInfoPage=Information
# Common
-#
-# CronType=Task type
-# CronType_method=Call method of a Dolibarr Class
-# CronType_command=Shell command
-# CronMenu=Cron
-# CronCannotLoadClass=Cannot load class %s or object %s
-
-# UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+CronType=Task type
+CronType_method=Call method of a Dolibarr Class
+CronType_command=Shell command
+CronMenu=Cron
+CronCannotLoadClass=Cannot load class %s or object %s
+UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
diff --git a/htdocs/langs/eu_ES/donations.lang b/htdocs/langs/eu_ES/donations.lang
index 66ddea95a5c694d8044c40b7da05319d0b77a530..f7aed91cf81caf0e83e390519642ea1f199670c6 100644
--- a/htdocs/langs/eu_ES/donations.lang
+++ b/htdocs/langs/eu_ES/donations.lang
@@ -4,7 +4,7 @@ Donations=Donations
DonationRef=Donation ref.
Donor=Donor
Donors=Donors
-AddDonation=Add a donation
+AddDonation=Create a donation
NewDonation=New donation
ShowDonation=Show donation
DonationPromise=Gift promise
@@ -31,3 +31,8 @@ DonationRecipient=Donation recipient
ThankYou=Thank You
IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
MinimumAmount=Minimum amount is %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/eu_ES/externalsite.lang b/htdocs/langs/eu_ES/externalsite.lang
index b915c37a5ab8fe3beb5335f7f4ec501a12749c15..da4853df0df086e3040a294cec116c590f4c2e9e 100644
--- a/htdocs/langs/eu_ES/externalsite.lang
+++ b/htdocs/langs/eu_ES/externalsite.lang
@@ -1,4 +1,5 @@
# Dolibarr language file - Source file is en_US - externalsite
-# ExternalSiteSetup=Setup link to external website
-# ExternalSiteURL=External Site URL
-# ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExternalSiteSetup=Setup link to external website
+ExternalSiteURL=External Site URL
+ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/eu_ES/holiday.lang b/htdocs/langs/eu_ES/holiday.lang
index c25abf6449ca2cc97d5dba6340d1530b5ea9c675..f5b87fefb0878c40cc75768a1d1c4bcf4cb80c72 100644
--- a/htdocs/langs/eu_ES/holiday.lang
+++ b/htdocs/langs/eu_ES/holiday.lang
@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
CantCreateCP=You don't have the right to make leave requests.
InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=Update
CantUpdate=You cannot update this leave request.
NoDateDebut=You must select a start date.
NoDateFin=You must select an end date.
-ErrorDureeCP=Your request for holidays does not contain working day.
-TitleValidCP=Approve the request holidays
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
ConfirmValidCP=Are you sure you want to approve the leave request?
DateValidCP=Date approved
TitleToValidCP=Send leave request
ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the request holidays
+TitleRefuseCP=Refuse the leave request
ConfirmRefuseCP=Are you sure you want to refuse the leave request?
NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
+TitleCancelCP=Cancel the leave request
ConfirmCancelCP=Are you sure you want to cancel the leave request?
DetailRefusCP=Reason for refusal
DateRefusCP=Date of refusal
@@ -78,7 +77,7 @@ ActionByCP=Performed by
UserUpdateCP=For the user
PrevSoldeCP=Previous Balance
NewSoldeCP=New Balance
-alreadyCPexist=A request for holidays has already been done on this period.
+alreadyCPexist=A leave request has already been done on this period.
UserName=Name
Employee=Employee
FirstDayOfHoliday=First day of vacation
@@ -88,25 +87,25 @@ ManualUpdate=Manual update
HolidaysCancelation=Leave request cancelation
## Configuration du Module ##
-ConfCP=Configuration of holidays module
+ConfCP=Configuration of leave request module
DescOptionCP=Description of the option
ValueOptionCP=Value
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
UpdateConfCPOK=Updated successfully.
ErrorUpdateConfCP=An error occurred during the update, please try again.
-AddCPforUsers=Please add the balance of holidays of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
Module27130Name= Management of leave requests
Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
TitleOptionEventCP=Settings of leave requets for events
ValidEventCP=Validate
UpdateEventCP=Update events
diff --git a/htdocs/langs/eu_ES/interventions.lang b/htdocs/langs/eu_ES/interventions.lang
index 17641a0ab3e499b2f66a4b4ddd80c46d478ff702..c79da05364e615bb2b234ce4211a373fc94e9168 100644
--- a/htdocs/langs/eu_ES/interventions.lang
+++ b/htdocs/langs/eu_ES/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Intervention
Interventions=Interventions
InterventionCard=Intervention card
NewIntervention=New intervention
-AddIntervention=Add intervention
+AddIntervention=Create intervention
ListOfInterventions=List of interventions
EditIntervention=Edit intervention
ActionsOnFicheInter=Actions on intervention
@@ -30,6 +30,15 @@ StatusInterInvoiced=Billed
RelatedInterventions=Related interventions
ShowIntervention=Show intervention
SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention
TypeContact_fichinter_internal_INTERVENING=Intervening
diff --git a/htdocs/langs/eu_ES/mails.lang b/htdocs/langs/eu_ES/mails.lang
index 98e6dc335eeced95e230de5b5ca5b8f78fc59681..7a2111988228ab02739bad001958aa455eb9013c 100644
--- a/htdocs/langs/eu_ES/mails.lang
+++ b/htdocs/langs/eu_ES/mails.lang
@@ -115,7 +115,7 @@ SentBy=Sent by
MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=Clear list
ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
ToAddRecipientsChooseHere=Add recipients by choosing from the lists
@@ -133,6 +133,9 @@ Notifications=Notifications
NoNotificationsWillBeSent=No email notifications are planned for this event and company
ANotificationsWillBeSent=1 notification will be sent by email
SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification request
-ListOfActiveNotifications=List all active email notification requests
+AddNewNotification=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
ListOfNotificationsDone=List all email notifications sent
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang
index fb9c953174b4362f1fea3e4b25dac1f2bb3d85ba..d51879601be49acf3a57d9b0fc479c51d74d90a3 100644
--- a/htdocs/langs/eu_ES/main.lang
+++ b/htdocs/langs/eu_ES/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr
ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'.
ErrorFailedToSaveFile=Error, failed to save file.
-ErrorOnlyPngJpgSupported=Error, only .png and .jpg image format file are supported.
-ErrorImageFormatNotSupported=Your PHP does not support functions to convert images of this format.
SetDate=Set date
SelectDate=Select a date
SeeAlso=See also %s
BackgroundColorByDefault=Default background color
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
NbOfEntries=Nb of entries
GoToWikiHelpPage=Read online help (need Internet access)
@@ -266,6 +266,7 @@ Afternoon=Afternoon
Quadri=Quadri
MonthOfDay=Month of the day
HourShort=H
+MinuteShort=mn
Rate=Rate
UseLocalTax=Include tax
Bytes=Bytes
@@ -340,6 +341,7 @@ FullList=Full list
Statistics=Statistics
OtherStatistics=Other statistics
Status=Status
+Favorite=Favorite
ShortInfo=Info.
Ref=Ref.
RefSupplier=Ref. supplier
@@ -365,6 +367,7 @@ ActionsOnCompany=Events about this third party
ActionsOnMember=Events about this member
NActions=%s events
NActionsLate=%s late
+RequestAlreadyDone=Request already recorded
Filter=Filter
RemoveFilter=Remove filter
ChartGenerated=Chart generated
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Extra attributes setup
URLPhoto=URL of photo/logo
SetLinkToThirdParty=Link to another third party
CreateDraft=Create draft
+SetToDraft=Back to draft
ClickToEdit=Click to edit
ObjectDeleted=Object %s deleted
ByCountry=By country
@@ -678,7 +682,7 @@ ViewPrivateNote=View notes
XMoreLines=%s line(s) hidden
PublicUrl=Public URL
AddBox=Add box
-
+SelectElementAndClickRefresh=Select an element and click Refresh
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/langs/eu_ES/margins.lang b/htdocs/langs/eu_ES/margins.lang
index e8d5fed1af9a379298973a5c33a511cf77ea3706..606d5e5053a25855631a7d6ee61b6c392c1fe32c 100644
--- a/htdocs/langs/eu_ES/margins.lang
+++ b/htdocs/langs/eu_ES/margins.lang
@@ -10,24 +10,18 @@ MarkRate=Mark rate
DisplayMarginRates=Display margin rates
DisplayMarkRates=Display mark rates
InputPrice=Input price
-
margin=Profit margins management
margesSetup=Profit margins management setup
-
MarginDetails=Margin details
-
ProductMargins=Product margins
CustomerMargins=Customer margins
SalesRepresentativeMargins=Sales representative margins
-
ProductService=Product or Service
AllProducts=All products and services
ChooseProduct/Service=Choose product or service
-
StartDate=Start date
EndDate=End date
Launch=Start
-
ForceBuyingPriceIfNull=Force buying price if null
ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0)
MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
@@ -35,16 +29,16 @@ UseDiscountAsProduct=As a product
UseDiscountAsService=As a service
UseDiscountOnTotal=On subtotal
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
-
MARGIN_TYPE=Margin type
MargeBrute=Raw margin
MargeNette=Net margin
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - Cost price
-
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
Charges=Charges
-
AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/eu_ES/orders.lang b/htdocs/langs/eu_ES/orders.lang
index 42444f0ec1c52173f7e7c94b58792d7b03f11de4..6ee9c19fa95f45044b7466cc0fdcbf21819ef13a 100644
--- a/htdocs/langs/eu_ES/orders.lang
+++ b/htdocs/langs/eu_ES/orders.lang
@@ -1,168 +1,162 @@
# Dolibarr language file - Source file is en_US - orders
-# OrdersArea=Customers orders area
-# SuppliersOrdersArea=Suppliers orders area
-# OrderCard=Order card
-# OrderId=Order Id
-# Order=Order
-# Orders=Orders
-# OrderLine=Order line
-# OrderFollow=Follow up
-# OrderDate=Order date
-# OrderToProcess=Order to process
-# NewOrder=New order
-# ToOrder=Make order
-# MakeOrder=Make order
-# SupplierOrder=Supplier order
-# SuppliersOrders=Suppliers orders
-# SuppliersOrdersRunning=Current suppliers orders
-# CustomerOrder=Customer order
-# CustomersOrders=Customer's orders
-# CustomersOrdersRunning=Current customer's orders
-# CustomersOrdersAndOrdersLines=Customer orders and order's lines
-# OrdersToValid=Customer's orders to validate
-# OrdersToBill=Customer's orders delivered
-# OrdersInProcess=Customer's orders in process
-# OrdersToProcess=Customer's orders to process
-# SuppliersOrdersToProcess=Supplier's orders to process
-# StatusOrderCanceledShort=Canceled
-# StatusOrderDraftShort=Draft
-# StatusOrderValidatedShort=Validated
-# StatusOrderSentShort=In process
-# StatusOrderSent=Shipment in process
-# StatusOrderOnProcessShort=Reception
-# StatusOrderProcessedShort=Processed
-# StatusOrderToBillShort=Delivered
-# StatusOrderToBill2Short=To bill
-# StatusOrderApprovedShort=Approved
-# StatusOrderRefusedShort=Refused
-# StatusOrderToProcessShort=To process
-# StatusOrderReceivedPartiallyShort=Partially received
-# StatusOrderReceivedAllShort=Everything received
-# StatusOrderCanceled=Canceled
-# StatusOrderDraft=Draft (needs to be validated)
-# StatusOrderValidated=Validated
-# StatusOrderOnProcess=Waiting to receive
-# StatusOrderProcessed=Processed
-# StatusOrderToBill=Delivered
-# StatusOrderToBill2=To bill
-# StatusOrderApproved=Approved
-# StatusOrderRefused=Refused
-# StatusOrderReceivedPartially=Partially received
-# StatusOrderReceivedAll=Everything received
-# ShippingExist=A shipment exists
-# DraftOrWaitingApproved=Draft or approved not yet ordered
-# DraftOrWaitingShipped=Draft or validated not yet shipped
-# MenuOrdersToBill=Orders delivered
-# MenuOrdersToBill2=Orders to bill
-# SearchOrder=Search order
-# SearchACustomerOrder=Search a customer order
-# ShipProduct=Ship product
-# Discount=Discount
-# CreateOrder=Create Order
-# RefuseOrder=Refuse order
-# ApproveOrder=Accept order
-# ValidateOrder=Validate order
-# UnvalidateOrder=Unvalidate order
-# DeleteOrder=Delete order
-# CancelOrder=Cancel order
-# AddOrder=Add order
-# AddToMyOrders=Add to my orders
-# AddToOtherOrders=Add to other orders
-# AddToDraftOrders=Add to draft order
-# ShowOrder=Show order
-# NoOpenedOrders=No opened orders
-# NoOtherOpenedOrders=No other opened orders
-# NoDraftOrders=No draft orders
-# OtherOrders=Other orders
-# LastOrders=Last %s orders
-# LastModifiedOrders=Last %s modified orders
-# LastClosedOrders=Last %s closed orders
-# AllOrders=All orders
-# NbOfOrders=Number of orders
-# OrdersStatistics=Order's statistics
-# OrdersStatisticsSuppliers=Supplier order's statistics
-# NumberOfOrdersByMonth=Number of orders by month
-# AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
-# ListOfOrders=List of orders
-# CloseOrder=Close order
-# ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed.
-# ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done.
-# ConfirmDeleteOrder=Are you sure you want to delete this order ?
-# ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b> ?
-# ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> to draft status ?
-# ConfirmCancelOrder=Are you sure you want to cancel this order ?
-# ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b> ?
-# GenerateBill=Generate invoice
-# ClassifyShipped=Classify delivered
-# ClassifyBilled=Classify billed
-# ComptaCard=Accountancy card
-# DraftOrders=Draft orders
-# RelatedOrders=Related orders
-# OnProcessOrders=In process orders
-# RefOrder=Ref. order
-# RefCustomerOrder=Ref. customer order
-# CustomerOrder=Customer order
-# RefCustomerOrderShort=Ref. cust. order
-# SendOrderByMail=Send order by mail
-# ActionsOnOrder=Events on order
-# NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
-# OrderMode=Order method
-# AuthorRequest=Request author
-# UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address
-# RunningOrders=Orders on process
-# UserWithApproveOrderGrant=Users granted with "approve orders" permission.
-# PaymentOrderRef=Payment of order %s
-# CloneOrder=Clone order
-# ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b> ?
-# DispatchSupplierOrder=Receiving supplier order %s
+OrdersArea=Customers orders area
+SuppliersOrdersArea=Suppliers orders area
+OrderCard=Order card
+OrderId=Order Id
+Order=Order
+Orders=Orders
+OrderLine=Order line
+OrderFollow=Follow up
+OrderDate=Order date
+OrderToProcess=Order to process
+NewOrder=New order
+ToOrder=Make order
+MakeOrder=Make order
+SupplierOrder=Supplier order
+SuppliersOrders=Suppliers orders
+SuppliersOrdersRunning=Current suppliers orders
+CustomerOrder=Customer order
+CustomersOrders=Customer's orders
+CustomersOrdersRunning=Current customer's orders
+CustomersOrdersAndOrdersLines=Customer orders and order's lines
+OrdersToValid=Customer's orders to validate
+OrdersToBill=Customer's orders delivered
+OrdersInProcess=Customer's orders in process
+OrdersToProcess=Customer's orders to process
+SuppliersOrdersToProcess=Supplier's orders to process
+StatusOrderCanceledShort=Canceled
+StatusOrderDraftShort=Draft
+StatusOrderValidatedShort=Validated
+StatusOrderSentShort=In process
+StatusOrderSent=Shipment in process
+StatusOrderOnProcessShort=Reception
+StatusOrderProcessedShort=Processed
+StatusOrderToBillShort=Delivered
+StatusOrderToBill2Short=To bill
+StatusOrderApprovedShort=Approved
+StatusOrderRefusedShort=Refused
+StatusOrderToProcessShort=To process
+StatusOrderReceivedPartiallyShort=Partially received
+StatusOrderReceivedAllShort=Everything received
+StatusOrderCanceled=Canceled
+StatusOrderDraft=Draft (needs to be validated)
+StatusOrderValidated=Validated
+StatusOrderOnProcess=Waiting to receive
+StatusOrderProcessed=Processed
+StatusOrderToBill=Delivered
+StatusOrderToBill2=To bill
+StatusOrderApproved=Approved
+StatusOrderRefused=Refused
+StatusOrderReceivedPartially=Partially received
+StatusOrderReceivedAll=Everything received
+ShippingExist=A shipment exists
+DraftOrWaitingApproved=Draft or approved not yet ordered
+DraftOrWaitingShipped=Draft or validated not yet shipped
+MenuOrdersToBill=Orders delivered
+MenuOrdersToBill2=Billable orders
+SearchOrder=Search order
+SearchACustomerOrder=Search a customer order
+ShipProduct=Ship product
+Discount=Discount
+CreateOrder=Create Order
+RefuseOrder=Refuse order
+ApproveOrder=Accept order
+ValidateOrder=Validate order
+UnvalidateOrder=Unvalidate order
+DeleteOrder=Delete order
+CancelOrder=Cancel order
+AddOrder=Create order
+AddToMyOrders=Add to my orders
+AddToOtherOrders=Add to other orders
+AddToDraftOrders=Add to draft order
+ShowOrder=Show order
+NoOpenedOrders=No opened orders
+NoOtherOpenedOrders=No other opened orders
+NoDraftOrders=No draft orders
+OtherOrders=Other orders
+LastOrders=Last %s orders
+LastModifiedOrders=Last %s modified orders
+LastClosedOrders=Last %s closed orders
+AllOrders=All orders
+NbOfOrders=Number of orders
+OrdersStatistics=Order's statistics
+OrdersStatisticsSuppliers=Supplier order's statistics
+NumberOfOrdersByMonth=Number of orders by month
+AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
+ListOfOrders=List of orders
+CloseOrder=Close order
+ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed.
+ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done.
+ConfirmDeleteOrder=Are you sure you want to delete this order ?
+ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b> ?
+ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> to draft status ?
+ConfirmCancelOrder=Are you sure you want to cancel this order ?
+ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b> ?
+GenerateBill=Generate invoice
+ClassifyShipped=Classify delivered
+ClassifyBilled=Classify billed
+ComptaCard=Accountancy card
+DraftOrders=Draft orders
+RelatedOrders=Related orders
+OnProcessOrders=In process orders
+RefOrder=Ref. order
+RefCustomerOrder=Ref. customer order
+RefCustomerOrderShort=Ref. cust. order
+SendOrderByMail=Send order by mail
+ActionsOnOrder=Events on order
+NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
+OrderMode=Order method
+AuthorRequest=Request author
+UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address
+RunningOrders=Orders on process
+UserWithApproveOrderGrant=Users granted with "approve orders" permission.
+PaymentOrderRef=Payment of order %s
+CloneOrder=Clone order
+ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b> ?
+DispatchSupplierOrder=Receiving supplier order %s
##### Types de contacts #####
-# TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
-# TypeContact_commande_internal_SHIPPING=Representative following-up shipping
-# TypeContact_commande_external_BILLING=Customer invoice contact
-# TypeContact_commande_external_SHIPPING=Customer shipping contact
-# TypeContact_commande_external_CUSTOMER=Customer contact following-up order
-# TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order
-# TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
-# TypeContact_order_supplier_external_BILLING=Supplier invoice contact
-# TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact
-# TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order
-
-# Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
-# Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
-# Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s'
-# Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s'
-# Error_OrderNotChecked=No orders to invoice selected
-
+TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
+TypeContact_commande_internal_SHIPPING=Representative following-up shipping
+TypeContact_commande_external_BILLING=Customer invoice contact
+TypeContact_commande_external_SHIPPING=Customer shipping contact
+TypeContact_commande_external_CUSTOMER=Customer contact following-up order
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order
+TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
+TypeContact_order_supplier_external_BILLING=Supplier invoice contact
+TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order
+Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
+Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
+Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s'
+Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s'
+Error_OrderNotChecked=No orders to invoice selected
# Sources
-# OrderSource0=Commercial proposal
-# OrderSource1=Internet
-# OrderSource2=Mail campaign
-# OrderSource3=Phone compaign
-# OrderSource4=Fax campaign
-# OrderSource5=Commercial
-# OrderSource6=Store
-# QtyOrdered=Qty ordered
-# AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order
-
+OrderSource0=Commercial proposal
+OrderSource1=Internet
+OrderSource2=Mail campaign
+OrderSource3=Phone compaign
+OrderSource4=Fax campaign
+OrderSource5=Commercial
+OrderSource6=Store
+QtyOrdered=Qty ordered
+AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order
# Documents models
-# PDFEinsteinDescription=A complete order model (logo...)
-# PDFEdisonDescription=A simple order model
-# PDFProformaDescription=A complete proforma invoice (logo…)
+PDFEinsteinDescription=A complete order model (logo...)
+PDFEdisonDescription=A simple order model
+PDFProformaDescription=A complete proforma invoice (logo…)
# Orders modes
-# OrderByMail=Mail
-# OrderByFax=Fax
-# OrderByEMail=EMail
-# OrderByWWW=Online
-# OrderByPhone=Phone
-
-# CreateInvoiceForThisCustomer=Bill orders
-# NoOrdersToInvoice=No orders billable
-# CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-# MenuOrdersToBill2=Orders to bill
-# OrderCreation=Order creation
-# Ordered=Ordered
-# OrderCreated=Your orders have been created
-# OrderFail=An error happened during your orders creation
-# CreateOrders=Create orders
-# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+OrderByMail=Mail
+OrderByFax=Fax
+OrderByEMail=EMail
+OrderByWWW=Online
+OrderByPhone=Phone
+CreateInvoiceForThisCustomer=Bill orders
+NoOrdersToInvoice=No orders billable
+CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
+OrderCreation=Order creation
+Ordered=Ordered
+OrderCreated=Your orders have been created
+OrderFail=An error happened during your orders creation
+CreateOrders=Create orders
+ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
diff --git a/htdocs/langs/eu_ES/oscommerce.lang b/htdocs/langs/eu_ES/oscommerce.lang
deleted file mode 100644
index 42a4a4551b6d42c92c114d1593dbc0f4f53ae4b3..0000000000000000000000000000000000000000
--- a/htdocs/langs/eu_ES/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-# OSCommerce=OS Commerce
-# OSCommerceSetup=OS Commerce module setup
-# OSCommerceSetupSaved=OS Commerce setup saved
-# OSCommerceServer=OS Commerce server host/ip
-# OSCommerceDatabaseName=OS Commerce database name
-# OSCommercePrefix=OS Commerce tables prefix
-# OSCommerceUser=OS Commerce database login
diff --git a/htdocs/langs/eu_ES/other.lang b/htdocs/langs/eu_ES/other.lang
index b56ef2944951b7c0d44d285b1e7a02ad6077a579..889918881838dcbc59b7a031b8af656cec175167 100644
--- a/htdocs/langs/eu_ES/other.lang
+++ b/htdocs/langs/eu_ES/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=Security code
Calendar=Calendar
-AddTrip=Add trip
Tools=Tools
ToolsDesc=This area is dedicated to group miscellaneous tools not available into other menu entries.<br><br>Those tools can be reached from menu on the side.
Birthday=Birthday
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation
Notify_TASK_CREATE=Task created
Notify_TASK_MODIFY=Task modified
Notify_TASK_DELETE=Task deleted
+SeeModuleSetup=See module setup
NbOfAttachedFiles=Number of attached files/documents
TotalSizeOfAttachedFiles=Total size of attached files/documents
MaxSize=Maximum size
@@ -80,6 +80,16 @@ ModifiedBy=Modified by %s
ValidatedBy=Validated by %s
CanceledBy=Canceled by %s
ClosedBy=Closed by %s
+CreatedById=User id who created
+ModifiedById=User id who made last change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made last change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
FileWasRemoved=File %s was removed
DirWasRemoved=Directory %s was removed
FeatureNotYetAvailableShort=Available in a next version
@@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your
##### Calendar common #####
AddCalendarEntry=Add entry in calendar %s
-NewCompanyToDolibarr=Company %s added into Dolibarr
-ContractValidatedInDolibarr=Contract %s validated in Dolibarr
-ContractCanceledInDolibarr=Contract %s canceled in Dolibarr
-ContractClosedInDolibarr=Contract %s closed in Dolibarr
-PropalClosedSignedInDolibarr=Proposal %s signed in Dolibarr
-PropalClosedRefusedInDolibarr=Proposal %s refused in Dolibarr
-PropalValidatedInDolibarr=Proposal %s validated in Dolibarr
-InvoiceValidatedInDolibarr=Invoice %s validated in Dolibarr
-InvoicePaidInDolibarr=Invoice %s changed to paid in Dolibarr
-InvoiceCanceledInDolibarr=Invoice %s canceled in Dolibarr
-PaymentDoneInDolibarr=Payment %s done in Dolibarr
-CustomerPaymentDoneInDolibarr=Customer payment %s done in Dolibarr
-SupplierPaymentDoneInDolibarr=Supplier payment %s done in Dolibarr
-MemberValidatedInDolibarr=Member %s validated in Dolibarr
-MemberResiliatedInDolibarr=Member %s resiliated in Dolibarr
-MemberDeletedInDolibarr=Member %s deleted from Dolibarr
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added in Dolibarr
-ShipmentValidatedInDolibarr=Shipment %s validated in Dolibarr
-ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
##### Export #####
Export=Export
ExportsArea=Exports area
diff --git a/htdocs/langs/eu_ES/paybox.lang b/htdocs/langs/eu_ES/paybox.lang
index b689bb6cebff21b067564cffd144aa4a6aaa2e98..aced32a49440a9ff7a1b1e0279522ff49cec7821 100644
--- a/htdocs/langs/eu_ES/paybox.lang
+++ b/htdocs/langs/eu_ES/paybox.lang
@@ -1,37 +1,40 @@
# Dolibarr language file - Source file is en_US - paybox
-# PayBoxSetup=PayBox module setup
-# PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
-# FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
-# PaymentForm=Payment form
-# WelcomeOnPaymentPage=Welcome on our online payment service
-# ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
-# ThisIsInformationOnPayment=This is information on payment to do
-# ToComplete=To complete
-# YourEMail=Email to receive payment confirmation
-# Creditor=Creditor
-# PaymentCode=Payment code
-# PayBoxDoPayment=Go on payment
-# YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
-# PleaseBePatient=Please, be patient
-# Continue=Next
-# ToOfferALinkForOnlinePayment=URL for %s payment
-# ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
-# ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
-# ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
-# ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
-# ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
-# YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
-# SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> to have payment created automatically when validated by paybox.
-# YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-# YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
-# AccountParameter=Account parameters
-# UsageParameter=Usage parameters
-# InformationToFindParameters=Help to find your %s account information
-# PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment
-# VendorName=Name of vendor
-# CSSUrlForPaymentForm=CSS style sheet url for payment form
-# MessageOK=Message on validated payment return page
-# MessageKO=Message on canceled payment return page
-# NewPayboxPaymentReceived=New Paybox payment received
-# NewPayboxPaymentFailed=New Paybox payment tried but failed
-# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PayBoxSetup=PayBox module setup
+PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
+FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
+PaymentForm=Payment form
+WelcomeOnPaymentPage=Welcome on our online payment service
+ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
+ThisIsInformationOnPayment=This is information on payment to do
+ToComplete=To complete
+YourEMail=Email to receive payment confirmation
+Creditor=Creditor
+PaymentCode=Payment code
+PayBoxDoPayment=Go on payment
+YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
+PleaseBePatient=Please, be patient
+Continue=Next
+ToOfferALinkForOnlinePayment=URL for %s payment
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
+ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
+YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> to have payment created automatically when validated by paybox.
+YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
+YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
+AccountParameter=Account parameters
+UsageParameter=Usage parameters
+InformationToFindParameters=Help to find your %s account information
+PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment
+VendorName=Name of vendor
+CSSUrlForPaymentForm=CSS style sheet url for payment form
+MessageOK=Message on validated payment return page
+MessageKO=Message on canceled payment return page
+NewPayboxPaymentReceived=New Paybox payment received
+NewPayboxPaymentFailed=New Paybox payment tried but failed
+PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/eu_ES/resource.lang b/htdocs/langs/eu_ES/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..d64075dfbf595897a63e3eebf19194d8f71030dd
--- /dev/null
+++ b/htdocs/langs/eu_ES/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
diff --git a/htdocs/langs/eu_ES/sendings.lang b/htdocs/langs/eu_ES/sendings.lang
index 2ae43f3976607147c1e8fc3a41898f572cee9868..f6111bac6841189e50c3c7fb9028962b56e3997e 100644
--- a/htdocs/langs/eu_ES/sendings.lang
+++ b/htdocs/langs/eu_ES/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is do
RelatedShippings=Related shippings
ShipmentLine=Shipment line
CarrierList=List of transporters
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
# Sending methods
SendingMethodCATCH=Catch by customer
diff --git a/htdocs/langs/eu_ES/stocks.lang b/htdocs/langs/eu_ES/stocks.lang
index 5d11b0fd7a0992284856369a2d4b919e56a34453..06c502504e9f19219ba028be8d02fbb55e5f0697 100644
--- a/htdocs/langs/eu_ES/stocks.lang
+++ b/htdocs/langs/eu_ES/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Warehouse label is required
CorrectStock=Correct stock
ListOfWarehouses=List of warehouses
ListOfStockMovements=List of stock movements
-StocksArea=Stocks area
+StocksArea=Warehouses area
Location=Location
LocationSummary=Short name location
NumberOfDifferentProducts=Number of different products
diff --git a/htdocs/langs/eu_ES/users.lang b/htdocs/langs/eu_ES/users.lang
index 0afaab6ad7f7ca7de787d1bad2656917763a3f45..baf209f9d1c7ff7527f6f0237519cac6f683a9e3 100644
--- a/htdocs/langs/eu_ES/users.lang
+++ b/htdocs/langs/eu_ES/users.lang
@@ -63,7 +63,6 @@ ShowGroup=Show group
ShowUser=Show user
NonAffectedUsers=Non assigned users
UserModified=User modified successfully
-GroupModified=Group modified successfully
PhotoFile=Photo file
UserWithDolibarrAccess=User with Dolibarr access
ListOfUsersInGroup=List of users in this group
@@ -103,7 +102,7 @@ UserDisabled=User %s disabled
UserEnabled=User %s activated
UserDeleted=User %s removed
NewGroupCreated=Group %s created
-GroupModified=Group modified successfully
+GroupModified=Group %s modified
GroupDeleted=Group %s removed
ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact ?
ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member ?
@@ -114,8 +113,10 @@ YourRole=Your roles
YourQuotaOfUsersIsReached=Your quota of active users is reached !
NbOfUsers=Nb of users
DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
-HierarchicalResponsible=Hierarchical responsible
+HierarchicalResponsible=Supervisor
HierarchicView=Hierarchical view
UseTypeFieldToChange=Use field Type to change
OpenIDURL=OpenID URL
LoginUsingOpenID=Use OpenID to login
+WeeklyHours=Weekly hours
+ColorUser=Color of the user
diff --git a/htdocs/langs/eu_ES/withdrawals.lang b/htdocs/langs/eu_ES/withdrawals.lang
index 58ac3e252ec59d67ff8d71c394b4c44265bc3add..e433730908416bbfa32c181a580b9e2e7e34717c 100644
--- a/htdocs/langs/eu_ES/withdrawals.lang
+++ b/htdocs/langs/eu_ES/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=Receipt
LastWithdrawalReceipts=Last %s withdrawal receipts
WithdrawedBills=Withdrawn invoices
WithdrawalsLines=Withdrawal lines
-RequestStandingOrderToTreat=Request for standing orders to treat
-RequestStandingOrderTreated=Request for standing orders treated
+RequestStandingOrderToTreat=Request for standing orders to process
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=Customer standing orders
CustomerStandingOrder=Customer standing order
NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
@@ -40,14 +41,13 @@ TransMetod=Transmission method
Send=Send
Lines=Lines
StandingOrderReject=Issue a rejection
-InvoiceRefused=Invoice refused
WithdrawalRefused=Withdrawal refused
WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society
RefusedData=Date of rejection
RefusedReason=Reason for rejection
RefusedInvoicing=Billing the rejection
NoInvoiceRefused=Do not charge the rejection
-InvoiceRefused=Invoice refused
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=Status
StatusUnknown=Unknown
StatusWaiting=Waiting
@@ -76,7 +76,7 @@ WithBankUsingRIB=For bank accounts using RIB
WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
BankToReceiveWithdraw=Bank account to receive withdraws
CreditDate=Credit on
-WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
ShowWithdraw=Show Withdraw
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
diff --git a/htdocs/langs/fa_IR/accountancy.lang b/htdocs/langs/fa_IR/accountancy.lang
index 8cab9d2b651d75b0721d76fda619e2034e4509b4..39c2732ec29852cf93d41614ed1812c2a4c1ce4f 100644
--- a/htdocs/langs/fa_IR/accountancy.lang
+++ b/htdocs/langs/fa_IR/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts
Validate=Validate
Addanaccount=Add an accounting account
AccountAccounting=Accounting account
-Ventilation=Ventilation
+Ventilation=Breakdown
ToDispatch=To dispatch
Dispatched=Dispatched
-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
TradeMargin=Trade margin
Reports=Reports
ByCustomerInvoice=By invoices customers
@@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger
Bookkeeping=General ledger
AccountBalanceByMonth=Account balance by month
-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
Line=Line
CAHTF=Total purchase supplier HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice
IntoAccount=In the accounting account
Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
+VentilationAuto=Automatic breakdown
Processing=Processing
EndProcessing=The end of processing
@@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account
ACCOUNTING_SEPARATORCSV=Separator CSV
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
@@ -140,14 +140,14 @@ Active=Statement
NewFiscalYear=New fiscal year
-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
TotalVente=Total turnover HT
TotalMarge=Total sales margin
DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
ChangeAccount=Change the accounting account for lines selected by the account:
Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
@@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically
ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index 5d9b3c02c64e17e05701bb8efbbf4e9011ea7e1c..542848189c1b44a749f0149fd1c75e16dc43d056 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -437,8 +437,8 @@ Module52Name=سهام
Module52Desc=مدیریت انبار (محصول)
Module53Name=خدمات
Module53Desc=مدیریت خدمات
-Module54Name=قراردادها
-Module54Desc=قرارداد و خدمات مدیریت
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=بارکد
Module55Desc=مدیریت بارکد
Module56Name=تلفن
@@ -475,8 +475,8 @@ Module320Name=خوراک RSS
Module320Desc=اضافه کردن خوراک RSS در داخل صفحات صفحه نمایش Dolibarr
Module330Name=بوک مارک ها
Module330Desc=مدیریت چوب الف
-Module400Name=پروژه ها
-Module400Desc=مدیریت پروژه در داخل ماژول های دیگر
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=Webcalendar
Module410Desc=ادغام Webcalendar
Module500Name=هزینه های ویژه (مالیاتی، کمک های اجتماعی، سود سهام)
@@ -484,7 +484,7 @@ Module500Desc=مدیریت هزینه های خاص مانند مالیات، م
Module510Name=حقوق
Module510Desc=مدیریت کارکنان حقوق و پرداخت
Module600Name=اطلاعیه ها
-Module600Desc=ارسال اطلاعیه ها از طریق ایمیل در برخی از وقایع کسب و کار Dolibarr به تماس با شخص ثالث
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=کمک های مالی
Module700Desc=مدیریت کمک مالی
Module1200Name=اخوندک
@@ -514,16 +514,16 @@ Module5000Name=چند شرکت
Module5000Desc=اجازه می دهد تا به شما برای مدیریت شرکت های متعدد
Module6000Name=گردش کار
Module6000Desc=مدیریت گردش کار
-Module20000Name=تعطیلات
-Module20000Desc=اعلام و کارکنان تعطیلات را دنبال
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
Module39000Name=Product batch
Module39000Desc=Batch number, eat-by and sell-by date management on products
Module50000Name=خزانه
Module50000Desc=ماژول برای ارائه یک صفحه پرداخت آنلاین از طریق کارت اعتباری با خزانه
Module50100Name=نقطه ای از فروش
Module50100Desc=نقطه ای از ماژول فروش
-Module50200Name= پی پال
-Module50200Desc= ماژول برای ارائه یک صفحه پرداخت آنلاین از طریق کارت اعتباری با پی پال
+Module50200Name=پی پال
+Module50200Desc=ماژول برای ارائه یک صفحه پرداخت آنلاین از طریق کارت اعتباری با پی پال
Module50400Name=Accounting (advanced)
Module50400Desc=Accounting management (double parties)
Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=خوانده شده سفارشات ایستاده
Permission152=ایجاد / تغییر درخواست سفارشات ایستاده
Permission153=سفارشات ایستاده انتقال رسید
Permission154=اعتبار / امتناع ایستاده سفارشات رسید
-Permission161=خوانده شده قرارداد
-Permission162=ایجاد / اصلاح قرارداد
-Permission163=فعال کردن یک سرویس از یک قرارداد
-Permission164=غیر فعال کردن یک سرویس از یک قرارداد
-Permission165=حذف قرارداد
-Permission171=خوانده شده سفر
-Permission172=ایجاد / اصلاح سفر
-Permission173=حذف سفر
-Permission178=سفرهای صادرات
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Read trips and expenses (own and his subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
Permission180=دفعات بازدید: تامین کنندگان
Permission181=خوانده شده سفارشات کالا
Permission182=ایجاد / تغییر سفارشات کالا
@@ -671,7 +672,7 @@ Permission300=دفعات بازدید: بارکد
Permission301=ایجاد / تغییر کدهای نوار
Permission302=حذف کدهای نوار
Permission311=خوانده شده خدمات
-Permission312=اختصاص خدمات به قرارداد
+Permission312=Assign service/subscription to contract
Permission331=خوانده شده بوک مارک ها
Permission332=ایجاد / تغییر بوک مارک ها
Permission333=حذف بوک مارک ها
@@ -701,8 +702,8 @@ Permission701=خوانده شده
Permission702=ایجاد / تغییر کمک های مالی
Permission703=حذف کمک های مالی
Permission1001=خوانده شده سهام
-Permission1002=ایجاد / تغییر سهام
-Permission1003=حذف سهام
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=خوانده شده جنبش های سهام
Permission1005=ایجاد / تغییر جنبش های سهام
Permission1101=خوانده شده تحویل سفارشات
@@ -1038,7 +1039,6 @@ YesInSummer=بله در فصل تابستان
OnlyFollowingModulesAreOpenedToExternalUsers=توجه داشته باشید، فقط ماژول های زیر را به کاربران خارجی (هر چه باشد اجازه چنین کاربران) باز:
SuhosinSessionEncrypt=ذخیره سازی جلسه رمز شده توسط Suhosin
ConditionIsCurrently=وضعیت در حال حاضر از٪ s
-TestNotPossibleWithCurrentBrowsers=تشخیص خودکار امکان پذیر نمی باشد
YouUseBestDriver=شما با استفاده از راننده٪ است که بهترین راننده های موجود در حال حاضر.
YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
NbOfProductIsLowerThanNoPb=شما فقط٪ محصولات / خدمات را به پایگاه داده باشد. این به این مورد نیاز هر بهینه سازی خاص است.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=بازگشت یک کد حسابداری ساخته ش
ModuleCompanyCodePanicum=بازگشت یک کد حسابداری خالی است.
ModuleCompanyCodeDigitaria=کد حسابداری بستگی به کد های شخص ثالث. کد از شخصیت "C" در مقام اول و پس از آن 5 حرف اول کد های شخص ثالث تشکیل شده است.
UseNotifications=استفاده از اطلاعیه
-NotificationsDesc=ایمیل های اطلاعیه قابلیت اجازه می دهد تا شما را به سکوت، ارسال ایمیل به صورت خودکار، برای برخی از حوادث Dolibarr، به اشخاص ثالث (مشتریان یا تامین کنندگان) است که به پیکربندی شده است. انتخاب اطلاع رسانی و اهداف تماس با فعال یک حزب سوم در زمان ساخته شده است.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
ModelModules=اسناد قالب
DocumentModelOdt=تولید اسناد از OpenDocuments قالب (. ODT و یا فایل های ODS برای آفیس اپن سورس کنند، KOffice، TextEdit، ...)
WatermarkOnDraft=تعیین میزان مد آب در پیش نویس سند
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=توانایی اضافه کردن تاریخ تحوی
UseOptionLineIfNoQuantity=یک خط از محصول / خدمات با مقدار صفر به عنوان یک گزینه در نظر گرفته
FreeLegalTextOnProposal=متن رایگان در طرح های تجاری
WatermarkOnDraftProposal=تعیین میزان مد آب در پیش نویس طرح تجاری (هیچ اگر خالی)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=راه اندازی مدیریت سفارش
OrdersNumberingModules=سفارشات شماره مدل
@@ -1146,6 +1147,7 @@ HideTreadedOrders=مخفی کردن سفارشات درمان و یا لغو د
ValidOrderAfterPropalClosed=به اعتبار منظور پس از پیشنهاد نزدیک تر است، امکان به گام نیست به دستور موقت
FreeLegalTextOnOrders=متن رایگان در سفارشات
WatermarkOnDraftOrders=تعیین میزان مد آب به دستور پیش نویس (هیچ اگر خالی)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
##### Clicktodial #####
ClickToDialSetup=کلیک کنید تا شماره گیری راه اندازی ماژول
ClickToDialUrlDesc=آدرس نامیده می شود که با کلیک بر روی picto تلفن انجام می شود. در URL، شما می توانید برچسب ها <br> <b>__PHONETO__</b> خواهد شد که با شماره تلفن از فرد جایگزین را به تماس <br> <b>__PHONEFROM__</b> خواهد شد که با شماره تلفن تماس شخص (شما) به جای <br> <b>__LOGIN__</b> خواهد شد که با ورود clicktodial خود را جایگزین (تعریف شده در کارت کاربر شما) <br> <b>__PASS__</b> خواهد شد که با رمز عبور clicktodial شما (تعریف شده در کارت کاربر خود را) جایگزین شده است.
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=مداخله شماره مدل
TemplatePDFInterventions=اسناد کارت مداخله مدل
WatermarkOnDraftInterventionCards=تعیین میزان مد آب در اسناد کارت مداخله (هیچ اگر خالی)
##### Contracts #####
-ContractsSetup=راه اندازی ماژول قراردادها
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=قرارداد شماره ماژول ها
TemplatePDFContracts=اسناد قرارداد مدل
FreeLegalTextOnContracts=متن رایگان در قرارداد
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=فایل های از نوع٪ s را با HTTP سرور
CacheByServer=کش سرور
CacheByClient=کش شده توسط مرورگر
CompressionOfResources=فشرده سازی از پاسخهای HTTP
-TestNotPossibleWithCurrentBrowsers=تشخیص خودکار امکان پذیر نمی باشد
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=راه اندازی ماژول محصولات
ServiceSetup=راه اندازی خدمات ماژول
@@ -1382,9 +1384,10 @@ MailingSetup=ایمیل راه اندازی ماژول
MailingEMailFrom=پست الکترونیکی فرستنده (از) برای ایمیل های فرستاده شده توسط ایمیل ماژول
MailingEMailError=ایمیل بازگشت (خطاها به) برای ایمیل با اشتباهات
##### Notification #####
-NotificationSetup=بو هشدار از طریق راه اندازی ماژول ایمیل
+NotificationSetup=EMail notification module setup
NotificationEMailFrom=پست الکترونیکی فرستنده (از) برای ایمیل های ارسال شده اطلاعیه
-ListOfAvailableNotifications=فهرست اطلاعیه در دسترس است (این لیست بستگی به ماژول های فعال)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
##### Sendings #####
SendingsSetup=در حال ارسال راه اندازی ماژول
SendingsReceiptModel=ارسال مدل رسید
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=اتصال به سرور '٪ s' را در پایگاه داده
OSCommerceTestKo1=اتصال به کارگزار «٪ s 'موفق اما پایگاه داده'٪ s 'را نمی تواند رسید.
OSCommerceTestKo2=اتصال به کارگزار «٪ s 'با کاربر'٪ s 'شکست خورده است.
##### Stock #####
-StockSetup=سهام ماژول تنظیمات
-UserWarehouse=استفاده از سهام شخصی کاربر
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=منوی حذف
TreeMenu=منوها درخت
@@ -1478,11 +1482,14 @@ ClickToDialDesc=این ماژول اجازه می دهد تا پس از شمار
##### Point Of Sales (CashDesk) #####
CashDesk=نقطه ای از فروش
CashDeskSetup=نقطه ای از راه اندازی ماژول فروش
-CashDeskThirdPartyForSell=شخص ثالث عمومی به استفاده از برای فروش
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=پیش فرض حساب استفاده برای دریافت پرداخت های نقدی
CashDeskBankAccountForCheque= پیش فرض حساب استفاده برای دریافت پرداخت توسط چک
CashDeskBankAccountForCB= پیش فرض حساب استفاده برای دریافت پرداخت توسط کارت های اعتباری
-CashDeskIdWareHouse=انبار استفاده برای فروش
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=راه اندازی ماژول چوب الف
BookmarkDesc=این ماژول به شما اجازه مدیریت بوک مارک ها. شما همچنین می توانید کلید های میانبر برای هر صفحه Dolibarr و یا وب سایت های externale در منوی سمت چپ خود را اضافه کنید.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=حذف سال مالی
ConfirmDeleteFiscalYear=آیا مطمئن هستید این سال مالی را حذف کنید؟
Opened=افتتاح شد
Closed=بسته
-
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
Format=قالب
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
diff --git a/htdocs/langs/fa_IR/agenda.lang b/htdocs/langs/fa_IR/agenda.lang
index 38229070eaa5407de0c742f9855fa1fb642c3b9e..01e2beb85d5cb3de78c833cd4b5d43a7a0b58a82 100644
--- a/htdocs/langs/fa_IR/agenda.lang
+++ b/htdocs/langs/fa_IR/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= پر کردن خودکار
AgendaAutoActionDesc= تعریف اینجا رویدادی که می خواهید Dolibarr برای ایجاد به طور خودکار یک رویداد در دستور کار. اگر چیزی (به طور پیش فرض) انتخاب شود، فقط اقدامات تجاری خواهد شد در دستور کار گنجانده شده است.
AgendaSetupOtherDesc= این صفحه فراهم می کند گزینه اجازه می دهد تا صادرات رویدادی Dolibarr خود را در تقویم های خارجی (تاندربرد، تقویم گوگل، ...)
AgendaExtSitesDesc=این صفحه اجازه می دهد تا به اعلام منابع خارجی از تقویم برای دیدن رویدادی خود را در دستور کار Dolibarr.
-ActionsEvents= رویدادهای که Dolibarr یک اقدام در دستور کار به طور خودکار ایجاد
-PropalValidatedInDolibarr= پیشنهاد از٪ s معتبر
-InvoiceValidatedInDolibarr= فاکتور٪ بازدید کنندگان اعتبار
+ActionsEvents=رویدادهای که Dolibarr یک اقدام در دستور کار به طور خودکار ایجاد
+PropalValidatedInDolibarr=پیشنهاد از٪ s معتبر
+InvoiceValidatedInDolibarr=فاکتور٪ بازدید کنندگان اعتبار
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=فاکتور٪ s را به بازگشت به پیش نویس وضعیت
InvoiceDeleteDolibarr=فاکتور٪ s را حذف
OrderValidatedInDolibarr= منظور از٪ s معتبر
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=منظور از٪ s را تایید
OrderRefusedInDolibarr=منظور از٪ s را رد کرد
OrderBackToDraftInDolibarr=منظور از٪ s به بازگشت به پیش نویس وضعیت
OrderCanceledInDolibarr=منظور از٪ s را لغو
-InterventionValidatedInDolibarr=مداخله٪ بازدید کنندگان اعتبار
ProposalSentByEMail=پیشنهاد تجاری٪ s ارسال با ایمیل
OrderSentByEMail=سفارش مشتری٪ s ارسال با ایمیل
InvoiceSentByEMail=صورت حساب به مشتری٪ s ارسال با ایمیل
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=تامین کننده نظم٪ s ارسال با ایم
SupplierInvoiceSentByEMail=تامین کننده فاکتور٪ s ارسال با ایمیل
ShippingSentByEMail=حمل و نقل٪ s ارسال با ایمیل
ShippingValidated= حمل و نقل از٪ s معتبر
-InterventionSentByEMail=مداخله٪ s ارسال با ایمیل
-InterventionClassifiedBilled=مداخله٪ s در طبقه بندی گونه که اعلام شده
NewCompanyToDolibarr= شخص ثالث ایجاد شده
DateActionPlannedStart= تاریخ شروع برنامه ریزی شده
DateActionPlannedEnd= تاریخ پایان برنامه ریزی شده
@@ -70,9 +68,9 @@ DateActionStart= تاریخ شروع
DateActionEnd= تاریخ پایان
AgendaUrlOptions1=شما همچنین می توانید پارامترهای زیر برای فیلتر کردن خروجی اضافه:
AgendaUrlOptions2=<b>ورود =٪ s را</b> برای محدود کردن خروجی به اقدامات ایجاد شده توسط، اختصاص یافته به و یا انجام شده توسط <b>کاربر٪ s را.</b>
-AgendaUrlOptions3=<b>logina =٪ s را</b> برای محدود کردن خروجی به اقدامات ایجاد شده توسط <b>کاربر٪ s را.</b>
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
AgendaUrlOptions4=<b>logint =٪ s را</b> برای محدود کردن خروجی به اقدامات داده شده به کاربر <b>از٪ s.</b>
-AgendaUrlOptions5=<b>logind =٪ s را</b> برای محدود کردن خروجی به اقدامات انجام شده توسط <b>کاربر٪ s را.</b>
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
AgendaShowBirthdayEvents=نمایش تماس های تولد را
AgendaHideBirthdayEvents=مخفی کردن تماس های تولد را
Busy=مشغول
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=فایل مقرون URL برای دسترسی به.
ExtSiteNoLabel=بدون شرح
WorkingTimeRange=Working time range
WorkingDaysRange=Working days range
-AddEvent=Add event
+AddEvent=Create event
MyAvailability=My availability
diff --git a/htdocs/langs/fa_IR/bills.lang b/htdocs/langs/fa_IR/bills.lang
index f99aff40d1f15622c8693cc488b8e4d54c7f59c5..7b7d6b27fd86ffe5348a142aaea5abd743d80800 100644
--- a/htdocs/langs/fa_IR/bills.lang
+++ b/htdocs/langs/fa_IR/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=توجه داشته باشید اعتباری
InvoiceAvoirAsk=توجه داشته باشید اعتباری برای اصلاح صورت حساب
InvoiceAvoirDesc=<b>توجه داشته باشید اعتباری</b> فاکتور منفی استفاده می شود برای حل این واقعیت است که فاکتور دارای مقدار است که از مقدار واقعا پرداخت می شود، متفاوت است (به دلیل مشتری های خطا بیش از حد پرداخت می شود، و یا به طور کامل پرداخت می شود چرا که او بازگشت برخی از محصولات به عنوان مثال) است.
invoiceAvoirWithLines=ایجاد اعتبار توجه با خطوط از فاکتور مبدا
-invoiceAvoirWithPaymentRestAmount=ایجاد اعتبار توجه با مقدار دریاچه منشاء فاکتور پرداخت در
-invoiceAvoirLineWithPaymentRestAmount=مقدار اعتبار توجه از دریاچه پرداخت صورتحساب در
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
ReplaceInvoice=به جای صورتحساب از٪ s
ReplacementInvoice=فاکتور تعویض
ReplacedByInvoice=به جای صورتحساب از٪ s
@@ -87,7 +87,7 @@ ClassifyCanceled=طبقه بندی 'رها'
ClassifyClosed=طبقه بندی »بسته '
ClassifyUnBilled=Classify 'Unbilled'
CreateBill=ایجاد فاکتور
-AddBill=اضافه کردن فاکتور و یا اعتباری توجه داشته باشید
+AddBill=Create invoice or credit note
AddToDraftInvoices=اضافه کردن به پیش نویس فاکتور
DeleteBill=حذف فاکتور
SearchACustomerInvoice=جستجو برای یک صورتحساب مشتری
@@ -99,7 +99,7 @@ DoPaymentBack=آیا پرداخت به عقب
ConvertToReduc=تبدیل به تخفیف آینده
EnterPaymentReceivedFromCustomer=پرداخت های دریافت شده از مشتری را وارد کنید
EnterPaymentDueToCustomer=پرداخت با توجه به مشتری
-DisabledBecauseRemainderToPayIsZero=غیر فعال به دلیل باقی مانده به پرداخت صفر است
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
Amount=مقدار
PriceBase=پایه قیمت
BillStatus=وضعیت فاکتور
@@ -137,8 +137,6 @@ BillFrom=از
BillTo=به
ActionsOnBill=عملیات در فاکتور
NewBill=صورت حساب جدید
-Prélèvements=نظام نامه
-Prélèvements=نظام نامه
LastBills=تاریخ و زمان آخرین٪ s را فاکتورها
LastCustomersBills=تاریخ و زمان آخرین٪ مشتریان فاکتورها
LastSuppliersBills=تاریخ و زمان آخرین٪ بازدید کنندگان تامین کنندگان فاکتورها
@@ -156,9 +154,9 @@ ConfirmCancelBill=آیا مطمئن هستید که می خواهید برای
ConfirmCancelBillQuestion=چرا شما می خواهید برای طبقه بندی این فاکتور "رها"؟
ConfirmClassifyPaidPartially=آیا مطمئن هستید که می خواهید به تغییر صورت <b>حساب٪ s به</b> وضعیت پرداخت می شود؟
ConfirmClassifyPaidPartiallyQuestion=این فاکتور به طور کامل پرداخت نشده است. دلایل شما برای بستن این فاکتور ها چه هستند؟
-ConfirmClassifyPaidPartiallyReasonAvoir=باقی مانده به پرداخت <b>(٪ S٪ بازدید کنندگان)</b> تخفیف داده است به دلیل پرداخت قبل از واژه ساخته شده است. I تنظیم مالیات بر ارزش افزوده با توجه داشته باشید اعتباری.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=باقی مانده به پرداخت <b>(٪ S٪ بازدید کنندگان)</b> تخفیف داده است به دلیل پرداخت قبل از واژه ساخته شده است. من قبول می کنم به از دست دادن مالیات بر ارزش افزوده در این تخفیف.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=باقی مانده به پرداخت <b>(٪ S٪ بازدید کنندگان)</b> تخفیف داده است به دلیل پرداخت قبل از واژه ساخته شده است. I مالیات بر ارزش افزوده در این تخفیف بهبود می یابند بدون توجه داشته باشید اعتباری.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
ConfirmClassifyPaidPartiallyReasonBadCustomer=مشتری بد
ConfirmClassifyPaidPartiallyReasonProductReturned=محصولات نیمه بازگشت
ConfirmClassifyPaidPartiallyReasonOther=میزان دلیل دیگر رها
@@ -191,9 +189,9 @@ AlreadyPaid=در حال حاضر پرداخت می شود
AlreadyPaidBack=در حال حاضر باز پرداخت
AlreadyPaidNoCreditNotesNoDeposits=در حال حاضر (بدون یادداشت های اعتباری و سپرده) پرداخت می شود
Abandoned=متروک
-RemainderToPay=باقی مانده به پرداخت
-RemainderToTake=باقی مانده را به
-RemainderToPayBack=باقی مانده به پرداخت
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
Rest=در انتظار
AmountExpected=مقدار ادعا
ExcessReceived=اضافی دریافت
@@ -219,19 +217,18 @@ NoInvoice=بدون فاکتور
ClassifyBill=طبقه بندی صورت حساب
SupplierBillsToPay=تولید کنندگان فاکتورها به پرداخت
CustomerBillsUnpaid=صورت حساب مشتریان پرداخت نشده
-DispenseMontantLettres=این لایحه پیش نویس توسط mechanographical از نظم در نامه معاف هستند
-DispenseMontantLettres=این لایحه پیش نویس توسط mechanographical از نظم در نامه معاف هستند
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=غیر قابل بازیابی
SetConditions=تنظیم شرایط پرداخت
SetMode=تنظیم حالت پرداخت
Billed=ثبت شده در صورتحساب یا لیست
-RepeatableInvoice=فاکتور از پیش تعریف شده
-RepeatableInvoices=فاکتورها از پیش تعریف شده
-Repeatable=از پیش تعریف شده
-Repeatables=از پیش تعریف شده
-ChangeIntoRepeatableInvoice=تبدیل به از پیش تعریف شده
-CreateRepeatableInvoice=فاکتور ایجاد از پیش تعریف شده
-CreateFromRepeatableInvoice=ایجاد از فاکتور از پیش تعریف شده
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
CustomersInvoicesAndInvoiceLines=صورت حساب مشتری و خطوط صورت حساب را
CustomersInvoicesAndPayments=صورت حساب مشتری و پرداخت
ExportDataset_invoice_1=فهرست فاکتورها مشتری و خطوط صورت حساب را
diff --git a/htdocs/langs/fa_IR/categories.lang b/htdocs/langs/fa_IR/categories.lang
index ac3564007502288b918888499c8b3c9efc3a6d68..427073d5f481c4bfbfe66ce56c25a227525d14db 100644
--- a/htdocs/langs/fa_IR/categories.lang
+++ b/htdocs/langs/fa_IR/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=ارتباط بین تامین کنندگان و گروهها
CatCusLinks=ارتباط بین مشتریان / چشم انداز ها و دسته ها
CatProdLinks=لینک بین محصولات / خدمات و دسته ها
CatMemberLinks=ارتباط بین اعضا و گروهها
-CatProdLinks=لینک بین محصولات / خدمات و دسته ها
-CatCusLinks=ارتباط بین مشتریان / چشم انداز ها و دسته ها
-CatSupLinks=ارتباط بین تامین کنندگان و گروهها
DeleteFromCat=حذف از گروه
DeletePicture=تصویر حذف کنید
ConfirmDeletePicture=تأیید حذف تصویر؟
@@ -112,3 +109,4 @@ CategoriesSetup=شاخه ها راه اندازی
CategorieRecursiv=پیوند با گروه پدر و مادر به طور خودکار
CategorieRecursivHelp=اگر فعال شود، محصول نیز به دسته پدر و مادر مرتبط است که با اضافه کردن به زیرشاخه
AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category
diff --git a/htdocs/langs/fa_IR/compta.lang b/htdocs/langs/fa_IR/compta.lang
index a022470e51ae3dadbc5b52ab58741ea0381b8944..f7f285a021fb6b756c9676ca05834cf95365d8d2 100644
--- a/htdocs/langs/fa_IR/compta.lang
+++ b/htdocs/langs/fa_IR/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=بد کد حسابداری مشتری برا
SuppliersProductsSellSalesTurnover=گردش مالی تولید شده توسط فروش محصولات تولید کننده است.
CheckReceipt=چک سپرده
CheckReceiptShort=چک سپرده
+LastCheckReceiptShort=Last %s check receipts
NewCheckReceipt=تخفیف های جدید
NewCheckDeposit=واریز چک های جدید
NewCheckDepositOn=ایجاد رسید سپرده در حساب:٪ s را
diff --git a/htdocs/langs/fa_IR/contracts.lang b/htdocs/langs/fa_IR/contracts.lang
index 2e9740faffccb09081fba25d1b1a4807b2fb75cc..2192fa807e92fd75d41120b8cefd50d0e6d4d606 100644
--- a/htdocs/langs/fa_IR/contracts.lang
+++ b/htdocs/langs/fa_IR/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=منطقه قرارداد
ListOfContracts=فهرست قرارداد
-LastContracts=تاریخ و زمان آخرین٪ s در قرارداد اصلاح شده
+LastModifiedContracts=Last %s modified contracts
AllContracts=همه قراردادها
ContractCard=کارت قرارداد
ContractStatus=وضعیت قرارداد
@@ -27,7 +27,7 @@ MenuRunningServices=در حال اجرا خدمات
MenuExpiredServices=خدمات منقضی شده
MenuClosedServices=خدمات بسته شده
NewContract=قرارداد جدید
-AddContract=اضافه کردن قرارداد
+AddContract=Create contract
SearchAContract=جستجوی یک قرارداد
DeleteAContract=حذف یک قرارداد
CloseAContract=بستن یک قرارداد
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=فهرست در حال اجرا خطوط قرارد
ListOfRunningServices=لیست خدمات در حال اجرا
NotActivatedServices=خدمات غیر فعال (در قرارداد اعتبار)
BoardNotActivatedServices=خدمات برای فعال سازی در قرارداد اعتبار
-LastContracts=تاریخ و زمان آخرین٪ s در قرارداد اصلاح شده
+LastContracts=Last % contracts
LastActivatedServices=تاریخ و زمان آخرین٪ s به خدمات فعال
LastModifiedServices=تاریخ و زمان آخرین٪ بازدید کنندگان خدمات اصلاح شده
EditServiceLine=خط ویرایش خدمات
diff --git a/htdocs/langs/fa_IR/cron.lang b/htdocs/langs/fa_IR/cron.lang
index d05a3a719022ded53c63b97dcee3b2a247ed9212..ef96c9ca6209284114af43b3f7b80b84f120a270 100644
--- a/htdocs/langs/fa_IR/cron.lang
+++ b/htdocs/langs/fa_IR/cron.lang
@@ -18,9 +18,8 @@ CronExplainHowToRunUnix=در محیط یونیکس شما باید crontab کا
CronExplainHowToRunWin=در مایکروسافت، محصول محیط ویندوز شما می توانید ابزار کار برنامه ریزی شده برای اجرای خط فرمان در هر دقیقه استفاده
# Menu
CronJobs=شغل برنامه ریزی
-CronListActive= لیست شغل ها فعال
-CronListInactive= لیست شغل ها غیر فعال
-CronListActive= لیست شغل ها فعال
+CronListActive=List of active/scheduled jobs
+CronListInactive=لیست شغل ها غیر فعال
# Page list
CronDateLastRun=تاریخ و زمان آخرین اجرا
CronLastOutput=تاریخ و زمان آخرین خروجی اجرا
@@ -62,7 +61,7 @@ CronObject= به عنوان مثال / شی برای ایجاد
CronArgs=پارامترها
CronSaveSucess=صرفه جویی در موفقیت
CronNote=توضیح
-CronFieldMandatory=زمینه های از%s الزامی است
+CronFieldMandatory=زمینه های از٪ s الزامی است
CronErrEndDateStartDt=تاریخ پایان نمی تواند قبل از تاریخ شروع می شود
CronStatusActiveBtn=قادر ساختن
CronStatusInactiveBtn=از کار انداختن
@@ -83,5 +82,5 @@ CronType=نوع کار
CronType_method=روش تماس از یک کلاس Dolibarr
CronType_command=فرمان شل
CronMenu=cron را
-CronCannotLoadClass=آیا می توانم کلاس%s را بار نیست و یا شی از%s
+CronCannotLoadClass=آیا می توانم کلاس٪ s را بار نیست و یا شی از٪ s
UseMenuModuleToolsToAddCronJobs=برو به منوی "صفحه اصلی - ماژول ابزار - فهرست فرصت های شغلی" برای دیدن و ویرایش کار برنامه ریزی شده.
diff --git a/htdocs/langs/fa_IR/donations.lang b/htdocs/langs/fa_IR/donations.lang
index 784735cf920d044ba8dcaabf0937b926db315383..27a5ed5f685f8b984244f1b56100de2ce71a6121 100644
--- a/htdocs/langs/fa_IR/donations.lang
+++ b/htdocs/langs/fa_IR/donations.lang
@@ -4,7 +4,7 @@ Donations=کمک های مالی
DonationRef=کد عکس کمک مالی.
Donor=دهنده
Donors=اهدا کنندگان
-AddDonation=اضافه کردن یک کمک مالی
+AddDonation=Create a donation
NewDonation=کمک مالی جدید
ShowDonation=نمایش کمک مالی
DonationPromise=وعده هدیه
@@ -31,3 +31,8 @@ DonationRecipient=دریافت کننده کمک مالی
ThankYou=با تشکر از شما
IConfirmDonationReception=گیرنده اعلام پذیرش، به عنوان یک کمک مالی، از مقدار زیر
MinimumAmount=Minimum amount is %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/fa_IR/externalsite.lang b/htdocs/langs/fa_IR/externalsite.lang
index d2359ac5bb7ef439d2f444436bb48471f8fe7022..cf0df700d6e1da5702148cbf97bcd68eaddb3e5f 100644
--- a/htdocs/langs/fa_IR/externalsite.lang
+++ b/htdocs/langs/fa_IR/externalsite.lang
@@ -2,3 +2,4 @@
ExternalSiteSetup=راه اندازی لينک به وب سايت های خارجی
ExternalSiteURL=URL سايت خارجی
ExternalSiteModuleNotComplete=ماژول سايت خارجی به درستی پيکربندی نشده است.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/fa_IR/holiday.lang b/htdocs/langs/fa_IR/holiday.lang
index 691872b0e820b5dca6f4ab2663300ecbf236ee6e..238eb5a9f12a854ff291cc9c86b25d7772dd0565 100644
--- a/htdocs/langs/fa_IR/holiday.lang
+++ b/htdocs/langs/fa_IR/holiday.lang
@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
CantCreateCP=You don't have the right to make leave requests.
InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=به روز رسانی
CantUpdate=You cannot update this leave request.
NoDateDebut=شما باید یک تاریخ شروع انتخاب کنید.
NoDateFin=شما باید تاریخ پایان را انتخاب کنید.
-ErrorDureeCP=درخواست شما برای تعطیلات حاوی روز کار نمی کند.
-TitleValidCP=تصویب تعطیلات درخواست
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
ConfirmValidCP=Are you sure you want to approve the leave request?
DateValidCP=تاریخ تصویب
TitleToValidCP=Send leave request
ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=امتناع تعطیلات درخواست
+TitleRefuseCP=Refuse the leave request
ConfirmRefuseCP=Are you sure you want to refuse the leave request?
NoMotifRefuseCP=شما باید دلیلی برای امتناع از درخواست را انتخاب کنید.
-TitleCancelCP=لغو تعطیلات درخواست
+TitleCancelCP=Cancel the leave request
ConfirmCancelCP=Are you sure you want to cancel the leave request?
DetailRefusCP=دلیل امتناع
DateRefusCP=تاریخ امتناع
@@ -78,7 +77,7 @@ ActionByCP=انجام شده توسط
UserUpdateCP=برای کاربر
PrevSoldeCP=موجودی قبلی
NewSoldeCP=موجودی جدید
-alreadyCPexist=درخواست برای تعطیلات در حال حاضر در این دوره انجام می شود.
+alreadyCPexist=A leave request has already been done on this period.
UserName=نام
Employee=کارمند
FirstDayOfHoliday=First day of vacation
@@ -88,25 +87,25 @@ ManualUpdate=دستی به روز رسانی
HolidaysCancelation=Leave request cancelation
## Configuration du Module ##
-ConfCP=تنظیمات ماژول تعطیلات
+ConfCP=Configuration of leave request module
DescOptionCP=شرح گزینه
ValueOptionCP=ارزش
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
ConfirmConfigCP=اعتبارسنجی پیکربندی
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
UpdateConfCPOK=به روز رسانی با موفقیت.
ErrorUpdateConfCP=خطا در به روز رسانی رخ داد، لطفا دوباره سعی کنید.
-AddCPforUsers=لطفا تعادل از تعطیلات از کاربران با استفاده از Add <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">اینجا را کلیک کنید</a> .
-DelayForSubmitCP=آخرین مهلت برای تعطیلات اعمال می شود
-AlertapprobatortorDelayCP=جلوگیری از approbator اگر درخواست تعطیلات می کند مهلت مطابقت ندارد
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
Module27130Name= Management of leave requests
Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
TitleOptionEventCP=Settings of leave requets for events
ValidEventCP=معتبر ساختن
UpdateEventCP=رویدادی به روز رسانی
diff --git a/htdocs/langs/fa_IR/interventions.lang b/htdocs/langs/fa_IR/interventions.lang
index ab199ca3e6bece5ba7f716450fc69fdb37cf7879..2b495fe60aa70340f8f2a1b913278aca08a4d87c 100644
--- a/htdocs/langs/fa_IR/interventions.lang
+++ b/htdocs/langs/fa_IR/interventions.lang
@@ -3,7 +3,7 @@ Intervention=مداخله
Interventions=مداخلات
InterventionCard=کارت مداخله
NewIntervention=مداخله های جدید
-AddIntervention=اضافه کردن مداخله
+AddIntervention=Create intervention
ListOfInterventions=فهرست مداخلات
EditIntervention=ویرایش مداخله
ActionsOnFicheInter=عملیات مداخله
@@ -30,6 +30,15 @@ StatusInterInvoiced=ثبت شده در صورتحساب یا لیست
RelatedInterventions=مداخلات مرتبط
ShowIntervention=نمایش مداخله
SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=نماینده زیر تا مداخله
TypeContact_fichinter_internal_INTERVENING=مداخله
diff --git a/htdocs/langs/fa_IR/mails.lang b/htdocs/langs/fa_IR/mails.lang
index 16ad7ea3af3864ff853ebb02cab9fa35ec349979..e4bc57e2d42707da3ba68f599ff51c7fa5bceb3e 100644
--- a/htdocs/langs/fa_IR/mails.lang
+++ b/htdocs/langs/fa_IR/mails.lang
@@ -1,8 +1,8 @@
# Dolibarr language file - Source file is en_US - mails
Mailing=ارسال ایمیل
EMailing=ارسال ایمیل
-Mailings=EMailings
-EMailings=EMailings
+Mailings=ارسال ایمیل ها
+EMailings=ارسال ایمیل ها
AllEMailings=همه eMailings
MailCard=ایمیل کارت
MailTargets=اهداف
@@ -14,13 +14,13 @@ MailErrorsTo=خطاها به
MailReply=پاسخ به
MailTo=گیرنده (ها)
MailCC=کپی کنید به
-MailCCC=نسخه های cache شده به
+MailCCC=نسخه های کش شده به
MailTopic=موضوع ایمیل
MailText=پیام
MailFile=فایل های پیوست شده
MailMessage=متن ایمیل
ShowEMailing=نمایش ایمیل
-ListOfEMailings=فهرست emailings
+ListOfEMailings=فهرست ارسال ایمیل ها
NewMailing=ایمیل جدید
EditMailing=ویرایش ایمیل
ResetMailing=ارسال دوباره ایمیل
@@ -29,7 +29,7 @@ DeleteAMailing=حذف ایمیل
PreviewMailing=ایمیل پیش
PrepareMailing=آماده ایمیل
CreateMailing=ایجاد ایمیل
-MailingDesc=این صفحه به شما اجازه ارسال emailings به یک گروه از مردم.
+MailingDesc=این صفحه به شما اجازه ارسال ایمیل ها به یک گروه از مردم.
MailingResult=ایمیل ارسال شود
TestMailing=ایمیل تست
ValidMailing=معتبر ایمیل
@@ -103,8 +103,8 @@ MailingModuleDescContactsByFunction=تماس / آدرس اشخاص ثالث (م
LineInFile=خط٪ در فایل
RecipientSelectionModules=درخواست تعریف شده برای انتخاب گیرنده
MailSelectedRecipients=دریافت کنندگان برگزیده
-MailingArea=منطقه EMailings
-LastMailings=تاریخ و زمان آخرین٪ s را emailings
+MailingArea=منطقه ارسال ایمیل ها
+LastMailings=تاریخ و زمان آخرین٪ s را ارسال ایمیل ها
TargetsStatistics=آمار اهداف
NbOfCompaniesContacts=تماس با ما منحصر به فرد / آدرس
MailNoChangePossible=دریافت کنندگان برای ایمیل معتبر نمی تواند تغییر کند
@@ -115,7 +115,7 @@ SentBy=ارسال شده توسط
MailingNeedCommand=برای دلیل امنیت، با ارسال یک ایمیل بهتر است زمانی که از خط فرمان انجام می شود. اگر شما یکی، مدیر سرور خود بخواهید برای راه اندازی از دستور زیر برای ارسال ایمیل به همه گیرندگان:
MailingNeedCommand2=با این حال شما می توانید آنها را به صورت آنلاین ارسال شده توسط اضافه کردن MAILING_LIMIT_SENDBYWEB پارامتر با مقدار حداکثر تعداد ایمیل های شما می خواهید به جلسه ارسال کنید. برای این کار، در خانه به - راه اندازی - سایر.
ConfirmSendingEmailing=اگر نمی توانید و یا ترجیح می دهند از ارسال آنها را با مرورگر وب خود، لطفا تایید شما مطمئن هستید که می خواهید برای ارسال ایمیل با شرکت از مرورگر خود هستند؟
-LimitSendingEmailing=توجه داشته باشید: در خط ارسال از emailings برای امنیت و فاصله دلایل <b>به٪ s</b> دریافت کنندگان با ارسال وارد نمایید محدود شده است.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=لیست پاک کردن
ToClearAllRecipientsClickHere=برای پاک کردن لیست دریافت کننده این ایمیل اینجا را کلیک کنید
ToAddRecipientsChooseHere=اضافه کردن گیرندگان با انتخاب از لیست
@@ -133,6 +133,9 @@ Notifications=اطلاعیه ها
NoNotificationsWillBeSent=بدون اطلاعیه ها ایمیل ها برای این رویداد و شرکت برنامه ریزی
ANotificationsWillBeSent=1 اطلاع رسانی خواهد شد از طریق ایمیل ارسال می شود
SomeNotificationsWillBeSent=اطلاعیه٪ خواهد شد از طریق ایمیل ارسال می شود
-AddNewNotification=فعال کردن یک درخواست ارسال ایمیل جدید
-ListOfActiveNotifications=لیست همه درخواست ها ارسال ایمیل فعال
+AddNewNotification=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
ListOfNotificationsDone=لیست همه اطلاعیه ها ایمیل فرستاده شده
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang
index 5f81a10f1a08b0a43b9bd485bd71cb9766ac6af2..a4a4471ebeb250a85a845457d79c433038428e81 100644
--- a/htdocs/langs/fa_IR/main.lang
+++ b/htdocs/langs/fa_IR/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=برای پیدا کردن <b>کاربر٪
ErrorNoVATRateDefinedForSellerCountry=خطا، هیچ نرخ مالیات بر ارزش افزوده تعریف شده برای این کشور شد '٪ s'.
ErrorNoSocialContributionForSellerCountry=خطا، هیچ نوع کمک اجتماعی تعریف شده برای این کشور شد '٪ s'.
ErrorFailedToSaveFile=خطا، موفق به صرفه جویی در فایل.
-ErrorOnlyPngJpgSupported=خطا، تنها. PNG و. تصویر jpg فرمت فایل پشتیبانی می شوند.
-ErrorImageFormatNotSupported=PHP شما توابع برای تبدیل تصاویر از این فرمت پشتیبانی نمی کند.
SetDate=تاریخ تنظیم
SelectDate=یک تاریخ را انتخاب کنید
SeeAlso=همچنین نگاه کنید به٪ s را
BackgroundColorByDefault=رنگ به طور پیش فرض پس زمینه
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
FileWasNotUploaded=فایل برای پیوست انتخاب شده، اما هنوز ارسال نشده. بر روی "فایل ضمیمه" برای این کلیک کنید.
NbOfEntries=Nb و از نوشته
GoToWikiHelpPage=خوانده شده کمک آنلاین (نیاز به دسترسی به اینترنت)
@@ -266,6 +266,7 @@ Afternoon=بعد از ظهر
Quadri=چهارتایی
MonthOfDay=ماه از روز
HourShort=H
+MinuteShort=mn
Rate=نرخ
UseLocalTax=شامل مالیات
Bytes=بایت
@@ -340,6 +341,7 @@ FullList=لیست کامل
Statistics=ارقام
OtherStatistics=آمار دیگر
Status=وضعیت
+Favorite=Favorite
ShortInfo=اطلاعات.
Ref=کد عکس.
RefSupplier=کد عکس. تهیه کننده
@@ -365,6 +367,7 @@ ActionsOnCompany=رویدادها در مورد این شخص ثالث
ActionsOnMember=رویدادها در مورد این عضو
NActions=٪ حوادث
NActionsLate=٪ s در اواخر
+RequestAlreadyDone=Request already recorded
Filter=صافی
RemoveFilter=حذف فیلتر
ChartGenerated=نمودار تولید
@@ -645,6 +648,7 @@ OptionalFieldsSetup=راه اندازی ویژگی های اضافی
URLPhoto=URL عکس / آرم
SetLinkToThirdParty=لینک به شخص ثالث دیگری
CreateDraft=ایجاد پیش نویس
+SetToDraft=Back to draft
ClickToEdit=برای ویرایش کلیک کنید
ObjectDeleted=شیء٪ s را حذف
ByCountry=براساس کشور
@@ -678,7 +682,7 @@ ViewPrivateNote=مشاهده یادداشت
XMoreLines=٪ خط (بازدید کنندگان) پنهان
PublicUrl=URL عمومی
AddBox=اضافه کردن جعبه
-
+SelectElementAndClickRefresh=Select an element and click Refresh
# Week day
Monday=دوشنبه
Tuesday=سهشنبه
diff --git a/htdocs/langs/fa_IR/margins.lang b/htdocs/langs/fa_IR/margins.lang
index b5de2f436217c6d0f5d78d3e1ebeb8aff2bbe4ff..3bf987e19bf056d90f055b1a68563403e68bb542 100644
--- a/htdocs/langs/fa_IR/margins.lang
+++ b/htdocs/langs/fa_IR/margins.lang
@@ -38,4 +38,7 @@ BuyingCost=قیمت تمام شده
UnitCharges=اتهامات واحد
Charges=عوارض
AgentContactType=عامل تجاری و نوع تماس
-AgentContactTypeDetails=تعریف نوع آنچه در تماس با (مرتبط در فاکتورها) برای گزارش حاشیه های عامل تجاری استفاده می شود
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/fa_IR/orders.lang b/htdocs/langs/fa_IR/orders.lang
index d41523555b8be2df44d7c1ae71f2b9fd1812f606..d99bc976c66bbfa55aa00973b2004121d8feeea6 100644
--- a/htdocs/langs/fa_IR/orders.lang
+++ b/htdocs/langs/fa_IR/orders.lang
@@ -53,7 +53,7 @@ ShippingExist=حمل و نقل وجود دارد
DraftOrWaitingApproved=پیش نویس و یا مورد تایید در عین حال دستور داده
DraftOrWaitingShipped=پیش نویس و یا اعتبار هنوز حمل نشده است
MenuOrdersToBill=سفارشات تحویل
-MenuOrdersToBill2=سفارشات به لایحه
+MenuOrdersToBill2=Billable orders
SearchOrder=نتایج جستجو
SearchACustomerOrder=جستجوی یک سفارش مشتری
ShipProduct=محصول کشتی
@@ -65,7 +65,7 @@ ValidateOrder=منظور اعتبارسنجی
UnvalidateOrder=منظور Unvalidate
DeleteOrder=به منظور حذف
CancelOrder=جهت لغو
-AddOrder=اضافه کردن منظور
+AddOrder=Create order
AddToMyOrders=اضافه کردن به سفارشات من
AddToOtherOrders=اضافه کردن به دیگر سفارشات
AddToDraftOrders=اضافه کردن به پیش نویس منظور
@@ -75,8 +75,8 @@ NoOtherOpenedOrders=بدون دیگر سفارشات باز
NoDraftOrders=بدون پیش نویس سفارشات
OtherOrders=دیگر سفارشات
LastOrders=تاریخ و زمان آخرین٪ بازدید کنندگان سفارشات
-LastModifiedOrders=تاریخ و زمان آخرین%s در دستور تغییر
-LastClosedOrders=تاریخ و زمان آخرین%s در دستور بسته
+LastModifiedOrders=تاریخ و زمان آخرین٪ s در دستور تغییر
+LastClosedOrders=تاریخ و زمان آخرین٪ s در دستور بسته
AllOrders=تمام سفارشات
NbOfOrders=تعداد سفارشات
OrdersStatistics=آمار سفارش
@@ -88,10 +88,10 @@ CloseOrder=نزدیک منظور
ConfirmCloseOrder=آیا مطمئن هستید که میخواهید این منظور deliverd؟ پس از سفارش تحویل داده شده است، می توان آن را به صورتحساب تنظیم شده است.
ConfirmCloseOrderIfSending=آیا مطمئن هستید که می خواهید برای بستن این دستور؟ شما باید منظور تنها زمانی که تمام حمل و نقل انجام می شود نزدیک است.
ConfirmDeleteOrder=آیا مطمئن هستید که می خواهید این دستور را حذف کنید؟
-ConfirmValidateOrder=آیا مطمئن هستید که می خواهید به اعتبار این منظور با <b>نام%s را؟</b>
-ConfirmUnvalidateOrder=آیا مطمئن هستید که می خواهید برای بازگرداندن نظم <b>به%s به</b> پیش نویس وضعیت؟
+ConfirmValidateOrder=آیا مطمئن هستید که می خواهید به اعتبار این منظور با <b>نام٪ s را؟</b>
+ConfirmUnvalidateOrder=آیا مطمئن هستید که می خواهید برای بازگرداندن نظم <b>به٪ s به</b> پیش نویس وضعیت؟
ConfirmCancelOrder=آیا مطمئن هستید که می خواهید به لغو این منظور؟
-ConfirmMakeOrder=آیا مطمئن هستید که می خواهید برای تایید شما به این منظور <b>در%s</b> ساخته شده است؟
+ConfirmMakeOrder=آیا مطمئن هستید که می خواهید برای تایید شما به این منظور <b>در٪ s</b> ساخته شده است؟
GenerateBill=تولید صورت حساب
ClassifyShipped=طبقه بندی تحویل
ClassifyBilled=طبقه بندی صورتحساب
@@ -110,10 +110,10 @@ AuthorRequest=درخواست نویسنده
UseCustomerContactAsOrderRecipientIfExist=اگر به جای آدرس شخص ثالث به عنوان آدرس دریافت کننده منظور تعریف شده استفاده از آدرس ارتباط با مشتری
RunningOrders=سفارشات در فرآیند
UserWithApproveOrderGrant=کاربران داده با "سفارشات تایید" اجازه.
-PaymentOrderRef=پرداخت منظور از%s
+PaymentOrderRef=پرداخت منظور از٪ s
CloneOrder=منظور کلون
-ConfirmCloneOrder=آیا مطمئن هستید که می خواهید به کلون کردن این منظور <b>از%s؟</b>
-DispatchSupplierOrder=دریافت کننده کالا منظور از%s
+ConfirmCloneOrder=آیا مطمئن هستید که می خواهید به کلون کردن این منظور <b>از٪ s؟</b>
+DispatchSupplierOrder=دریافت کننده کالا منظور از٪ s
##### Types de contacts #####
TypeContact_commande_internal_SALESREPFOLL=نماینده سفارش مشتری زیر به بالا
TypeContact_commande_internal_SHIPPING=نماینده زیر را به بالا حمل و نقل
@@ -128,8 +128,8 @@ TypeContact_order_supplier_external_CUSTOMER=منبع تماس با منبع ز
Error_COMMANDE_SUPPLIER_ADDON_NotDefined=COMMANDE_SUPPLIER_ADDON ثابت تعریف نشده
Error_COMMANDE_ADDON_NotDefined=COMMANDE_ADDON ثابت تعریف نشده
-Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=برای بارگذاری ماژول پرونده «%s» شکست خورد
-Error_FailedToLoad_COMMANDE_ADDON_File=برای بارگذاری ماژول پرونده «%s» شکست خورد
+Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=برای بارگذاری ماژول پرونده «٪ s» شکست خورد
+Error_FailedToLoad_COMMANDE_ADDON_File=برای بارگذاری ماژول پرونده «٪ s» شکست خورد
Error_OrderNotChecked=بدون سفارشات به فاکتور انتخاب شده
# Sources
OrderSource0=پیشنهاد تجاری
@@ -154,10 +154,9 @@ OrderByPhone=تلفن
CreateInvoiceForThisCustomer=سفارشات بیل
NoOrdersToInvoice=بدون سفارشات قابل پرداخت
CloseProcessedOrdersAutomatically=طبقه بندی "پردازش" سفارشات همه انتخاب شده است.
-MenuOrdersToBill2=سفارشات به لایحه
OrderCreation=خلقت
Ordered=سفارش داده شده
OrderCreated=سفارشات شما ساخته شده است
OrderFail=خطا در هنگام ایجاد سفارشات شما اتفاق افتاده است
CreateOrders=ایجاد سفارشات
-ToBillSeveralOrderSelectCustomer=برای ایجاد یک فاکتور برای چند دستور، برای اولین بار بر روی مشتری را کلیک کنید، و سپس "%s" را انتخاب کنید.
+ToBillSeveralOrderSelectCustomer=برای ایجاد یک فاکتور برای چند دستور، برای اولین بار بر روی مشتری را کلیک کنید، و سپس "٪ s" را انتخاب کنید.
diff --git a/htdocs/langs/fa_IR/oscommerce.lang b/htdocs/langs/fa_IR/oscommerce.lang
deleted file mode 100644
index a6668b2519fda96bcd5ccdd9c8d153511bf0d38a..0000000000000000000000000000000000000000
--- a/htdocs/langs/fa_IR/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=نظام التشغيل والتجارة
-OSCommerceSetup=نظام تشغيل وحدة التجارة الإعداد
-OSCommerceSetupSaved=التجارة إعداد نظام التشغيل الموفرة
-OSCommerceServer=نظام تشغيل الخادم المضيف التجارة / الملكية الفكرية
-OSCommerceDatabaseName=اسم قاعدة بيانات نظام التشغيل والتجارة
-OSCommercePrefix=نظام التشغيل التجاري بادئة الجداول
-OSCommerceUser=قاعدة بيانات التجارة ادخل نظام التشغيل
diff --git a/htdocs/langs/fa_IR/other.lang b/htdocs/langs/fa_IR/other.lang
index 7b74f9b840a9f8c2cc8fdd5c1498d67ab3a85349..a510a002ae4402838e6e8f7194e6c23da73aee9c 100644
--- a/htdocs/langs/fa_IR/other.lang
+++ b/htdocs/langs/fa_IR/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=کد امنیتی
Calendar=تقویم
-AddTrip=اضافه کردن سفر
Tools=ابزار
ToolsDesc=این منطقه به گروه ابزار دیگر در دسترس را به دیگر نوشته های منو نمی اختصاص یافته است. <br><br> این ابزار را می توانید از منوی سمت رسیده است.
Birthday=جشن تولد
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=ایجاد پروژه
Notify_TASK_CREATE=وظیفه ایجاد
Notify_TASK_MODIFY=وظیفه اصلاح شده
Notify_TASK_DELETE=وظیفه حذف
+SeeModuleSetup=See module setup
NbOfAttachedFiles=تعداد فایل های پیوست / اسناد
TotalSizeOfAttachedFiles=اندازه کل فایل های پیوست / اسناد
MaxSize=حداکثر اندازه
@@ -75,13 +75,23 @@ DemoCompanyShopWithCashDesk=مدیریت یک فروشگاه با یک میز ن
DemoCompanyProductAndStocks=مدیریت یک شرکت کوچک یا متوسط فروش محصولات
DemoCompanyAll=مدیریت یک شرکت کوچک یا متوسط با فعالیت های متعدد (تمام ماژول های اصلی)
GoToDemo=برو به نسخه ی نمایشی
-CreatedBy=ایجاد شده توسط%s
-ModifiedBy=اصلاح شده توسط%s
-ValidatedBy=تایید شده توسط%s
-CanceledBy=لغو شده توسط%s
-ClosedBy=بسته شده توسط%s
-FileWasRemoved=فایل%s حذف شد
-DirWasRemoved=شاخه%s حذف شد
+CreatedBy=ایجاد شده توسط٪ s
+ModifiedBy=اصلاح شده توسط٪ s
+ValidatedBy=تایید شده توسط٪ s
+CanceledBy=لغو شده توسط٪ s
+ClosedBy=بسته شده توسط٪ s
+CreatedById=User id who created
+ModifiedById=User id who made last change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made last change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
+FileWasRemoved=فایل٪ s حذف شد
+DirWasRemoved=شاخه٪ s حذف شد
FeatureNotYetAvailableShort=موجود در نسخه های بعدی
FeatureNotYetAvailable=ویژگی هنوز در این نسخه در دسترس نیست
FeatureExperimental=از ویژگی های تجربی. در این نسخه پایدار نیست
@@ -137,10 +147,10 @@ SizeUnitpoint=نقطه
BugTracker=اشکالات
SendNewPasswordDesc=این فرم به شما اجازه درخواست رمز عبور جدید. از آن خواهد شد به آدرس الکترونیک شما ارسال می کند. <br> تغییر تنها پس از کلیک کردن بر روی لینک تایید در داخل این ایمیل موثر خواهد بود. <br> نرم افزار ایمیل خوان خود را چک کنید.
BackToLoginPage=بازگشت به صفحه ورود
-AuthenticationDoesNotAllowSendNewPassword=نحوه <b>تایید%s است.</b> <br> در این حالت، Dolibarr نمی توانند بفهمند و نه رمز عبور خود را تغییر دهید. <br> تماس با مدیر سیستم شما اگر می خواهید رمز عبور خود را تغییر دهید.
+AuthenticationDoesNotAllowSendNewPassword=نحوه <b>تایید٪ s است.</b> <br> در این حالت، Dolibarr نمی توانند بفهمند و نه رمز عبور خود را تغییر دهید. <br> تماس با مدیر سیستم شما اگر می خواهید رمز عبور خود را تغییر دهید.
EnableGDLibraryDesc=نصب و یا فعال کتابخانه GD با PHP خود را برای استفاده از این گزینه.
EnablePhpAVModuleDesc=شما نیاز به نصب یک ماژول سازگار با آنتی ویروس خود را. (ClamAV درحال: PHP4-clamavlib OU PHP5-clamavlib)
-ProfIdShortDesc=<b>پروفسور کد از%s</b> اطلاعات بسته به کشور های شخص ثالث است. <br> به عنوان مثال، برای <b>کشور٪، این کد٪ بازدید کنندگان</b> است.
+ProfIdShortDesc=<b>پروفسور کد از٪ s</b> اطلاعات بسته به کشور های شخص ثالث است. <br> به عنوان مثال، برای <b>کشور٪، این کد٪ بازدید کنندگان</b> است.
DolibarrDemo=Dolibarr ERP / CRM نسخه ی نمایشی
StatsByNumberOfUnits=آمار در تعدادی از محصولات / خدمات واحد
StatsByNumberOfEntities=آمار در تعداد اشخاص مراجعه کننده
@@ -154,15 +164,15 @@ NumberOfUnitsCustomerOrders=تعداد واحد در سفارش مشتری در
NumberOfUnitsCustomerInvoices=تعداد واحد در صورت حساب مشتری در گذشته 12 ماه
NumberOfUnitsSupplierOrders=تعداد واحد در سفارشات کالا در گذشته 12 ماه
NumberOfUnitsSupplierInvoices=تعداد واحد در فاکتورها منبع در گذشته 12 ماه
-EMailTextInterventionValidated=مداخله%s را دارای اعتبار بوده است.
-EMailTextInvoiceValidated=صورتحساب%s را دارای اعتبار بوده است.
-EMailTextProposalValidated=این پیشنهاد از%s دارای اعتبار بوده است.
-EMailTextOrderValidated=منظور از%s دارای اعتبار بوده است.
-EMailTextOrderApproved=منظور از%s تایید شده است.
-EMailTextOrderApprovedBy=منظور از%s شده توسط%s تایید شده است.
-EMailTextOrderRefused=منظور از%s رد شده است.
-EMailTextOrderRefusedBy=منظور از%s شده توسط%s خودداری کرد.
-EMailTextExpeditionValidated=حمل و نقل از%s دارای اعتبار بوده است.
+EMailTextInterventionValidated=مداخله٪ s را دارای اعتبار بوده است.
+EMailTextInvoiceValidated=صورتحساب٪ s را دارای اعتبار بوده است.
+EMailTextProposalValidated=این پیشنهاد از٪ s دارای اعتبار بوده است.
+EMailTextOrderValidated=منظور از٪ s دارای اعتبار بوده است.
+EMailTextOrderApproved=منظور از٪ s تایید شده است.
+EMailTextOrderApprovedBy=منظور از٪ s شده توسط٪ s تایید شده است.
+EMailTextOrderRefused=منظور از٪ s رد شده است.
+EMailTextOrderRefusedBy=منظور از٪ s شده توسط٪ s خودداری کرد.
+EMailTextExpeditionValidated=حمل و نقل از٪ s دارای اعتبار بوده است.
ImportedWithSet=واردات مجموعه داده
DolibarrNotification=اطلاع رسانی به صورت خودکار
ResizeDesc=عرض جدید <b>OR</b> ارتفاع جدید را وارد کنید. نسبت در طول تغییر اندازه نگه داشته ...
@@ -172,7 +182,7 @@ NewSizeAfterCropping=اندازه های جدید پس از برداشت
DefineNewAreaToPick=تعریف منطقه جدید روی تصویر انتخاب کنید (کلیک چپ بر روی تصویر بکشید تا زمانی که شما رسیدن به گوشه مقابل)
CurrentInformationOnImage=این ابزار برای کمک به شما برای تغییر اندازه و یا برش یک تصویر طراحی شده است. این اطلاعات بر روی تصویر ویرایش شده در حال حاضر است
ImageEditor=ویرایشگر تصویر
-YouReceiveMailBecauseOfNotification=شما این پیام را دریافت خواهید کرد چرا که ایمیل شما به لیست از اهداف به حوادث خاص به٪ نرم افزار از%s را مطلع اضافه شده است.
+YouReceiveMailBecauseOfNotification=شما این پیام را دریافت خواهید کرد چرا که ایمیل شما به لیست از اهداف به حوادث خاص به٪ نرم افزار از٪ s را مطلع اضافه شده است.
YouReceiveMailBecauseOfNotification2=این رویداد به شرح زیر است:
ThisIsListOfModules=این یک لیست از ماژول های از پیش انتخاب شده توسط این مشخصات نسخه ی نمایشی (فقط ماژول های متداول در این نسخه ی نمایشی قابل مشاهده هستند) است. ویرایش این را به یک نسخه ی نمایشی شخصی تر و با کلیک بر روی "شروع".
ClickHere=اینجا را کلیک کنید
@@ -187,31 +197,32 @@ PleaseBePatient=لطفا صبور باشید ...
RequestToResetPasswordReceived=درخواست رمز عبور Dolibarr خود را تغییر دریافت شده است
NewKeyIs=این کلید جدید خود را برای ورود به سایت است
NewKeyWillBe=کلید جدید را برای ورود به نرم افزار خواهد بود
-ClickHereToGoTo=برای رفتن به%s اینجا را کلیک کنید
+ClickHereToGoTo=برای رفتن به٪ s اینجا را کلیک کنید
YouMustClickToChange=با این حال شما باید اول بر روی لینک زیر کلیک کنید تا اعتبار این تغییر رمز عبور
ForgetIfNothing=اگر شما این تغییر را درخواست نکرده، فقط این ایمیل را فراموش کرده ام. اعتبار نامه های شما امن نگهداری می شود.
##### Calendar common #####
-AddCalendarEntry=اضافه کردن ورودی در تقویم از%s
-NewCompanyToDolibarr=شرکت%s را اضافه در Dolibarr
-ContractValidatedInDolibarr=قرارداد٪ بازدید کنندگان معتبر در Dolibarr
-ContractCanceledInDolibarr=قرارداد%s را لغو در Dolibarr
-ContractClosedInDolibarr=قرارداد٪ در Dolibarr بسته
-PropalClosedSignedInDolibarr=پیشنهاد از%s امضا در Dolibarr
-PropalClosedRefusedInDolibarr=پیشنهاد٪ در Dolibarr رد کرد
-PropalValidatedInDolibarr=پیشنهاد از%s معتبر در Dolibarr
-InvoiceValidatedInDolibarr=فاکتور٪ بازدید کنندگان معتبر در Dolibarr
-InvoicePaidInDolibarr=فاکتور%s به پرداخت در Dolibarr تغییر
-InvoiceCanceledInDolibarr=فاکتور%s را لغو در Dolibarr
-PaymentDoneInDolibarr=پرداخت٪ انجام در Dolibarr
-CustomerPaymentDoneInDolibarr=پرداخت مشتری٪ انجام در Dolibarr
-SupplierPaymentDoneInDolibarr=پرداخت کننده٪ انجام در Dolibarr
-MemberValidatedInDolibarr=کاربران از%s معتبر در Dolibarr
-MemberResiliatedInDolibarr=کاربران از%s resiliated در Dolibarr
-MemberDeletedInDolibarr=اعضا%s را حذف شده از Dolibarr
-MemberSubscriptionAddedInDolibarr=اشتراک برای عضو از%s اضافه شده در Dolibarr
-ShipmentValidatedInDolibarr=حمل و نقل از%s معتبر در Dolibarr
-ShipmentDeletedInDolibarr=حمل و نقل از%s حذف شده از Dolibarr
+AddCalendarEntry=اضافه کردن ورودی در تقویم از٪ s
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
##### Export #####
Export=صادرات
ExportsArea=منطقه صادرات
diff --git a/htdocs/langs/fa_IR/paybox.lang b/htdocs/langs/fa_IR/paybox.lang
index 9bfcecfda66eed4204f1c6acd6d0aa23da070d43..68289a6810d8f1929ac2a9564afb407686649c9f 100644
--- a/htdocs/langs/fa_IR/paybox.lang
+++ b/htdocs/langs/fa_IR/paybox.lang
@@ -4,7 +4,7 @@ PayBoxDesc=این ماژول صفحات پیشنهاد به اجازه پردا
FollowingUrlAreAvailableToMakePayments=از آدرس های زیر در دسترس است به ارائه یک صفحه به مشتریان به پرداخت در اشیاء Dolibarr است
PaymentForm=فرم پرداخت
WelcomeOnPaymentPage=در سرویس پرداخت آنلاین ما خوش آمدید
-ThisScreenAllowsYouToPay=این صفحه نمایش به شما اجازه ایجاد پرداخت آنلاین به%s.
+ThisScreenAllowsYouToPay=این صفحه نمایش به شما اجازه ایجاد پرداخت آنلاین به٪ s.
ThisIsInformationOnPayment=این اطلاعات در پرداخت به انجام است
ToComplete=برای تکمیل
YourEMail=ایمیل برای دریافت تاییدیه پرداخت
@@ -14,14 +14,14 @@ PayBoxDoPayment=برو در پرداخت
YouWillBeRedirectedOnPayBox=شما می توانید در صفحه خزانه امن برای ورودی هدایت می شوید اطلاعات کارت اعتباری شما
PleaseBePatient=لطفا صبور باشید
Continue=بعد
-ToOfferALinkForOnlinePayment=URL برای%s پرداخت
+ToOfferALinkForOnlinePayment=URL برای٪ s پرداخت
ToOfferALinkForOnlinePaymentOnOrder=URL برای ارائه٪ رابط کاربری پرداخت آنلاین برای سفارش مشتری
ToOfferALinkForOnlinePaymentOnInvoice=URL برای ارائه٪ رابط کاربری پرداخت آنلاین برای صورتحساب مشتری
ToOfferALinkForOnlinePaymentOnContractLine=URL برای ارائه٪ رابط کاربری پرداخت آنلاین برای قرارداد خط
ToOfferALinkForOnlinePaymentOnFreeAmount=URL برای ارائه٪ رابط کاربری پرداخت آنلاین برای مقدار رایگان
ToOfferALinkForOnlinePaymentOnMemberSubscription=URL برای ارائه٪ رابط کاربری پرداخت آنلاین برای به اشتراک عضو
YouCanAddTagOnUrl=شما همچنین می توانید پارامتر URL <b>و برچسب = <i>مقدار</i></b> را به هر یک از این URL (فقط برای پرداخت رایگان مورد نیاز) برای اضافه کردن خود برچسب توضیحات پرداخت خود اضافه کنید.
-SetupPayBoxToHavePaymentCreatedAutomatically=راه اندازی خزانه خود را با <b>آدرس%s را</b> به پرداخت زمانی که توسط خزانه اعتبار به طور خودکار ساخته.
+SetupPayBoxToHavePaymentCreatedAutomatically=راه اندازی خزانه خود را با <b>آدرس٪ s را</b> به پرداخت زمانی که توسط خزانه اعتبار به طور خودکار ساخته.
YourPaymentHasBeenRecorded=این صفحه تایید می کند که پرداخت شما ثبت شده است. متشکرم.
YourPaymentHasNotBeenRecorded=شما پرداخت ثبت شده است نیست و معامله لغو شده است. متشکرم.
AccountParameter=پارامترهای حساب
@@ -35,3 +35,6 @@ MessageKO=پیام در لغو صفحه بازگشت پرداخت
NewPayboxPaymentReceived=پرداخت خزانه های جدید را دریافت کرد
NewPayboxPaymentFailed=پرداخت خزانه جدید تلاش کردند اما موفق
PAYBOX_PAYONLINE_SENDEMAIL=ایمیل پس از پرداخت برای هشدار دادن به (موفقیت یا شکست خورده)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/fa_IR/resource.lang b/htdocs/langs/fa_IR/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..d64075dfbf595897a63e3eebf19194d8f71030dd
--- /dev/null
+++ b/htdocs/langs/fa_IR/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
diff --git a/htdocs/langs/fa_IR/sendings.lang b/htdocs/langs/fa_IR/sendings.lang
index ad9ad62b6d141e884507f57bbf5275cd3a5875a6..0ecdd9a541a3eba1087de7bd611db094e82928ca 100644
--- a/htdocs/langs/fa_IR/sendings.lang
+++ b/htdocs/langs/fa_IR/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=برای لحظه ای، ایجاد یک محم
RelatedShippings=shippings های مرتبط
ShipmentLine=خط حمل و نقل
CarrierList=فهرست از حمل و نقل
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
# Sending methods
SendingMethodCATCH=گرفتن توسط مشتری
diff --git a/htdocs/langs/fa_IR/stocks.lang b/htdocs/langs/fa_IR/stocks.lang
index 059e4d06e2db684ddc96147c40037f99fbbe4be0..dff23d21bfa927c4d1d963822432ba53e9940f6d 100644
--- a/htdocs/langs/fa_IR/stocks.lang
+++ b/htdocs/langs/fa_IR/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=برچسب انبار مورد نیاز است
CorrectStock=سهام صحیح
ListOfWarehouses=لیست انبار
ListOfStockMovements=فهرست جنبش های سهام
-StocksArea=منطقه سهام
+StocksArea=Warehouses area
Location=محل
LocationSummary=محل نام کوتاه
NumberOfDifferentProducts=تعداد محصولات مختلف
diff --git a/htdocs/langs/fa_IR/users.lang b/htdocs/langs/fa_IR/users.lang
index 45f1d1cd7ae31b1a72d09d094aeb162ba5222fd7..b33a2ba9e1e18d1237b9ed3122acdd921317ff3e 100644
--- a/htdocs/langs/fa_IR/users.lang
+++ b/htdocs/langs/fa_IR/users.lang
@@ -38,7 +38,7 @@ NewUser=کاربر تازه
CreateUser=ساخت کاربر
SearchAGroup=جستجوی یک گروه
SearchAUser=جستجوی یک کاربر
-LoginNotDefined=ادخل ليست محددة.
+LoginNotDefined=ورود به تعریف نیست.
NameNotDefined=اسم غير محدد.
ListOfUsers=لیست کاربران
Administrator=Administrator
@@ -63,7 +63,6 @@ ShowGroup=نمایش گروه
ShowUser=نمایش کاربر
NonAffectedUsers=کاربران غیر اختصاص داده
UserModified=کاربر با موفقیت به اصلاح
-GroupModified=گروه با موفقیت اصلاح شده
PhotoFile=فایل نگاره
UserWithDolibarrAccess=کاربر با دسترسی Dolibarr
ListOfUsersInGroup=لیست کاربران در این گروه
@@ -103,7 +102,7 @@ UserDisabled=کاربر %s ناپویا شد
UserEnabled=کاربر %s پویا شد.
UserDeleted=کاربر %s پاک کشد
NewGroupCreated=گروه %s ساخته شد
-GroupModified=گروه با موفقیت اصلاح شده
+GroupModified=Group %s modified
GroupDeleted=گروه٪ s را حذف
ConfirmCreateContact=آیا مطمئن هستید که می خواهید برای ایجاد یک حساب Dolibarr برای این مخاطب؟
ConfirmCreateLogin=آیا مطمئن هستید که می خواهید برای ایجاد یک حساب Dolibarr برای این عضو؟
@@ -114,8 +113,10 @@ YourRole=roleهای شما
YourQuotaOfUsersIsReached=سهمیه شما از کاربران فعال رسیده است!
NbOfUsers=NB از کاربران
DontDowngradeSuperAdmin=فقط قسمت مدیریت می توانید یک قسمت مدیریت جمع و جور کردن
-HierarchicalResponsible=سلسله مراتبی مسئول
+HierarchicalResponsible=Supervisor
HierarchicView=دیدگاه سلسله مراتبی
UseTypeFieldToChange=استفاده از نوع رشته به تغییر
OpenIDURL=URL OpenID
LoginUsingOpenID=استفاده از حساب کاربری برای ورود به سایت
+WeeklyHours=Weekly hours
+ColorUser=Color of the user
diff --git a/htdocs/langs/fa_IR/withdrawals.lang b/htdocs/langs/fa_IR/withdrawals.lang
index e7d54cdb4669b3b6c24bbb7ee3bbcca193961936..5f527bfefd66cb29935b62cc9d11be8ca507b404 100644
--- a/htdocs/langs/fa_IR/withdrawals.lang
+++ b/htdocs/langs/fa_IR/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=دریافت
LastWithdrawalReceipts=تاریخ و زمان آخرین٪ بازدید کنندگان رسید خروج
WithdrawedBills=فاکتورها خارج
WithdrawalsLines=خطوط برداشت
-RequestStandingOrderToTreat=درخواست دستورات برای درمان ایستاده
-RequestStandingOrderTreated=درخواست دستورات ایستاده درمان
+RequestStandingOrderToTreat=Request for standing orders to process
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=سفارشات ایستاده با مشتری
CustomerStandingOrder=مشتری منظور ایستاده
NbOfInvoiceToWithdraw=نیوبیوم. از فاکتور با برداشت درخواست
@@ -40,14 +41,13 @@ TransMetod=طريقة البث
Send=فرستادن
Lines=خطوط
StandingOrderReject=شماره رد
-InvoiceRefused=فاکتور خودداری کرد
WithdrawalRefused=برداشت خودداری کرد
WithdrawalRefusedConfirm=آیا مطمئن هستید که می خواهید را وارد کنید رد عقب نشینی برای جامعه
RefusedData=تاریخ رد
RefusedReason=دلیلی برای رد
RefusedInvoicing=حسابداری رد
NoInvoiceRefused=آیا رد اتهام نیست
-InvoiceRefused=فاکتور خودداری کرد
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=وضعیت
StatusUnknown=ناشناخته
StatusWaiting=انتظار
@@ -76,7 +76,7 @@ WithBankUsingRIB=برای حساب های بانکی با استفاده از RI
WithBankUsingBANBIC=برای حساب های بانکی با استفاده از IBAN / BIC / SWIFT
BankToReceiveWithdraw=حساب بانکی برای دریافت خارج
CreditDate=در اعتباری
-WithdrawalFileNotCapable=قادر به تولید خروج فایل رسید برای کشور شما
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
ShowWithdraw=نمایش برداشت
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=با این حال، اگر فاکتور حداقل یک عقب نشینی پرداخت هنوز پردازش نشده، آن را مجموعه ای به عنوان پرداخت می شود اجازه می دهد تا مدیریت خروج قبل.
DoStandingOrdersBeforePayments=در این تب شما اجازه می دهد به درخواست حکم ایستاده. پس از آن کامل شده است، شما می توانید پرداخت تایپ برای بستن صورتحساب.
@@ -86,11 +86,11 @@ ThisWillAlsoAddPaymentOnInvoice=این نیز خواهد پرداخت به فا
### Notifications
InfoCreditSubject=پرداخت سفارش ثابت٪ توسط بانک
-InfoCreditMessage=منظور ایستاده٪ بازدید کنندگان شده است توسط بانک پرداخت می شود <br> اطلاعات پرداخت:%s را
+InfoCreditMessage=منظور ایستاده٪ بازدید کنندگان شده است توسط بانک پرداخت می شود <br> اطلاعات پرداخت:٪ s را
InfoTransSubject=انتقال ایستاده منظور٪ به بانک
-InfoTransMessage=منظور ایستاده%s بر به بانک توسط%s%s ارسال شد. <br><br>
-InfoTransData=مقدار:%s را <br> روش: از%s <br> تاریخ:%s را
+InfoTransMessage=منظور ایستاده٪ s بر به بانک توسط٪ s٪ s ارسال شد. <br><br>
+InfoTransData=مقدار:٪ s را <br> روش: از٪ s <br> تاریخ:٪ s را
InfoFoot=این یک پیام خودکار ارسال شده توسط Dolibarr است
InfoRejectSubject=منظور ایستاده خودداری کرد
-InfoRejectMessage=سلام، <br><br> به ترتیب ایستاده از فاکتور%s را مربوط به شرکت٪، با میزان٪ بازدید کنندگان شده است توسط بانک خودداری کرد. <br><br> - <br> از%s
+InfoRejectMessage=سلام، <br><br> به ترتیب ایستاده از فاکتور٪ s را مربوط به شرکت٪، با میزان٪ بازدید کنندگان شده است توسط بانک خودداری کرد. <br><br> - <br> از٪ s
ModeWarning=انتخاب برای حالت واقعی تنظیم نشده بود، ما بعد از این شبیه سازی را متوقف کند
diff --git a/htdocs/langs/fi_FI/accountancy.lang b/htdocs/langs/fi_FI/accountancy.lang
index 8cab9d2b651d75b0721d76fda619e2034e4509b4..39c2732ec29852cf93d41614ed1812c2a4c1ce4f 100644
--- a/htdocs/langs/fi_FI/accountancy.lang
+++ b/htdocs/langs/fi_FI/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts
Validate=Validate
Addanaccount=Add an accounting account
AccountAccounting=Accounting account
-Ventilation=Ventilation
+Ventilation=Breakdown
ToDispatch=To dispatch
Dispatched=Dispatched
-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
TradeMargin=Trade margin
Reports=Reports
ByCustomerInvoice=By invoices customers
@@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger
Bookkeeping=General ledger
AccountBalanceByMonth=Account balance by month
-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
Line=Line
CAHTF=Total purchase supplier HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice
IntoAccount=In the accounting account
Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
+VentilationAuto=Automatic breakdown
Processing=Processing
EndProcessing=The end of processing
@@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account
ACCOUNTING_SEPARATORCSV=Separator CSV
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
@@ -140,14 +140,14 @@ Active=Statement
NewFiscalYear=New fiscal year
-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
TotalVente=Total turnover HT
TotalMarge=Total sales margin
DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
ChangeAccount=Change the accounting account for lines selected by the account:
Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
@@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically
ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index fd74d1ebe1b2dac448142220ec13f3aa8fd1ab90..43df8c5feb89096f30347c6d11dcb6cc3a5a3d32 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -437,8 +437,8 @@ Module52Name=Varastot
Module52Desc=Varastojen hallinnan tuotteet
Module53Name=Palvelut
Module53Desc=Palvelut hallinto
-Module54Name=Sopimukset
-Module54Desc=Sopimukset "ja palvelujen hallinta
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=Viivakoodi
Module55Desc=Viivakoodi hallinto
Module56Name=Puhelimet
@@ -475,8 +475,8 @@ Module320Name=RSS Feed
Module320Desc=Lisää RSS-syöte sisällä Dolibarr näytön sivuilla
Module330Name=Kirjanmerkit
Module330Desc=Kirjanmerkit hallinto
-Module400Name=Projektit
-Module400Desc=Hankkeiden hallinnointia sisällä muiden moduulien
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=Webcalendar
Module410Desc=Webcalendar yhdentyminen
Module500Name=Special expenses (tax, social contributions, dividends)
@@ -484,7 +484,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di
Module510Name=Salaries
Module510Desc=Management of employees salaries and payments
Module600Name=Ilmoitukset
-Module600Desc=Lähetä ilmoitukset (sähköposti) on Dolibarr liiketoiminnan tapahtumat
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Lahjoitukset
Module700Desc=Lahjoitukset hallinto
Module1200Name=Mantis
@@ -514,16 +514,16 @@ Module5000Name=Multi-yhtiö
Module5000Desc=Avulla voit hallita useita yrityksiä
Module6000Name=Workflow
Module6000Desc=Workflow management
-Module20000Name=Holidays
-Module20000Desc=Declare and follow employees holidays
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
Module39000Name=Product batch
Module39000Desc=Batch number, eat-by and sell-by date management on products
Module50000Name=Paybox
Module50000Desc=Moduuli tarjoaa online-maksu sivun luottokortti Paybox
Module50100Name=Kassa
Module50100Desc=Kassa-moduuli
-Module50200Name= Paypal
-Module50200Desc= Moduuli tarjoaa online-maksu-sivulla luottokortilla PayPal
+Module50200Name=Paypal
+Module50200Desc=Moduuli tarjoaa online-maksu-sivulla luottokortilla PayPal
Module50400Name=Accounting (advanced)
Module50400Desc=Accounting management (double parties)
Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=Lue pysyvän tilaukset
Permission152=Setup pysyvän tilaukset
Permission153=Lue pysyvän tilaukset kuitit
Permission154=Luotto / kieltäytyä toistuvaissuoritukset kuitit
-Permission161=Lue sopimukset
-Permission162=Luoda / muuttaa sopimuksia
-Permission163=Ota palvelua koskeva sopimus
-Permission164=Poista palvelua koskeva sopimus
-Permission165=Poista sopimukset
-Permission171=Lue matkat
-Permission172=Luoda / muuttaa matkat
-Permission173=Poista matkoja
-Permission178=Vienti matkat
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Read trips and expenses (own and his subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
Permission180=Lue toimittajat
Permission181=Lue toimittaja tilaukset
Permission182=Luoda / muuttaa toimittajan tilaukset
@@ -671,7 +672,7 @@ Permission300=Lue viivakoodin
Permission301=Luoda / muuttaa viivakoodin
Permission302=Poista viivakoodin
Permission311=Lue palvelut
-Permission312=Määritä palvelun sopimus
+Permission312=Assign service/subscription to contract
Permission331=Lue kirjanmerkit
Permission332=Luoda / muuttaa kirjanmerkkejä
Permission333=Poista kirjanmerkkien
@@ -701,8 +702,8 @@ Permission701=Lue lahjoitukset
Permission702=Luoda / muuttaa lahjoitusten
Permission703=Poista lahjoitukset
Permission1001=Lue varastot
-Permission1002=Luoda / muuttaa varastot
-Permission1003=Poista varastot
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=Lue varastossa liikkeitä
Permission1005=Luoda / muuttaa varastossa liikkeitä
Permission1101=Lue lähetysluetteloihin
@@ -1038,7 +1039,6 @@ YesInSummer=Yes in summer
OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
SuhosinSessionEncrypt=Session storage encrypted by Suhosin
ConditionIsCurrently=Condition is currently %s
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
YouUseBestDriver=You use driver %s that is best driver available currently.
YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=Paluu kirjanpitoyrityksen koodi rakentanut %s, jota se
ModuleCompanyCodePanicum=Palata tyhjään kirjanpitotietojen koodi.
ModuleCompanyCodeDigitaria=Kirjanpito-koodi riippuu kolmannen osapuolen koodi. Koodi koostuu merkin "C" ensimmäisessä kanta seurasi ensimmäisen 5 merkkiä kolmannen osapuolen koodi.
UseNotifications=Käytä ilmoitukset
-NotificationsDesc=Ilmoitusten avulla voit hiljaa lähettää automaattisia sähköposti, joidenkin Dolibarr tapahtumat, yrityksille, jotka on määritetty
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
ModelModules=Asiakirjat mallit
DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
WatermarkOnDraft=Vesileima asiakirjaluonnos
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=Lisää toimituspäivää kyky
UseOptionLineIfNoQuantity=Rivi tuotteen / palvelun nolla määrä pidetään vaihtoehto
FreeLegalTextOnProposal=Vapaa tekstihaku kaupallisiin ehdotuksia
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=Tilaukset hallinto-setup
OrdersNumberingModules=Tilaukset numerointiin modules
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list
ValidOrderAfterPropalClosed=Validoimiseksi tilauksen jälkeen ehdotus lähempänä, on mahdollista olla askel väliaikaisen jotta
FreeLegalTextOnOrders=Vapaa tekstihaku tilauksissa
WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
##### Clicktodial #####
ClickToDialSetup=Napsauttamalla Dial-moduulin asetukset
ClickToDialUrlDesc=Url kutsutaan kun napsautat puhelimen picto on tehty. Dans l'url, vous pouvez käytä les baliiseja <br> <b>%% 1 $ s</b> qui seerumien remplac par le tlphone de <b>l'appelbr>%%</b> 2 $ s qui seerumien remplac par le tlphone de l'appelant (le votre) <br> <b>%% 3 $ s</b> qui seerumien remplac par votre sisäänkirjoittautumissivuksesi clicktodial (dfini sur votre fiche utilisateur) <br> <b>%% 4</b> $ s qui seerumien remplac par votre mot de elähtänyt clicktodial (dfini sur votre fiche utilisateur).
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=Väliintulo numerointiin modules
TemplatePDFInterventions=Väliintulo kortin asiakirjojen malleja
WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
##### Contracts #####
-ContractsSetup=Sopimukset moduuli setup
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=Sopimukset numerointi moduulit
TemplatePDFContracts=Contracts documents models
FreeLegalTextOnContracts=Free text on contracts
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
CacheByServer=Cache by server
CacheByClient=Cache by browser
CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=Tuotteet Moduuli setup
ServiceSetup=Services-moduuli asennus
@@ -1382,9 +1384,10 @@ MailingSetup=Sähköpostituksen moduulin asetukset
MailingEMailFrom=Sender EMail (From) sähköpostiviestit lähetetään sähköpostitse moduuli
MailingEMailError=Return Sähköpostiosoite (Virheet-to) koskevat sähköpostit virheistä
##### Notification #####
-NotificationSetup=Mailing moduulin asetukset
+NotificationSetup=EMail notification module setup
NotificationEMailFrom=Sender EMail (From) sähköpostiviestit lähetetään ilmoitukset
-ListOfAvailableNotifications=Luettelo käytettävissä olevista ilmoituksista (Tämä luettelo riippuu aktivoitujen moduulit)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
##### Sendings #####
SendingsSetup=Lähetysvalinnat-moduulin asetukset
SendingsReceiptModel=Lähettävä vastaanottanut malli
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=Yhteys palvelimeen ' %s' on tietokanta' %s' kanssa käyttäjä
OSCommerceTestKo1=Yhteys palvelimeen ' %s' onnistua mutta tietokanta' %s' ei tavoitettu.
OSCommerceTestKo2=Yhteys palvelimeen ' %s' kanssa käyttäjä' %s' failed.
##### Stock #####
-StockSetup=Kokoonpano moduuli varastossa
-UserWarehouse=Käytä käyttäjän henkilökohtaisia varastot
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=Valikko poistettu
TreeMenu=Tree valikot
@@ -1478,11 +1482,14 @@ ClickToDialDesc=Tämän moduulin avulla voidaan lisätä kuvake jälkeen puhelin
##### Point Of Sales (CashDesk) #####
CashDesk=Point of myynti
CashDeskSetup=Kassa-moduulin asetukset
-CashDeskThirdPartyForSell=Generic kolmas osapuoli käyttää myy
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Rahat tilille käyttää myy
CashDeskBankAccountForCheque= Tilin käyttö vastaanottaa maksuja sekillä
CashDeskBankAccountForCB= Tilin käyttö voidaan saada käteismaksujen luottokorttia
-CashDeskIdWareHouse=Datawarehous käyttäjän ja myy
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Kirjanmerkin moduulin asetukset
BookmarkDesc=Tämän moduulin avulla voit hallita kirjanmerkkejä. Voit myös lisätä linkkejä mihin tahansa Dolibarr sivuja tai externale webbisivuilta vasemmalla valikossa.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Delete fiscal year
ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
Opened=Opened
Closed=Closed
-
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
diff --git a/htdocs/langs/fi_FI/agenda.lang b/htdocs/langs/fi_FI/agenda.lang
index 552a7ccfae1943f86c2e9493c29417f49acd930c..e5976e31938515604d23ded957ab5b1e59474d52 100644
--- a/htdocs/langs/fi_FI/agenda.lang
+++ b/htdocs/langs/fi_FI/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= Automaattinen täyttö Esityslistan
AgendaAutoActionDesc= Määritä tässä tapahtumia joihin haluat Dolibarr luoda automaattisesti toimia asialistalla. Jos mitään ei tarkastettu (oletuksena), vain ruumiillisen toimien on oltava mukana esityslistalla.
AgendaSetupOtherDesc= Tämän sivun avulla määrittää muita muuttujia Esityslistan moduuli.
AgendaExtSitesDesc=Tällä sivulla voit ilmoittaa ulkoisten kalenterien näkemään tapahtumiin otetaan Dolibarr asialistalle.
-ActionsEvents= Tapahtumat, joista Dolibarr luo toimia esityslistan automaattisesti
-PropalValidatedInDolibarr= Ehdotus validoitava
-InvoiceValidatedInDolibarr= Laskun validoitava
+ActionsEvents=Tapahtumat, joista Dolibarr luo toimia esityslistan automaattisesti
+PropalValidatedInDolibarr=Ehdotus validoitava
+InvoiceValidatedInDolibarr=Laskun validoitava
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=Laskun %s palata luonnos tila
InvoiceDeleteDolibarr=Invoice %s deleted
OrderValidatedInDolibarr= Tilaa validoitava
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Tilaa %s hyväksytty
OrderRefusedInDolibarr=Order %s refused
OrderBackToDraftInDolibarr=Tilaa %s palata luonnos tila
OrderCanceledInDolibarr=Tilaus %s peruutettu
-InterventionValidatedInDolibarr=Intervention %s validoitu
ProposalSentByEMail=Liiketoimintaehdotukset %s lähetetään sähköpostilla
OrderSentByEMail=Asiakas tilaa %s lähetetään sähköpostilla
InvoiceSentByEMail=Asiakas lasku %s lähetetään sähköpostilla
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=Toimittaja järjestys %s lähetetään sähköpostilla
SupplierInvoiceSentByEMail=Toimittaja lasku %s lähetetään sähköpostilla
ShippingSentByEMail=Toimitus %s lähetetään sähköpostilla
ShippingValidated= Shipping %s validated
-InterventionSentByEMail=Intervention %s lähetetään sähköpostilla
-InterventionClassifiedBilled=Intervention %s classified as Billed
NewCompanyToDolibarr= Kolmannen osapuolen luonut
DateActionPlannedStart= SUUNNITELTU ALKAMISPÄIVÄ
DateActionPlannedEnd= Suunniteltu lopetuspäivämäärää
@@ -70,9 +68,9 @@ DateActionStart= Aloituspäivämäärä
DateActionEnd= Lopetuspäivä
AgendaUrlOptions1=Voit myös lisätä seuraavat parametrit suodattaa output:
AgendaUrlOptions2=<b>login=<b>login= %s</b> rajoittaa tuotannon toimiin luotu, vaikuttaa tavalla tai tehdä <b>käyttäjä %s.</b>
-AgendaUrlOptions3=<b>logina=<b>logina= %s</b> rajoittaa tuotannon toimiin luotu <b>käyttäjän %s.</b>
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
AgendaUrlOptions4=<b>logint=<b>logint= %s</b> rajoittaa tuotannon toimet vaikuttavat <b>käyttäjän %s.</b>
-AgendaUrlOptions5=<b>logind=<b>sisäänkirj= %s</b> rajoittaa tuotannon toimet tehdään <b>käyttäjän %s.</b>
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
AgendaShowBirthdayEvents=Näytä syntymäpäivä yhteyksiä
AgendaHideBirthdayEvents=Piilota syntymäpäivä yhteyksiä
Busy=Busy
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=URL päästä. ICal-tiedostona
ExtSiteNoLabel=Ei kuvausta
WorkingTimeRange=Working time range
WorkingDaysRange=Working days range
-AddEvent=Add event
+AddEvent=Create event
MyAvailability=My availability
diff --git a/htdocs/langs/fi_FI/bills.lang b/htdocs/langs/fi_FI/bills.lang
index 1c3b5c7abb91b001ab9814450cdc4f05e6156f3e..81d6e4b52ba298039b6c80fd3fcc561b70b74c26 100644
--- a/htdocs/langs/fi_FI/bills.lang
+++ b/htdocs/langs/fi_FI/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Menoilmoitus
InvoiceAvoirAsk=Menoilmoitus korjata laskun
InvoiceAvoirDesc=<b>Luoton merkintä</b> on negatiivinen lasku käytetään ratkaista se, että lasku on määrä, joka on erilainen kuin määrä todella maksetaan (koska asiakas maksanut liikaa virheitä, tai ei maksanut kokonaan, koska hän palasi joitakin tuotteita esimerkiksi). <br><br> Huomautus: Alkuperäinen lasku on jo päättynyt ( "maksetaan" tai "maksetaan osittain"), jonka avulla luodaan menoilmoitus sitä.
invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
-invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
ReplaceInvoice=Korvaa laskun %s
ReplacementInvoice=Korvaus lasku
ReplacedByInvoice=Korvaaminen laskun %s
@@ -87,7 +87,7 @@ ClassifyCanceled=Luokittele "Hylätty"
ClassifyClosed=Luokittele "Suljettu"
ClassifyUnBilled=Classify 'Unbilled'
CreateBill=Luo lasku
-AddBill=Lisää laskun tai menoilmoitus
+AddBill=Create invoice or credit note
AddToDraftInvoices=Add to draft invoice
DeleteBill=Poista lasku
SearchACustomerInvoice=Haku asiakkaan laskussa
@@ -99,7 +99,7 @@ DoPaymentBack=Onko maksaminen takaisin
ConvertToReduc=Muunna tulevaisuudessa edullisista
EnterPaymentReceivedFromCustomer=Kirjoita maksun saanut asiakas
EnterPaymentDueToCustomer=Tee maksun asiakkaan
-DisabledBecauseRemainderToPayIsZero=Disabled koska jäävä palkka on nolla
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
Amount=Määrä
PriceBase=Hinta base
BillStatus=Laskun tila
@@ -137,8 +137,6 @@ BillFrom=Mistä
BillTo=Billistä
ActionsOnBill=Toimet lasku
NewBill=Uusi lasku
-Prélèvements=Kestotilaus
-Prélèvements=Kestotilaus
LastBills=Viimeisin %s laskut
LastCustomersBills=Viimeisin %s asiakkaiden laskut
LastSuppliersBills=Viimeisin %s tavarantoimittajien laskut
@@ -156,9 +154,9 @@ ConfirmCancelBill=Oletko varma, että haluat peruuttaa <b>laskun %s?</b>
ConfirmCancelBillQuestion=Miksi haluat luokitella tämän kauppalaskuilmoituksen "hylätty"?
ConfirmClassifyPaidPartially=Oletko varma, että haluat muuttaa <b>laskun %s</b> tila maksetaan?
ConfirmClassifyPaidPartiallyQuestion=Tämä lasku ei ole maksanut kokonaan. Mitkä ovat syyt voit sulkea tämän laskun?
-ConfirmClassifyPaidPartiallyReasonAvoir=Jäävä palkka <b>( %s %s)</b> on alennus myönnettiin, koska maksu suoritettiin ennen aikavälillä. I säännönmukaistaa alv luotto-merkintä.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Jäävä palkka <b>( %s %s)</b> on alennus myönnettiin, koska maksu suoritettiin ennen aikavälillä. Hyväksyn menettää alv-alennusta.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Jäävä palkka <b>( %s %s)</b> on alennus myönnettiin, koska maksu suoritettiin ennen aikavälillä. I perittävä alv-alennus ilman luotto-merkintä.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
ConfirmClassifyPaidPartiallyReasonBadCustomer=Huono asiakas
ConfirmClassifyPaidPartiallyReasonProductReturned=Tuotteet osittain palautettu
ConfirmClassifyPaidPartiallyReasonOther=Määrä luovuttamiseen muu syy
@@ -191,9 +189,9 @@ AlreadyPaid=Jo maksanut
AlreadyPaidBack=Already paid back
AlreadyPaidNoCreditNotesNoDeposits=On jo maksettu (ilman hyvityslasku ja talletukset)
Abandoned=Hylätyt
-RemainderToPay=Jäävä palkka
-RemainderToTake=Jäävä ottaa
-RemainderToPayBack=Remainder to pay back
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
Rest=Pending
AmountExpected=Määrä väitti
ExcessReceived=Trop Peru
@@ -219,19 +217,18 @@ NoInvoice=N: o lasku
ClassifyBill=Luokittele lasku
SupplierBillsToPay=Tavarantoimittajat laskut maksaa
CustomerBillsUnpaid=Maksamattomat asiakkaiden laskut
-DispenseMontantLettres=Les valmistaa rdiges par procdsmcanographiques sont vapauttaa de l'arrt en lettres
-DispenseMontantLettres=Les valmistaa rdiges par procdsmcanographiques sont vapauttaa de l'arrt en lettres
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=Ei-korvattaviksi
SetConditions=Aseta maksuehdot
SetMode=Aseta maksun tila
Billed=Laskutetun
-RepeatableInvoice=Ennalta määriteltyjen lasku
-RepeatableInvoices=Ennalta määriteltyjen laskut
-Repeatable=Ennalta määriteltyjen
-Repeatables=Ennalta määriteltyjen
-ChangeIntoRepeatableInvoice=Muuntavat ennalta määriteltyjen
-CreateRepeatableInvoice=Luo ennalta määriteltyjen lasku
-CreateFromRepeatableInvoice=Luo ennalta määriteltyjen lasku
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
CustomersInvoicesAndInvoiceLines=Asiakas laskut ja laskujen "linjat
CustomersInvoicesAndPayments=Asiakas laskut ja maksut
ExportDataset_invoice_1=Asiakas laskujen luettelo ja laskut "linjat
diff --git a/htdocs/langs/fi_FI/categories.lang b/htdocs/langs/fi_FI/categories.lang
index 2ecd727bd47849cb0805c571329b66f48149fbbc..7fcb659df3bd5c0350bab849d0b74973d1c83566 100644
--- a/htdocs/langs/fi_FI/categories.lang
+++ b/htdocs/langs/fi_FI/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories
CatCusLinks=Links between customers/prospects and categories
CatProdLinks=Links between products/services and categories
CatMemberLinks=Links between members and categories
-CatProdLinks=Links between products/services and categories
-CatCusLinks=Links between customers/prospects and categories
-CatSupLinks=Links between suppliers and categories
DeleteFromCat=Remove from category
DeletePicture=Picture delete
ConfirmDeletePicture=Confirm picture deletion?
@@ -112,3 +109,4 @@ CategoriesSetup=Categories setup
CategorieRecursiv=Link with parent category automatically
CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category
diff --git a/htdocs/langs/fi_FI/compta.lang b/htdocs/langs/fi_FI/compta.lang
index 24aeaa3bf4dd5db7fa4db520b6b972876e4c79b6..35ca76fe5a47ecd285f35fd83bd4fce567a2c7b9 100644
--- a/htdocs/langs/fi_FI/compta.lang
+++ b/htdocs/langs/fi_FI/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad asiakas kirjanpitotietojen koodi %s
SuppliersProductsSellSalesTurnover=Luotu liikevaihto myynti toimittajien tuotteita.
CheckReceipt=Tarkista tallettaa
CheckReceiptShort=Tarkista tallettaa
+LastCheckReceiptShort=Last %s check receipts
NewCheckReceipt=Uusi edullisista
NewCheckDeposit=Uusi tarkistaa talletus
NewCheckDepositOn=Uusi tarkistaa talletuksen huomioon: %s
diff --git a/htdocs/langs/fi_FI/contracts.lang b/htdocs/langs/fi_FI/contracts.lang
index 34a4b58869210cb9d3f324ff2dfc18968b412415..2086a0d1c27bbf8600280d94c938e15ea7d8965d 100644
--- a/htdocs/langs/fi_FI/contracts.lang
+++ b/htdocs/langs/fi_FI/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Sopimukset alueella
ListOfContracts=Luetteloa sopimuksista
-LastContracts=Viimeisin %s muunnettu sopimukset
+LastModifiedContracts=Last %s modified contracts
AllContracts=Kaikki sopimukset
ContractCard=Sopimus-kortti
ContractStatus=Sopimus asema
@@ -27,7 +27,7 @@ MenuRunningServices=Käynnissä olevat palvelut
MenuExpiredServices=Lakkaa palvelut
MenuClosedServices=Suljettu palvelut
NewContract=Uusi sopimus
-AddContract=Lisää sopimuksen
+AddContract=Create contract
SearchAContract=Haku sopimuksen
DeleteAContract=Poista sopimuksen
CloseAContract=Sulje sopimuksen
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Luettelo käynnissä sopimuksen linjat
ListOfRunningServices=Luettelo käynnissä olevat palvelut
NotActivatedServices=Ei aktivoitu palvelut (muun muassa validoitava sopimukset)
BoardNotActivatedServices=Palvelut aktivoida kesken validoitava sopimukset
-LastContracts=Viimeisin %s muunnettu sopimukset
+LastContracts=Last % contracts
LastActivatedServices=Viimeisin %s aktivoitu palvelut
LastModifiedServices=Viimeisin %s muunnettu palvelut
EditServiceLine=Muokkaa palvelulinja
diff --git a/htdocs/langs/fi_FI/cron.lang b/htdocs/langs/fi_FI/cron.lang
index ba1942578e4b6071144bb1b3574e279acbec496f..597852e41b8bc159f0c9f157e3869fc8d3a0d692 100644
--- a/htdocs/langs/fi_FI/cron.lang
+++ b/htdocs/langs/fi_FI/cron.lang
@@ -18,9 +18,8 @@ CronExplainHowToRunUnix=Unix ympäristössä sinun tulee käyttää crontabia aj
CronExplainHowToRunWin=Microsoft(tm) Windows ympäristössä voit käyttää ajastetut tehtävät -työkalua ajaaksesi komentorivin minuuteittain
# Menu
CronJobs=Scheduled jobs
-CronListActive= Aktiivisten tehtävien lista
-CronListInactive= Hylättyjen tehtävien lista
-CronListActive= Aktiivisten tehtävien lista
+CronListActive=List of active/scheduled jobs
+CronListInactive=Hylättyjen tehtävien lista
# Page list
CronDateLastRun=Viimeinen ajo
CronLastOutput=Viimeisen ajon tulostus
diff --git a/htdocs/langs/fi_FI/donations.lang b/htdocs/langs/fi_FI/donations.lang
index 81e404b0520a6e984f5bbd9a64ce78f5648cb3ae..85d041a84cf995e1e9861fb498a5f0e3105fd21f 100644
--- a/htdocs/langs/fi_FI/donations.lang
+++ b/htdocs/langs/fi_FI/donations.lang
@@ -4,7 +4,7 @@ Donations=Lahjoitukset
DonationRef=Donation ref.
Donor=Rahoittajien
Donors=Luovuttajat
-AddDonation=Lisää lahjoitus
+AddDonation=Create a donation
NewDonation=Uusi lahjoitus
ShowDonation=Show donation
DonationPromise=Gift lupaus
@@ -31,3 +31,8 @@ DonationRecipient=Donation recipient
ThankYou=Thank You
IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
MinimumAmount=Minimum amount is %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/fi_FI/externalsite.lang b/htdocs/langs/fi_FI/externalsite.lang
index 2f417fb2da951fc52aaff246ea603244e6fde522..565918db18feb7d97738e29a8820ec00cae0dd1d 100644
--- a/htdocs/langs/fi_FI/externalsite.lang
+++ b/htdocs/langs/fi_FI/externalsite.lang
@@ -2,3 +2,4 @@
ExternalSiteSetup=Setup linkki ulkoiseen sivustoon
ExternalSiteURL=Ulkoisen sivuston osoite (URL)
ExternalSiteModuleNotComplete=Ulkoisen sivuston Moduuli ei ole oikein konfiguroitu.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/fi_FI/holiday.lang b/htdocs/langs/fi_FI/holiday.lang
index e65cdff6f7675f8b855d22ba72d8f1188f3a2a89..67fd6390553fefaf20fd34e9d1b1a812ccb73468 100644
--- a/htdocs/langs/fi_FI/holiday.lang
+++ b/htdocs/langs/fi_FI/holiday.lang
@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
CantCreateCP=You don't have the right to make leave requests.
InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=Päivittää
CantUpdate=You cannot update this leave request.
NoDateDebut=You must select a start date.
NoDateFin=You must select an end date.
-ErrorDureeCP=Your request for holidays does not contain working day.
-TitleValidCP=Approve the request holidays
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
ConfirmValidCP=Are you sure you want to approve the leave request?
DateValidCP=Date approved
TitleToValidCP=Send leave request
ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the request holidays
+TitleRefuseCP=Refuse the leave request
ConfirmRefuseCP=Are you sure you want to refuse the leave request?
NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
+TitleCancelCP=Cancel the leave request
ConfirmCancelCP=Are you sure you want to cancel the leave request?
DetailRefusCP=Reason for refusal
DateRefusCP=Date of refusal
@@ -78,7 +77,7 @@ ActionByCP=Performed by
UserUpdateCP=For the user
PrevSoldeCP=Previous Balance
NewSoldeCP=New Balance
-alreadyCPexist=A request for holidays has already been done on this period.
+alreadyCPexist=A leave request has already been done on this period.
UserName=Nimi
Employee=Employee
FirstDayOfHoliday=First day of vacation
@@ -88,25 +87,25 @@ ManualUpdate=Manual update
HolidaysCancelation=Leave request cancelation
## Configuration du Module ##
-ConfCP=Configuration of holidays module
+ConfCP=Configuration of leave request module
DescOptionCP=Description of the option
ValueOptionCP=Value
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
UpdateConfCPOK=Updated successfully.
ErrorUpdateConfCP=An error occurred during the update, please try again.
-AddCPforUsers=Please add the balance of holidays of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
Module27130Name= Management of leave requests
Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
TitleOptionEventCP=Settings of leave requets for events
ValidEventCP=Validate
UpdateEventCP=Update events
diff --git a/htdocs/langs/fi_FI/interventions.lang b/htdocs/langs/fi_FI/interventions.lang
index e2d0c226b5b0209aab8af6759ee924d132d56942..672722c112af718be2e36f003e63b38fd3395077 100644
--- a/htdocs/langs/fi_FI/interventions.lang
+++ b/htdocs/langs/fi_FI/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Väliintulo
Interventions=Interventions
InterventionCard=Interventio-kortti
NewIntervention=Uusi
-AddIntervention=Lisää interventioelimen
+AddIntervention=Create intervention
ListOfInterventions=Luettelo interventioiden
EditIntervention=Editer interventioelimen
ActionsOnFicheInter=Toimia interventio
@@ -30,6 +30,15 @@ StatusInterInvoiced=Laskutetaan
RelatedInterventions=Liittyvissä toimissa
ShowIntervention=Näytä interventio
SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Edustajan seuraamaan interventioelimen
TypeContact_fichinter_internal_INTERVENING=Sääntely
diff --git a/htdocs/langs/fi_FI/mails.lang b/htdocs/langs/fi_FI/mails.lang
index cbaac35666db4e9207f2a96f89e66b0b07491bd0..59a4f74abc8a9a3e408fecf5fa011fff660210e4 100644
--- a/htdocs/langs/fi_FI/mails.lang
+++ b/htdocs/langs/fi_FI/mails.lang
@@ -115,7 +115,7 @@ SentBy=Lähettänyt
MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
MailingNeedCommand2=Voit kuitenkin lähettää ne online lisäämällä parametri MAILING_LIMIT_SENDBYWEB kanssa arvo max määrä sähköpostit haluat lähettää istunnossa.
ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=Tyhjennä lista
ToClearAllRecipientsClickHere=Voit tyhjentää vastaanottajien luetteloon tässä sähköpostitse napsauttamalla painiketta
ToAddRecipientsChooseHere=Jos haluat lisätä vastaanottajia, valitse niissä luetellaan
@@ -133,6 +133,9 @@ Notifications=Ilmoitukset
NoNotificationsWillBeSent=Ei sähköposti-ilmoituksia on suunniteltu tähän tapahtumaan ja yritys
ANotificationsWillBeSent=1 ilmoituksesta lähetetään sähköpostitse
SomeNotificationsWillBeSent=%s ilmoitukset lähetetään sähköpostitse
-AddNewNotification=Ota uusi ilmoitus pyynnöstä
-ListOfActiveNotifications=Listaa kaikki aktiiviset ilmoitukset pyynnöt
+AddNewNotification=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
ListOfNotificationsDone=Listaa kaikki sähköposti-ilmoitukset lähetetään
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang
index ca7f338003c49c1f3be1b86e0383774448c62cf8..6a9d1d51cdaf0b46ef1e876b6e7bc6266d25e971 100644
--- a/htdocs/langs/fi_FI/main.lang
+++ b/htdocs/langs/fi_FI/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Ei onnistunut löytämään <b>käyttäjä
ErrorNoVATRateDefinedForSellerCountry=Virhe ei alv määritellään maa ' %s'.
ErrorNoSocialContributionForSellerCountry=Virhe, ei sosiaaliturvamaksujen tyyppi määritellään maan %s ".
ErrorFailedToSaveFile=Virhe, ei tallenna tiedosto.
-ErrorOnlyPngJpgSupported=Virhe vain. Png-ja. Jpg-kuvien muoto tiedosto ovat tuettuja.
-ErrorImageFormatNotSupported=Sinun PHP ei tue toimintoja muuntaa kuvia tätä muotoa.
SetDate=Aseta päivä
SelectDate=Valitse päivä
SeeAlso=See also %s
BackgroundColorByDefault=Default taustaväri
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
FileWasNotUploaded=Tiedosto on valittu liite mutta ei ollut vielä ladattu. Klikkaa "Liitä tiedosto" tätä.
NbOfEntries=Huom Merkintöjen
GoToWikiHelpPage=Lue online-ohjeesta (tarvitaan Internet-yhteys)
@@ -266,6 +266,7 @@ Afternoon=Iltapäivä
Quadri=Quadri
MonthOfDay=Kuukaudenpäivä
HourShort=H
+MinuteShort=mn
Rate=Kurssi
UseLocalTax=Sisältää veron
Bytes=Tavua
@@ -340,6 +341,7 @@ FullList=Täydellinen luettelo
Statistics=Tilastot
OtherStatistics=Muut tilastot
Status=Tila
+Favorite=Favorite
ShortInfo=Info.
Ref=Viite
RefSupplier=Toimittajan viite
@@ -365,6 +367,7 @@ ActionsOnCompany=Sidosryhmien tapahtumat
ActionsOnMember=Jäsenen tapahtumat
NActions=%s tapahtumat
NActionsLate=%s myöhässä
+RequestAlreadyDone=Request already recorded
Filter=Suodata
RemoveFilter=Poista suodatin
ChartGenerated=Luo kuvio
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Lisäominaisuuksien asetukset
URLPhoto=Kuvan tai logon url
SetLinkToThirdParty=Linkki toiseen sidosryhmään
CreateDraft=Luo luonnos
+SetToDraft=Back to draft
ClickToEdit=Klikkaa muokataksesi
ObjectDeleted=Kohde %s poistettu
ByCountry=Maittain
@@ -678,7 +682,7 @@ ViewPrivateNote=Katso huomiot
XMoreLines=%s rivi(ä) piilossa
PublicUrl=Julkinen URL
AddBox=Add box
-
+SelectElementAndClickRefresh=Select an element and click Refresh
# Week day
Monday=Maanantai
Tuesday=Tiistai
diff --git a/htdocs/langs/fi_FI/margins.lang b/htdocs/langs/fi_FI/margins.lang
index 57744280f238bdec391fceecaedd9617555d6e5f..c9f0a1d0926e9c689d59d9808ec6a089cd14e529 100644
--- a/htdocs/langs/fi_FI/margins.lang
+++ b/htdocs/langs/fi_FI/margins.lang
@@ -10,24 +10,18 @@ MarkRate=Mark rate
DisplayMarginRates=Display margin rates
DisplayMarkRates=Display mark rates
InputPrice=Input price
-
margin=Profit margins management
margesSetup=Profit margins management setup
-
MarginDetails=Margin details
-
ProductMargins=Product margins
CustomerMargins=Customer margins
SalesRepresentativeMargins=Sales representative margins
-
ProductService=Tuote tai palvelu
AllProducts=All products and services
ChooseProduct/Service=Choose product or service
-
StartDate=Aloituspäivämäärä
EndDate=Lopetuspäivä
Launch=Alku
-
ForceBuyingPriceIfNull=Force buying price if null
ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0)
MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
@@ -35,16 +29,16 @@ UseDiscountAsProduct=As a product
UseDiscountAsService=As a service
UseDiscountOnTotal=On subtotal
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
-
MARGIN_TYPE=Margin type
MargeBrute=Raw margin
MargeNette=Net margin
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - Cost price
-
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
Charges=Charges
-
AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/fi_FI/orders.lang b/htdocs/langs/fi_FI/orders.lang
index ac475213a74988ed8f56e1f310e8f790bfe51719..e0ccee7ebb4115aeee1e8405fb8f0ecdbce13f77 100644
--- a/htdocs/langs/fi_FI/orders.lang
+++ b/htdocs/langs/fi_FI/orders.lang
@@ -2,7 +2,7 @@
OrdersArea=Asiakkaiden tilausten alueella
SuppliersOrdersArea=Toimittajien tilaukset alueella
OrderCard=Tilaa kortti
-# OrderId=Order Id
+OrderId=Order Id
Order=Tilata
Orders=Tilaukset
OrderLine=Tilaa linja
@@ -28,7 +28,7 @@ StatusOrderCanceledShort=Peruutettu
StatusOrderDraftShort=Vedos
StatusOrderValidatedShort=Validoidut
StatusOrderSentShort=Meneillään
-# StatusOrderSent=Shipment in process
+StatusOrderSent=Shipment in process
StatusOrderOnProcessShort=Prosessissa
StatusOrderProcessedShort=Jalostettu
StatusOrderToBillShort=Bill
@@ -53,9 +53,9 @@ ShippingExist=Lähetys olemassa
DraftOrWaitingApproved=Esitys tai hyväksytty ei vielä määrännyt
DraftOrWaitingShipped=Esitys tai validoitua ole vielä lähetetty
MenuOrdersToBill=Tilaukset laskuttaa
-# MenuOrdersToBill2=Orders to bill
+MenuOrdersToBill2=Billable orders
SearchOrder=Haku jotta
-# SearchACustomerOrder=Search a customer order
+SearchACustomerOrder=Search a customer order
ShipProduct=Laiva tuote
Discount=Discount
CreateOrder=Luo Tilaa
@@ -65,14 +65,14 @@ ValidateOrder=Validate jotta
UnvalidateOrder=Unvalidate järjestys
DeleteOrder=Poista jotta
CancelOrder=Peruuta tilaus
-AddOrder=Lisää jotta
+AddOrder=Create order
AddToMyOrders=Add to my tilaukset
AddToOtherOrders=Lisää muut tilaukset
-# AddToDraftOrders=Add to draft order
+AddToDraftOrders=Add to draft order
ShowOrder=Näytä jotta
NoOpenedOrders=N: o avataan tilaukset
NoOtherOpenedOrders=Mikään muu avataan tilaukset
-# NoDraftOrders=No draft orders
+NoDraftOrders=No draft orders
OtherOrders=Muut tilaukset
LastOrders=Viimeisin %s tilaukset
LastModifiedOrders=Viimeisin %s muunnettu tilaukset
@@ -82,7 +82,7 @@ NbOfOrders=Määrä tilauksia
OrdersStatistics=Tilaukset tilastot
OrdersStatisticsSuppliers=Toimittaja tilaukset tilastot
NumberOfOrdersByMonth=Määrä tilauksia kuukausittain
-# AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
+AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
ListOfOrders=Luettelo tilaukset
CloseOrder=Sulje jotta
ConfirmCloseOrder=Oletko varma, että haluat sulkea tämän tilauksen? Kun tilaus on päättynyt, se voidaan laskuttaa.
@@ -93,7 +93,7 @@ ConfirmUnvalidateOrder=Oletko varma että haluat palauttaa järjestyksen <b>%s</
ConfirmCancelOrder=Oletko varma, että haluat peruuttaa tämän tilauksen?
ConfirmMakeOrder=Oletko varma, että haluat vahvistaa olet tehnyt tämän <b>tilauksen %s?</b>
GenerateBill=Luo lasku
-# ClassifyShipped=Classify delivered
+ClassifyShipped=Classify delivered
ClassifyBilled=Luokittele "Laskutetun"
ComptaCard=Kirjanpito-kortti
DraftOrders=Luonnos tilaukset
@@ -101,7 +101,6 @@ RelatedOrders=Aiheeseen liittyvät tilaukset
OnProcessOrders=Prosessissa tilaukset
RefOrder=Ref. tilata
RefCustomerOrder=Ref. asiakas jotta
-CustomerOrder=Asiakas jotta
RefCustomerOrderShort=Ref. asiakasnumero. tilata
SendOrderByMail=Lähetä tilata postitse
ActionsOnOrder=Toimia, jotta
@@ -131,9 +130,7 @@ Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON ole m
Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON ole määritelty
Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file ' %s'
Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file ' %s'
-# Error_OrderNotChecked=No orders to invoice selected
-
-
+Error_OrderNotChecked=No orders to invoice selected
# Sources
OrderSource0=Kaupalliset ehdotus
OrderSource1=Internet
@@ -144,25 +141,22 @@ OrderSource5=Kaupalliset
OrderSource6=Varastoida
QtyOrdered=Kpl velvoitti
AddDeliveryCostLine=Lisää toimitus kustannukset linja ilmoitetaan paino, jotta
-
# Documents models
PDFEinsteinDescription=Täydellinen jotta malli (logo. ..)
PDFEdisonDescription=Yksinkertainen, jotta malli
-# PDFProformaDescription=A complete proforma invoice (logo…)
+PDFProformaDescription=A complete proforma invoice (logo…)
# Orders modes
OrderByMail=Posti
OrderByFax=Faksin
OrderByEMail=Sähköposti
OrderByWWW=Online
OrderByPhone=Puhelin
-
-# CreateInvoiceForThisCustomer=Bill orders
-# NoOrdersToInvoice=No orders billable
-# CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-# MenuOrdersToBill2=Orders to bill
-# OrderCreation=Order creation
-# Ordered=Ordered
-# OrderCreated=Your orders have been created
-# OrderFail=An error happened during your orders creation
-# CreateOrders=Create orders
-# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+CreateInvoiceForThisCustomer=Bill orders
+NoOrdersToInvoice=No orders billable
+CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
+OrderCreation=Order creation
+Ordered=Ordered
+OrderCreated=Your orders have been created
+OrderFail=An error happened during your orders creation
+CreateOrders=Create orders
+ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
diff --git a/htdocs/langs/fi_FI/oscommerce.lang b/htdocs/langs/fi_FI/oscommerce.lang
deleted file mode 100644
index 6bc36861b5a77a7f877ff597f593a35754f6d578..0000000000000000000000000000000000000000
--- a/htdocs/langs/fi_FI/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=OS Commerce moduulin asetukset
-OSCommerceSetupSaved=OS Commerce asetukset tallennetaan
-OSCommerceServer=OS Commerce Server isännän / ip
-OSCommerceDatabaseName=OS Commerce tietokannan nimi
-OSCommercePrefix=OS Commerce taulukot etuliite
-OSCommerceUser=OS Commerce tietokanta sisäänkirjoittautumissivuksesi
diff --git a/htdocs/langs/fi_FI/other.lang b/htdocs/langs/fi_FI/other.lang
index d3464542daef4d418876dac821b99bc80b5a974e..155ef697744c9207c0dd736f9345669f0d600ac2 100644
--- a/htdocs/langs/fi_FI/other.lang
+++ b/htdocs/langs/fi_FI/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=Suojakoodi
Calendar=Kalenteri
-AddTrip=Lisää matka
Tools=Työkalut
ToolsDesc=Tämä alue on omistettu ryhmä sekalaisia työkaluja ole saatavilla muihin valikot. <br><br> Näitä työkaluja pääsee valikosta puolella.
Birthday=Syntymäpäivä
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation
Notify_TASK_CREATE=Task created
Notify_TASK_MODIFY=Task modified
Notify_TASK_DELETE=Task deleted
+SeeModuleSetup=See module setup
NbOfAttachedFiles=Numero liitettyjen tiedostojen / asiakirjat
TotalSizeOfAttachedFiles=Kokonaiskoosta liitettyjen tiedostojen / asiakirjat
MaxSize=Enimmäiskoko
@@ -80,6 +80,16 @@ ModifiedBy=Muuttanut %s
ValidatedBy=Vahvistaja %s
CanceledBy=Peruuttama %s
ClosedBy=Suljettu %s
+CreatedById=User id who created
+ModifiedById=User id who made last change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made last change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
FileWasRemoved=Tiedosto on poistettu
DirWasRemoved=Directory poistettiin
FeatureNotYetAvailableShort=Saatavana on seuraava versio
@@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your
##### Calendar common #####
AddCalendarEntry=Lisää merkintä kalenteri %s
-NewCompanyToDolibarr=Yritys %s lisätään Dolibarr
-ContractValidatedInDolibarr=Sopimus %s validoitava Dolibarr
-ContractCanceledInDolibarr=Sopimus %s peruutettu Dolibarr
-ContractClosedInDolibarr=Sopimus %s suljettu Dolibarr
-PropalClosedSignedInDolibarr=Ehdotus %s allekirjoitettu Dolibarr
-PropalClosedRefusedInDolibarr=Ehdotus %s evätty Dolibarr
-PropalValidatedInDolibarr=Ehdotus %s validoitava Dolibarr
-InvoiceValidatedInDolibarr=Lasku %s validoitava Dolibarr
-InvoicePaidInDolibarr=Lasku %s muutettu maksetaan vuonna Dolibarr
-InvoiceCanceledInDolibarr=Lasku %s peruutettu Dolibarr
-PaymentDoneInDolibarr=Maksu %s tehdään Dolibarr
-CustomerPaymentDoneInDolibarr=Asiakas maksu %s tehdään Dolibarr
-SupplierPaymentDoneInDolibarr=Toimittaja maksu %s tehdään Dolibarr
-MemberValidatedInDolibarr=Jäsen %s validoitava Dolibarr
-MemberResiliatedInDolibarr=Jäsen %s resiliated vuonna Dolibarr
-MemberDeletedInDolibarr=Jäsen %s poistettu Dolibarr
-MemberSubscriptionAddedInDolibarr=Tilaus jäsenen %s Lisätään Dolibarr
-ShipmentValidatedInDolibarr=Toimitus %s validoitu Dolibarr
-ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
##### Export #####
Export=Vienti
ExportsArea=Vienti alueen
diff --git a/htdocs/langs/fi_FI/paybox.lang b/htdocs/langs/fi_FI/paybox.lang
index 845aa13662f3e390301229f5b32d0d8d33e8e41d..4c856a59e424e6e1dbc24432d2a41d3d6678abfe 100644
--- a/htdocs/langs/fi_FI/paybox.lang
+++ b/htdocs/langs/fi_FI/paybox.lang
@@ -32,6 +32,9 @@ VendorName=Nimi myyjä
CSSUrlForPaymentForm=CSS-tyylisivu url maksun muodossa
MessageOK=Viesti on validoitu maksun tuotto sivu
MessageKO=Viesti on peruutettu maksun tuotto sivu
-# NewPayboxPaymentReceived=New Paybox payment received
-# NewPayboxPaymentFailed=New Paybox payment tried but failed
-# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+NewPayboxPaymentReceived=New Paybox payment received
+NewPayboxPaymentFailed=New Paybox payment tried but failed
+PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/fi_FI/resource.lang b/htdocs/langs/fi_FI/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..d64075dfbf595897a63e3eebf19194d8f71030dd
--- /dev/null
+++ b/htdocs/langs/fi_FI/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
diff --git a/htdocs/langs/fi_FI/sendings.lang b/htdocs/langs/fi_FI/sendings.lang
index 954d63ad5eb42d45398049ba78ba25fa366808ea..01f15eedb3bd6bffdb43e36d31cad7e6d80940e5 100644
--- a/htdocs/langs/fi_FI/sendings.lang
+++ b/htdocs/langs/fi_FI/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=Tällä hetkellä uuden lähetys tehdään tilau
RelatedShippings=Related shippings
ShipmentLine=Shipment line
CarrierList=List of transporters
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
# Sending methods
SendingMethodCATCH=Saalis asiakas
diff --git a/htdocs/langs/fi_FI/stocks.lang b/htdocs/langs/fi_FI/stocks.lang
index 6e418f509327a08b8436dabfcef2ddb0e3e28765..10d541d3d1bf6bf643eab3cebb508c141a290868 100644
--- a/htdocs/langs/fi_FI/stocks.lang
+++ b/htdocs/langs/fi_FI/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Warehouse etiketissä on
CorrectStock=Oikea varastossa
ListOfWarehouses=Luettelo varastoissa
ListOfStockMovements=Luettelo varastojen muutokset
-StocksArea=Varastot alueella
+StocksArea=Warehouses area
Location=Lieu
LocationSummary=Lyhyt nimi sijainti
NumberOfDifferentProducts=Number of different products
diff --git a/htdocs/langs/fi_FI/users.lang b/htdocs/langs/fi_FI/users.lang
index a33af911cb34a5b7d7d11d7dac7a6c49274a6031..21b0e410dd32df1a4ebf8de50ea4b77d69d975e0 100644
--- a/htdocs/langs/fi_FI/users.lang
+++ b/htdocs/langs/fi_FI/users.lang
@@ -63,7 +63,6 @@ ShowGroup=Näytä ryhmä
ShowUser=Näytä käyttäjän
NonAffectedUsers=Ei vaikuttaa käyttäjien
UserModified=Käyttäjä muutettu onnistuneesti
-GroupModified=Ryhmän muunnettu onnistuneesti
PhotoFile=Photo tiedosto
UserWithDolibarrAccess=Käyttäjälle Dolibarr pääsy
ListOfUsersInGroup=Luettelo käyttäjien tässä ryhmässä
@@ -103,7 +102,7 @@ UserDisabled=Käyttäjän %s pois päältä
UserEnabled=Käyttäjän %s aktivoitu
UserDeleted=Käyttäjän %s poistettu
NewGroupCreated=Ryhmän %s on luotu
-GroupModified=Ryhmän muunnettu onnistuneesti
+GroupModified=Group %s modified
GroupDeleted=Ryhmän %s poistettu
ConfirmCreateContact=Oletko varma yu haluamme luoda Dolibarr huomioon tässä yhteydessä?
ConfirmCreateLogin=Oletko varma, että haluat luoda Dolibarr huomioon tämän jäsen?
@@ -114,8 +113,10 @@ YourRole=Omat roolit
YourQuotaOfUsersIsReached=Tilakiintiösi aktiivisia käyttäjiä on saavutettu!
NbOfUsers=Nb käyttäjien
DontDowngradeSuperAdmin=Vain superadmin voi downgrade superadmin
-HierarchicalResponsible=Hierarchical responsible
+HierarchicalResponsible=Supervisor
HierarchicView=Hierarchical view
UseTypeFieldToChange=Use field Type to change
OpenIDURL=OpenID URL
LoginUsingOpenID=Use OpenID to login
+WeeklyHours=Weekly hours
+ColorUser=Color of the user
diff --git a/htdocs/langs/fi_FI/withdrawals.lang b/htdocs/langs/fi_FI/withdrawals.lang
index 093e40adeb2ec00dcb7b80bc0aa6058dd24c60f4..3e66966383bec839af671fb1da07926b93925279 100644
--- a/htdocs/langs/fi_FI/withdrawals.lang
+++ b/htdocs/langs/fi_FI/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=Kuitti
LastWithdrawalReceipts=Viimeisin %s vetäytymis kuitit
WithdrawedBills=Withdrawed laskut
WithdrawalsLines=Nostot linjat
-RequestStandingOrderToTreat=Pyyntö seisoville tilausten hoitoon
-RequestStandingOrderTreated=Pyyntö seisoville tilaukset käsitellään
+RequestStandingOrderToTreat=Request for standing orders to process
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=Asiakas pysyvän tilaukset
CustomerStandingOrder=Asiakas kestotilaus
NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
@@ -40,14 +41,13 @@ TransMetod=Menetelmä Lähetetty
Send=Lähettää
Lines=Linjat
StandingOrderReject=Issue hylätä
-InvoiceRefused=Lataa hylkäämisen asiakkaan
WithdrawalRefused=Nostot Refuseds
WithdrawalRefusedConfirm=Oletko varma että haluat kirjoittaa peruuttamisesta hylkäämisen yhteiskunnan
RefusedData=Päivä hylkäämisestä
RefusedReason=Hylkäämisen syy
RefusedInvoicing=Laskutus hylkääminen
NoInvoiceRefused=Älä lataa hylkäämisestä
-InvoiceRefused=Lataa hylkäämisen asiakkaan
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=Tila
StatusUnknown=Tuntematon
StatusWaiting=Odotus
@@ -76,7 +76,7 @@ WithBankUsingRIB=Jos pankkitilit käyttäen RIB
WithBankUsingBANBIC=Jos pankkitilit käyttäen IBAN / BIC / SWIFT
BankToReceiveWithdraw=Pankkitili saada vetäytyy
CreditDate=Luottoa
-WithdrawalFileNotCapable=Ei voitu luoda peruuttamiseen kuitti tiedosto maasi
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
ShowWithdraw=Näytä Nosta
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Kuitenkin, jos lasku on ainakin yksi poistamista määrä ei kuitenkaan ole vielä käsitelty, sitä ei voida määrittää koska maksoivat sallimaan hallita poistettaviksi.
DoStandingOrdersBeforePayments=Tällä välilehtien avulla voit pyytää ja kestotilauksena. Kun se on valmis, voit kirjoittaa maksun sulkea laskun.
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index b5c74a107000d9ec1ffee1e93fe8d4ad17446831..4ba112f6ba7392a479124069968a5341980f6096 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -41,7 +41,7 @@ List=Liste
Create=Créer
UpdateAccount=Modification de compte comptable
UpdateMvts=Modification de mouvements
-WriteBookKeeping=Comptabiliser les écritures dans le grand livre
+WriteBookKeeping=Enregistrer les écritures dans le grand livre
Bookkeeping=Grand livre
AccountBalanceByMonth=Solde par mois
@@ -55,24 +55,24 @@ InvoiceLines=Lignes de factures à ventiler
InvoiceLinesDone=Lignes de factures ventilées
IntoAccount=Dans le compte comptable
-Ventilate=Ventilation
+Ventilate=Ventiler
VentilationAuto=Ventilation automatique
Processing=Traitement en cours
-EndProcessing=Fin de traitement
+EndProcessing=Fin du traitement
AnyLineVentilate=Aucune ligne à ventiler
SelectedLines=Lignes sélectionnées
-Lineofinvoice=Ligne de facture
-VentilatedinAccount=Ventilée avec succès dans le compte comptable
-NotVentilatedinAccount=Non ventilée dans le compte comptable
+Lineofinvoice=Ligne de la facture
+VentilatedinAccount=Ventilé avec succès dans le compte comptable
+NotVentilatedinAccount=Non ventilé dans le compte comptable
-ACCOUNTING_SEPARATORCSV=Separateur CSV
+ACCOUNTING_SEPARATORCSV=Séparateur CSV
ACCOUNTING_LIMIT_LIST_VENTILATION=Nombre d'éléments à ventiler affichés par page (maximum conseillé : 50)
ACCOUNTING_LIST_SORT_VENTILATION_TODO=Commencer le tri des pages de ventilation "A ventiler" par les éléments les plus récents
ACCOUNTING_LIST_SORT_VENTILATION_DONE=Commencer le tri des pages de ventilation "Ventilées" par les éléments les plus récents
-AccountLength=Longueur des comptes comptables affichés dans Dolibarr
+AccountLength=Longueur des comptes comptables affichés dans Dolibarr
AccountLengthDesc=Fonction permettant de simuler une longueur de compte comptable en remplaçant les espaces par le chiffre zéro. Cette fonction touche uniquement à l'affichage, elle ne modifie pas les comptes comptables enregistrés dans Dolibarr. Pour l'export, cette fonction est nécessaire pour être compatible avec certains logiciels.
ACCOUNTING_LENGTH_GACCOUNT=Longueur des comptes généraux
ACCOUNTING_LENGTH_AACCOUNT=Longueur des comptes tiers
@@ -82,10 +82,10 @@ ACCOUNTING_PURCHASE_JOURNAL=Journal des achats
ACCOUNTING_BANK_JOURNAL=Journal de banque
ACCOUNTING_CASH_JOURNAL=Journal de caisse
ACCOUNTING_MISCELLANEOUS_JOURNAL=Journal des opérations diverses
-ACCOUNTING_SOCIAL_JOURNAL=Journal social
+ACCOUNTING_SOCIAL_JOURNAL=Journal de paie
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Compte de transfert espèce
-ACCOUNTING_ACCOUNT_SUSPENSE=Compte d'attente
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Compte comptable de tranfert
+ACCOUNTING_ACCOUNT_SUSPENSE=Compte comptable d'attente
ACCOUNTING_PRODUCT_BUY_ACCOUNT=Compte comptable par défaut pour les produits achetés (si non défini dans la fiche produit)
ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Compte comptable par défaut pour les produits vendus (si non défini dans la fiche produit)
@@ -97,7 +97,7 @@ Docdate=Date
Docref=Référence
Numerocompte=Compte
Code_tiers=Tiers
-Labelcompte=Libellé compte
+Labelcompte=Libellé du compte
Debit=Débit
Credit=Crédit
Amount=Montant
@@ -111,21 +111,21 @@ PurchasesJournal=Journal des achats
DescSellsJournal=Journal des ventes
DescPurchasesJournal=Journal des achats
BankJournal=Journal de banque
-DescBankJournal=Journal de banque comprenant tous les types de règlements autres que espèce
+DescBankJournal=Journal de banque comprenant tous les types de règlements autres que espèce\t
CashJournal=Journal de caisse
DescCashJournal=Journal de caisse comprenant le type de règlement "espèce"
CashPayment=Règlement espèce
-SupplierInvoicePayment=Règlement de facture fournisseur
-CustomerInvoicePayment=Règlement de facture client
+SupplierInvoicePayment=Paiement de facture fournisseur
+CustomerInvoicePayment=Paiement de facture client
-ThirdPartyAccount=Compte tiers
+ThirdPartyAccount=Comptes de tiers
NewAccountingMvt=Nouveau mouvement
-NumMvts=Numéro du mouvement
+NumMvts=Nombre de mouvement
ListeMvts=Liste des mouvements
-ErrorDebitCredit=Debit et Credit ne peuvent avoir une valeur en même temps
+ErrorDebitCredit=Débit et crédit ne peuvent pas avoir la même valeur en même temps.
ReportThirdParty=Liste compte tiers
DescThirdPartyReport=Consultez ici la liste des tiers clients et fournisseurs et leurs codes comptables
@@ -136,16 +136,16 @@ Pcgversion=Version du plan
Pcgtype=Classe de compte
Pcgsubtype=Sous classe de compte
Accountparent=Racine des comptes
-Active=État
+Active=Relevé
NewFiscalYear=Nouvelle année fiscale
DescVentilCustomer=Consultez ici la ventilation comptable annuelle de vos factures clients
-TotalVente=Total chiffre affaires HT
-TotalMarge=Total marge commerciale
+TotalVente=Chiffre d'affaires HT
+TotalMarge=Total marge
DescVentilDoneCustomer=Consultez ici la liste des lignes de factures clients et leur compte comptable
-DescVentilTodoCustomer=Ventilez vos lignes de facture client avec un compte comptable
-ChangeAccount=Changer le compte comptable pour les lignes sélectionnées par le compte:
+DescVentilTodoCustomer=Consultez ici la liste des lignes de factures clients et leur compte comptable
+ChangeAccount=Changer le compte comptable pour les lignes sélectionnées par le compte :
Vide=-
DescVentilSupplier=Consultez ici la ventilation comptable annuelle de vos factures fournisseurs
DescVentilTodoSupplier=Ventilez vos lignes de facture fournisseur avec un compte comptable
@@ -153,6 +153,6 @@ DescVentilDoneSupplier=Consultez ici la liste des lignes de factures fournisseur
ValidateHistory=Valider Automatiquement
-ErrorAccountancyCodeIsAlreadyUse=Erreur, vous ne pouvez pas supprimer ce compte comptable car il est utilisé
+ErrorAccountancyCodeIsAlreadyUse=Erreur, vous ne pouvez pas détruire de compte comptable car il est utilisé
FicheVentilation=Fiche ventilation
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index c3bf53a2f1699a6b09bd2b25bba6b84a4f8bfe37..bdb6912ebe4deea08d748660cd57d011c13d32f3 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -67,7 +67,7 @@ ShowPreview=Afficher aperçu
PreviewNotAvailable=Aperçu non disponible
ThemeCurrentlyActive=Thème actif actuellement
CurrentTimeZone=Fuseau horaire PHP (serveur)
-MySQLTimeZone=Fuseau horaire MySql (serveur)
+MySQLTimeZone=Fuseau horaire MySQL (serveur)
TZHasNoEffect=Les dates sont stockées et retournées par le serveur de base de données comme si elles étaient conservées sous forme de chaîne. Le fuseau horaire n'a d'effet que lorsque vous utilisez la fonction UNIX_TIMESTAMP (qui ne devrait pas être utilisé par Dolibarr, aussi le TZ de la base de données ne devrait avoir aucun effet, même si changé après que les données aient été saisies).
Space=Espace
Table=Table
@@ -169,7 +169,7 @@ NoBackupFileAvailable=Aucun fichier de sauvegarde disponible.
ExportMethod=Méthode d'exportation
ImportMethod=Méthode d'importation
ToBuildBackupFileClickHere=Pour générer un fichier de sauvegarde, cliquez <a href="%s">ici</a>.
-ImportMySqlDesc=Pour importer une sauvegarde, il faut utiliser la commande mysql en ligne suivante:
+ImportMySqlDesc=Pour importer une sauvegarde, il faut utiliser la commande mysql suivante en ligne de commande:
ImportPostgreSqlDesc=Pour importer une sauvegarde, il faut utiliser la commande pg_restore en ligne suivante:
ImportMySqlCommand=%s %s < monfichiersauvegarde.sql
ImportPostgreSqlCommand=%s %s monfichiersauvegarde.sql
@@ -178,7 +178,7 @@ Compression=Compression
CommandsToDisableForeignKeysForImport=Commande pour désactiver les clés étrangères à l'importation
CommandsToDisableForeignKeysForImportWarning=Requis si vous voulez être en mesure de restaurer votre « dump » SQL plus tard
ExportCompatibility=Compatibilité du fichier d'exportation généré
-MySqlExportParameters=Paramètres de l'exportation MySql
+MySqlExportParameters=Paramètres de l'exportation MySQL
PostgreSqlExportParameters= Paramètres de l'exportation PostgreSQL
UseTransactionnalMode=Utiliser le mode transactionnel
FullPathToMysqldumpCommand=Chemin complet vers la commande mysqldump
@@ -252,7 +252,7 @@ CurrentSmartphoneMenuHandler=Gestionnaire menu smartphone courant
MeasuringUnit=Unité de mesure
Emails=Emails
EMailsSetup=Configuration Emails
-EMailsDesc=Cette page permet de remplacer les paramètres PHP en rapport avec l'envoi de mails. Dans la plupart des cas, sur des OS comme Unix/Linux, les paramètres PHP sont déjà corrects et cette page est inutile.
+EMailsDesc=Cette page permet de remplacer les paramètres PHP en rapport avec l'envoi d'emails. Dans la plupart des cas, sur des OS comme Unix/Linux, les paramètres PHP sont déjà corrects et cette page est inutile.
MAIN_MAIL_SMTP_PORT=Port du serveur SMTP/SMTPS (Par défaut dans php.ini: <b>%s</b>)
MAIN_MAIL_SMTP_SERVER=Nom d'hôte ou adresse IP du serveur SMTP/SMTPS (Par défaut dans php.ini: <b>%s</b>)
MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Port du serveur SMTP/SMTPS (Non défini dans le PHP sur les systèmes de type Unix)
@@ -320,7 +320,7 @@ UMask=Masque des nouveaux fichiers sous Unix/Linux/BSD/Mac.
UMaskExplanation=Ce paramètre permet de définir les droits des fichiers créés sur le serveur par Dolibarr (lors d'envois par exemple).<br>Ce doit être la valeur octale (par exemple 0666 signifie lecture/écriture pour tous).<br>Ce paramètre n'a aucun effet sur un serveur Windows.
SeeWikiForAllTeam=Voir le wiki pour le détail de tous les acteurs et leur organisation
UseACacheDelay= Délai de mise en cache de l'export en secondes (0 ou vide pour aucun cache)
-DisableLinkToHelpCenter=Cacher le lien "<b>Besoin d'un support ou aide</b>" sur la page de connexion
+DisableLinkToHelpCenter=Cacher le lien «<b>Besoin d'aide ou d'assistance</b>» sur la page de connexion
DisableLinkToHelp=Cacher le lien "<b>%s Aide en ligne</b>" du menu gauche
AddCRIfTooLong=Il n'y a pas de coupure de ligne automatique, aussi si votre texte est trop long sur les documents, il faudra ajouter vous même des retours chariot dans la zone de saisie du texte
ModuleDisabled=Module désactivé
@@ -437,8 +437,8 @@ Module52Name=Stocks
Module52Desc=Gestion des stocks de produits
Module53Name=Services
Module53Desc=Gestion des services
-Module54Name=Contrats
-Module54Desc=Gestion des contrats de services
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=Codes-barres
Module55Desc=Gestion des codes-barres
Module56Name=Téléphonie
@@ -475,8 +475,8 @@ Module320Name=Flux RSS
Module320Desc=Ajout de flux d'informations RSS dans les écrans Dolibarr
Module330Name=Marque-pages
Module330Desc=Gestion des marque-pages
-Module400Name=Projets
-Module400Desc=Gestion des projets au sein des autres modules
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=Webcalendar
Module410Desc=Interface avec le calendrier Webcalendar
Module500Name=Dépenses spéciales (taxes, charges, dividendes)
@@ -504,7 +504,7 @@ Module2500Desc=Permet de stocker et administrer une base de documents
Module2600Name=WebServices
Module2600Desc=Active le serveur de Web Services de Dolibarr
Module2700Name=Gravatar
-Module2700Desc=Utilise le service en ligne Gravatar (www.gravatar.com) pour afficher les photos d'utilisateurs/membres (en fonction leur e-mail). Besoin d'un accès Internet
+Module2700Desc=Utilise le service en ligne Gravatar (www.gravatar.com) pour afficher les photos d'utilisateurs/membres (en fonction leur email). Besoin d'un accès Internet
Module2800Desc=Client FTP
Module2900Name=GeoIPMaxmind
Module2900Desc=Capacités de conversion GeoIP Maxmind
@@ -540,7 +540,7 @@ Permission11=Consulter les factures clients
Permission12=Créer/modifier les factures clients
Permission13=Dé-valider les factures clients
Permission14=Valider les factures clients
-Permission15=Envoyer les factures clients par mail
+Permission15=Envoyer les factures clients par email
Permission16=Émettre des paiements sur les factures clients
Permission19=Supprimer les factures clients
Permission21=Consulter les propositions commerciales
@@ -606,11 +606,11 @@ Permission151=Consulter les prélèvements
Permission152=Créer/modifier une demande de prélèvements
Permission153=Émettre des bons de prélèvements
Permission154=Créditer/rejeter les bons de prélèvements
-Permission161=Consulter les contrats de services
-Permission162=Créer/modifier les contrats de services
-Permission163=Activer les services d'un contrat
-Permission164=Désactiver les services d'un contrat
-Permission165=Supprimer les contrats
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
Permission171=Lire les notes de frais (Les vôtres et les utilisateurs autorisés)
Permission172=Créer/modifier les notes de frais / déplacements
Permission173=Supprimer les notes de frais / déplacements
@@ -638,13 +638,13 @@ Permission212=Commander les lignes
Permission213=Activer une ligne
Permission214=Configurer la téléphonie
Permission215=Configurer les fournisseurs
-Permission221=Consulter les mailings
-Permission222=Créer/modifier les mailings (sujet, destinataires, etc.)
-Permission223=Valider les mailings (permet leur envoi)
-Permission229=Supprimer les mailings
+Permission221=Consulter les emailings
+Permission222=Créer/modifier les emailings (sujet, destinataires, etc.)
+Permission223=Valider les emailings (permet leur envoi)
+Permission229=Supprimer les emailings
Permission237=Visualiser les destinataires et les infos
-Permission238=Envoyer les mailings manuellement
-Permission239=Supprimer les mailings après leur validation ou leur envoi
+Permission238=Envoyer les emailings manuellement
+Permission239=Supprimer les emailings après leur validation ou leur envoi
Permission241=Consulter les catégories
Permission242=Créer/modifier les catégories
Permission243=Supprimer les catégories
@@ -672,7 +672,7 @@ Permission300=Consulter les codes-barres
Permission301=Créer/modifier les codes-barres
Permission302=Supprimer les codes-barres
Permission311=Consulter les services
-Permission312=Affecter des services à un contrat
+Permission312=Assign service/subscription to contract
Permission331=Lire les marque-pages
Permission332=Créer/modifier les marque-pages
Permission333=Supprimer les marque-pages
@@ -702,8 +702,8 @@ Permission701=Consulter les dons
Permission702=Créer/modifier les dons
Permission703=Supprimer les dons
Permission1001=Consulter les stocks
-Permission1002=Créer/modifier les stocks
-Permission1003=Supprimer les stocks
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=Consulter les mouvements de stocks
Permission1005=Créer/modifier les mouvements de stocks
Permission1101=Consulter les bons de livraison
@@ -724,7 +724,7 @@ Permission1231=Consulter les factures fournisseur
Permission1232=Créer des factures fournisseur
Permission1233=Valider les factures fournisseur
Permission1234=Supprimer les factures fournisseur
-Permission1235=Envoyer les factures fournisseur par mail
+Permission1235=Envoyer les factures fournisseur par email
Permission1236=Exporter les factures fournisseurs, attributs et règlements
Permission1237=Exporter les commande fournisseurs, attributs
Permission1251=Lancer des importations en masse dans la base (chargement de données)
@@ -784,7 +784,7 @@ BackToModuleList=Retour liste des modules
BackToDictionaryList=Retour liste des dictionnaires
VATReceivedOnly=Taux spécial non facturé
VATManagement=Gestion TVA
-VATIsUsedDesc=Le taux de TVA proposé par défaut lors de la création de proposition commerciale, facture, commande, etc... répond à la règle standard suivante :<br>Si vendeur non assujetti à TVA, TVA par défaut=0. Fin de règle.<br>Si le (pays vendeur= pays acheteur) alors TVA par défaut=TVA du produit vendu. Fin de règle.<br>Si vendeur et acheteur dans Communauté européenne et bien vendu= moyen de transport neuf (auto, bateau, avion), TVA par défaut=0 (La TVA doit être payée par acheteur au centre d'impôts de son pays et non au vendeur). Fin de règle.<br>Si vendeur et acheteur dans Communauté européenne et acheteur= particulier alors TVA par défaut=TVA du produit vendu. Fin de règle.<br>Si vendeur et acheteur dans Communauté européenne et acheteur= entreprise alors TVA par défaut=0. Fin de règle.<br>Sinon TVA proposée par défaut=0. Fin de règle.<br>
+VATIsUsedDesc=Le taux de TVA proposé par défaut lors de la création de proposition commerciale, facture, commande, etc... répond à la règle standard suivante :<br>Si vendeur non assujetti à TVA, TVA par défaut=0. Fin de règle.<br>Si le (pays vendeur= pays acheteur) alors TVA par défaut=TVA du produit vendu. Fin de règle.<br>Si vendeur et acheteur dans Communauté européenne et bien vendu= moyen de transport neuf (auto, bateau, avion), TVA par défaut=0 (La TVA doit être payée par acheteur au centre d'impôts de son pays et non au vendeur). Fin de règle.<br>Si vendeur et acheteur dans Communauté européenne et acheteur= particulier alors TVA par défaut=TVA du produit vendu (TVA pays vendeur si < seuil du pays et si avant 01/01/2015, TVA pays acheteur après le 01/01/2015). Fin de règle.<br>Si vendeur et acheteur dans Communauté européenne et acheteur= entreprise alors TVA par défaut=0. Fin de règle.<br>Sinon TVA proposée par défaut=0. Fin de règle.<br>
VATIsNotUsedDesc=Le taux de TVA proposé par défaut est 0. C'est le cas d'associations, particuliers ou certaines petites sociétés.
VATIsUsedExampleFR=En France, il s'agit des sociétés ou organismes ayant choisi un régime fiscale réel (Réel simplifié ou Réel normal), régime dans lequel la TVA est déclarée.
VATIsNotUsedExampleFR=En France, il s'agit des associations ne déclarant pas de TVA ou sociétés, organismes ou professions libérales ayant choisi le régime fiscal micro entreprise (TVA en franchise) et payant une TVA en franchise sans faire de déclaration de TVA. Ce choix fait de plus apparaître la mention "TVA non applicable - art-293B du CGI" sur les factures.
@@ -1029,7 +1029,7 @@ SendingMailSetup=Configuration de l'envoi par email
SendmailOptionNotComplete=Attention, sur certains systèmes Linux, avec cette méthode d'envoi, pour pouvoir envoyer des emails en votre nom, la configuration d'exécution de sendmail doit contenir l'option <b>-ba</b> (paramètre <b>mail.force_extra_parameters</b> dans le fichier <b>php.ini</b>). Si certains de vos destinataires ne reçoivent pas de message, essayer de modifier ce paramètre PHP avec <b>mail.force_extra_parameters = -ba</b>.
PathToDocuments=Chemin d'accès aux documents
PathDirectory=Répertoire
-SendmailOptionMayHurtBuggedMTA=La fonction d'envoi d' emails par la méthode "PHP mail directe" génère une requête email qui peut être mal interprété par certains serveurs de réception de mail présentant un défaut. Cela se traduit par des mails non lisibles chez les personnes hébergés par ces plateformes défectueuses. C'est le cas des clients de certains fournisseurs d'accès internet (Ex : Orange). Ce n'est un problème ni dans Dolibarr ni dans PHP mais sur le serveur de réception. Vous pouvez toutefois ajouter l'option MAIN_FIX_FOR_BUGGED_MTA à 1 dans configuration - divers pour modifier Dolibarr afin de compenser ce défaut. Toutefois ce sont les serveurs respectueux du standard d'envoi d'email qui pourront avoir des problèmes. L'autre solution (recommandée) est d'utiliser la méthode d'envoi SMTP socket library qui n'a aucun de ces inconvénients.
+SendmailOptionMayHurtBuggedMTA=La fonction d'envoi d'emails par la méthode « email PHP directe » génère une requête email qui peut être mal interprété par certains serveurs de réception de mail présentant un défaut. Cela se traduit par des mails non lisibles chez les personnes hébergés par ces plateformes défectueuses. C'est le cas des clients de certains fournisseurs d'accès internet (Ex : Orange). Ce n'est un problème ni dans Dolibarr ni dans PHP mais sur le serveur de réception. Vous pouvez toutefois ajouter l'option MAIN_FIX_FOR_BUGGED_MTA à 1 dans configuration - divers pour modifier Dolibarr afin de compenser ce défaut. Toutefois ce sont les serveurs respectueux du standard d'envoi d'email qui pourront avoir des problèmes. L'autre solution (recommandée) est d'utiliser la méthode d'envoi SMTP socket library qui n'a aucun de ces inconvénients.
TranslationSetup=Configuration de la traduction
TranslationDesc=Le choix de la langue affichée à l'écran se modifie:<br>* Soit de manière globale depuis le menu <strong>Accueil - Configuration - Affichage</strong><br>* Soit de manière spécifique à l'utilisateur depuis l'onglet <strong>Interface utilisateur</strong> de sa fiche utilisateur (cliquer sur l'identifiant en haut de l'écran).
TotalNumberOfActivatedModules=Nombre total de modules fonctionnels activés: <b>%s</b>
@@ -1039,7 +1039,6 @@ YesInSummer=Oui en été
OnlyFollowingModulesAreOpenedToExternalUsers=Remarque, seuls les modules suivants sont ouverts aux utilisateurs externes (quelles que soient les permissions de ces utilisateurs) :
SuhosinSessionEncrypt=Stockage des sessions chiffrées par Suhosin
ConditionIsCurrently=La condition est actuellement %s
-TestNotPossibleWithCurrentBrowsers=Détection automatique non possible
YouUseBestDriver=Vous utilisez le driver %s qui est le driver recommandé actuellement.
YouDoNotUseBestDriver=Vous utilisez le driver %s mais le driver %s est recommandé.
NbOfProductIsLowerThanNoPb=Vous n'avez que %s produits/services en base. Ceci ne requiert pas d'optimisation particulière.
@@ -1139,6 +1138,7 @@ AddDeliveryAddressAbility=Possibilité de sélectionner une adresse de livraison
UseOptionLineIfNoQuantity=Une ligne de produit/service ayant une quantité nulle est considérée comme une option
FreeLegalTextOnProposal=Mention complémentaire sur les propositions commerciales
WatermarkOnDraftProposal=Filigrane sur les brouillons de propositions commerciales (aucun si vide)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=Configuration du module Commandes
OrdersNumberingModules=Modèles de numérotation des commandes
@@ -1160,7 +1160,7 @@ FicheinterNumberingModules=Modèles de numérotation des fiches d'intervention
TemplatePDFInterventions=Modèles de document des fiches d'intervention
WatermarkOnDraftInterventionCards=Filigrane sur les brouillons des fiches d'intervention (aucun si vide)
##### Contracts #####
-ContractsSetup=Configuration du module contrats
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=Modèles de numérotation des contrats
TemplatePDFContracts=Modèles de document de contrats
FreeLegalTextOnContracts=Mention complémentaire sur les contrats
@@ -1268,7 +1268,7 @@ LDAPFieldNameExample=Exemple : sn
LDAPFieldFirstName=Prénom
LDAPFieldFirstNameExample=Exemple : givenName
LDAPFieldMail=Email
-LDAPFieldMailExample=Exemple : mail
+LDAPFieldMailExample=Exemple : email
LDAPFieldPhone=Téléphone professionnel
LDAPFieldPhoneExample=Exemple : telephonenumber
LDAPFieldHomePhone=Téléphone perso
@@ -1324,7 +1324,7 @@ FilesOfTypeNotCompressed=Fichiers de type %s non compressé par le serveur HTTP
CacheByServer=Cache par le serveur
CacheByClient=Cache par le navigateur
CompressionOfResources=Compression des réponses HTTP
-TestNotPossibleWithCurrentBrowsers=Détection automatique non possible
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=Configuration du module Produits
ServiceSetup=Configuration du module Services
@@ -1384,10 +1384,10 @@ MailingSetup=Configuration du module Emailing
MailingEMailFrom=Email émetteur (From) des emails envoyés par Emailing
MailingEMailError=Email retour (Errors-to) pour les réponses lors des envois par Emailing en erreur
##### Notification #####
-NotificationSetup=Configuration du module Notification EMail
-NotificationEMailFrom=Email émetteur (From) des mails envoyés lors des notifications
+NotificationSetup=Configuration du module notification par email
+NotificationEMailFrom=Adresse émettrice (From) des emails envoyés lors des notifications
ListOfAvailableNotifications=Liste des événements sur lesquels vous pouvez configurer une notification, pour chaque tiers (aller dans la fiche tiers pour cela) ou en réglant un email fixe (Liste dépendant de modules activés)
-FixedEmailTarget=EMail fixe cible destinataires
+FixedEmailTarget=Email fixe cible destinataires
##### Sendings #####
SendingsSetup=Configuration du module Expédition/Livraison
SendingsReceiptModel=Modèles de bordereau d'expédition
@@ -1415,8 +1415,9 @@ OSCommerceTestOk=La connexion au serveur '%s' sur la base '%s' par l'utilisateur
OSCommerceTestKo1=La connexion au serveur '%s' a réussi mais la base '%s' n'a pu être atteinte.
OSCommerceTestKo2=La connexion au serveur '%s' par l'utilisateur '%s' à échoué.
##### Stock #####
-StockSetup=Configuration module stock
-UserWarehouse=Utiliser des stocks personnels aux utilisateurs
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=Menu supprimé
TreeMenu=Arborescence des menus
@@ -1481,11 +1482,14 @@ ClickToDialDesc=Ce module permet d'ajouter la possibilité de cliquer sur les nu
##### Point Of Sales (CashDesk) #####
CashDesk=Caisse enregistreuse
CashDeskSetup=Configuration du module Point de vente/caisse enregistreuse
-CashDeskThirdPartyForSell=Tiers générique à utiliser pour les ventes
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Compte par défaut à utiliser pour l'encaissement en liquide
CashDeskBankAccountForCheque= Compte par défaut à utiliser pour l'encaissement en chèque
CashDeskBankAccountForCB= Compte par défaut à utiliser pour l'encaissement en carte de crédit
-CashDeskIdWareHouse=Entrepôt à utiliser pour les ventes
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Configuration du module Marque-pages
BookmarkDesc=Ce module vous permet de gérer des liens et raccourcis. Il permet aussi d'ajouter n'importe quelle page de Dolibarr ou lien web dans le menu d'accès rapide sur la gauche.
@@ -1539,6 +1543,13 @@ ConfirmDeleteFiscalYear=Êtes-vous sûr de vouloir supprimer cette année fiscal
Opened=Ouverte
Closed=Clôturé
AlwaysEditable=Peut toujours être édité
-
+MAIN_APPLICATION_TITLE=Forcer la valeur visible du nom de l'application (attention : positionner ici son propre nom rendra inopérante la fonction de remplissage automatique de l'identifiant lorsque vous utilisez l'application mobile DoliDroid)
+NbMajMin=Nombre minimal de caractères majuscules
+NbNumMin=Nombre minimal de caractères numériques
+NbSpeMin=Nombre minimal de caractères spéciaux
+NbIteConsecutive=Nombre maximal de répétition des mêmes caractères
+NoAmbiCaracAutoGeneration=Ne pas utiliser des caractères ambigus ("1","l","i","|","0","O") pour la génération automatique
+SalariesSetup=Configuration du module salariés
+SortOrder=Ordre de tri
Format=Format
TypePaymentDesc=0:Type de paiement client, 1:Type de paiement fournisseur, 2:Paiement de type client et fournisseur
diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang
index 71ea27767b830438b3b5bf05ebd0ea06d6006749..be2e6083aa6d377833e1693cc274379c489e651a 100644
--- a/htdocs/langs/fr_FR/agenda.lang
+++ b/htdocs/langs/fr_FR/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= Alimentation automatique
AgendaAutoActionDesc= Définissez dans cet onglet les événements pour lesquels Dolibarr créera automatiquement une action dans l'agenda. Si aucune case n'est cochée (par défaut), seules les actions manuelles seront incluses dans l'agenda.
AgendaSetupOtherDesc= Cette page permet de configurer quelques options permettant d'exporter une vue de votre agenda Dolibarr vers un calendrier externe (Thunderbird, Google calendar, …)
AgendaExtSitesDesc=Cette page permet d'ajouter des sources de calendriers externes pour les visualiser au sein de l'agenda Dolibarr.
-ActionsEvents= Événements pour lesquels Dolibarr doit insérer un évènement dans l'agenda en automatique.
-PropalValidatedInDolibarr= Proposition %s validée
-InvoiceValidatedInDolibarr= Facture %s validée
+ActionsEvents=Événements pour lesquels Dolibarr doit insérer un évènement dans l'agenda en automatique.
+PropalValidatedInDolibarr=Proposition %s validée
+InvoiceValidatedInDolibarr=Facture %s validée
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=Facture %s repassée en brouillon
InvoiceDeleteDolibarr=Facture %s supprimée
OrderValidatedInDolibarr= Commande %s validée
@@ -51,16 +52,13 @@ OrderApprovedInDolibarr=Commande %s approuvée
OrderRefusedInDolibarr=Commande %s refusée
OrderBackToDraftInDolibarr=Commande %s repassée en brouillon
OrderCanceledInDolibarr=Commande %s annulée
-InterventionValidatedInDolibarr=Intervention %s validée
-ProposalSentByEMail=Proposition commerciale %s envoyée par EMail
-OrderSentByEMail=Commande client %s envoyée par Email
-InvoiceSentByEMail=Facture client %s envoyée par EMail
-SupplierOrderSentByEMail=Commande fournisseur %s envoyée par EMail
-SupplierInvoiceSentByEMail=Facture fournisseur %s envoyée par Email
-ShippingSentByEMail=Bon d'expédition %s envoyé par Email
+ProposalSentByEMail=Proposition commerciale %s envoyée par email
+OrderSentByEMail=Commande client %s envoyée par email
+InvoiceSentByEMail=Facture client %s envoyée par eMail
+SupplierOrderSentByEMail=Commande fournisseur %s envoyée par email
+SupplierInvoiceSentByEMail=Facture fournisseur %s envoyée par email
+ShippingSentByEMail=Bon d'expédition %s envoyé par email
ShippingValidated= Expédition %s validée
-InterventionSentByEMail=Intervention %s envoyée par Email
-InterventionClassifiedBilled=Fiche intervention %s classé Payée
NewCompanyToDolibarr= Tiers créé
DateActionPlannedStart= Date de début de réalisation prévue
DateActionPlannedEnd= Date de fin de réalisation prévue
@@ -77,7 +75,7 @@ AgendaShowBirthdayEvents=Afficher l'anniversaire des contacts
AgendaHideBirthdayEvents=Cacher l'anniversaire des contacts
Busy=Occupé
ExportDataset_event1=Liste évênements de l'agenda
-DefaultWorkingDays=jours ouvrables par défaut varient en semaine (Exemple: 1-5, 1-6)
+DefaultWorkingDays=Jours ouvrables par défaut de la semaine (Exemple: 1-5, 1-6)
DefaultWorkingHours=Heures de travail par défaut d'une journée (Exemple: 9-18)
# External Sites ical
ExportCal=Export calendrier
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index d45a9a3b0251df03fab49c7f9797199a444e0f4d..fa1eff4b0afd1e5f7c74e10b5b970a8facda06d9 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -137,8 +137,6 @@ BillFrom=Émetteur
BillTo=Adressé à
ActionsOnBill=Événements sur la facture
NewBill=Nouvelle facture
-Prélèvements=Prélèvements
-Prélèvements=Prélèvements
LastBills=Les %s dernières factures
LastCustomersBills=Les %s dernières factures clients
LastSuppliersBills=Les %s dernières factures fournisseurs
@@ -208,8 +206,8 @@ NoDraftInvoices=Pas de factures brouillons
RefBill=Réf facture
ToBill=À facturer
RemainderToBill=Reste à facturer
-SendBillByMail=Envoyer la facture par mail
-SendReminderBillByMail=Envoyer une relance par mail
+SendBillByMail=Envoyer la facture par email
+SendReminderBillByMail=Envoyer une relance par email
RelatedCommercialProposals=Propositions commerciales associées
MenuToValid=A valider
DateMaxPayment=Date limite règlement
@@ -219,8 +217,7 @@ NoInvoice=Aucune facture
ClassifyBill=Classer la facture
SupplierBillsToPay=Factures fournisseurs à payer
CustomerBillsUnpaid=Factures clients impayées
-DispenseMontantLettres=Les factures rédigées par procédés mécanographiques sont dispensées de l'arrêté en lettres
-DispenseMontantLettres=Les factures rédigées par procédés mécanographiques sont dispensées de l'arrêté en lettres
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=Non perçue réc.
SetConditions=Définir conditions de règlement
SetMode=Définir mode de règlement
@@ -300,8 +297,8 @@ LatestRelatedBill=Dernière facture en rapport
WarningBillExist=Attention, une ou plusieurs factures existent déjà
# PaymentConditions
-PaymentConditionShortRECEP=A réception
-PaymentConditionRECEP=A réception de facture
+PaymentConditionShortRECEP=À réception
+PaymentConditionRECEP=À réception de facture
PaymentConditionShort30D=30 jours
PaymentCondition30D=Règlement à 30 jours
PaymentConditionShort30DENDMONTH=30 jours fin de mois
@@ -313,7 +310,7 @@ PaymentCondition60DENDMONTH=Règlement à 60 jours fin de mois
PaymentConditionShortPT_DELIVERY=A livraison
PaymentConditionPT_DELIVERY=Règlement à la livraison
PaymentConditionShortPT_ORDER=A commande
-PaymentConditionPT_ORDER=A réception de commande
+PaymentConditionPT_ORDER=À réception de commande
PaymentConditionShortPT_5050=50/50
PaymentConditionPT_5050=Règlement 50%% d'avance, 50%% à la livraison
FixAmount=Montant Fixe
@@ -338,7 +335,7 @@ PaymentTypeShortTRA=Traite
BankDetails=Coordonnées bancaires
BankCode=Code banque
DeskCode=Code guichet
-BankAccountNumber=Numéro compte
+BankAccountNumber=Numéro de compte
BankAccountNumberKey=Clé RIB
Residence=Domiciliation
IBANNumber=Code IBAN
diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang
index 1c8d988f40337a5895d73f2cf7fd801e135faa7f..1c29dfc77724590ca178cd7bc677d235650d35c4 100644
--- a/htdocs/langs/fr_FR/categories.lang
+++ b/htdocs/langs/fr_FR/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Liens entre les fournisseurs et les catégories
CatCusLinks=Liens entre les clients/prospects et les catégories
CatProdLinks=Liens entre les produits/services et les catégories
CatMemberLinks=Liens entre les adhérents et les catégories
-CatProdLinks=Liens entre les produits/services et les catégories
-CatCusLinks=Liens entre les clients/prospects et les catégories
-CatSupLinks=Liens entre les fournisseurs et les catégories
DeleteFromCat=Supprimer de la catégorie
DeletePicture=Supprimer image
ConfirmDeletePicture=Etes-vous sur de vouloir supprimer cette image ?
@@ -112,4 +109,4 @@ CategoriesSetup=Configuration du module catégories
CategorieRecursiv=Lier avec les catégories parentes
CategorieRecursivHelp=Si activé : quand un élément est ajouté dans une catégorie, l'ajouter aussi dans toutes les catégories parentes
AddProductServiceIntoCategory=Ajouter le produit/service suivant
-ShowCategory=Afficher la catégorie
\ No newline at end of file
+ShowCategory=Afficher catégorie
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index 1f58970d1fdffb8902db7029feefce56736ad6a6..5c826d5430135382079ccdad8e2741b5daf5da48 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Compte comptable client incorrect pour %s
SuppliersProductsSellSalesTurnover=Chiffre d'affaires généré par la vente des produits des fournisseurs
CheckReceipt=Bordereau de remise de chèques
CheckReceiptShort=Bordereau
+LastCheckReceiptShort=Les %s derniers chèques reçus
NewCheckReceipt=Nouvelle remise
NewCheckDeposit=Nouveau dépôt
NewCheckDepositOn=Créer bordereau de dépôt sur compte: %s
diff --git a/htdocs/langs/fr_FR/contracts.lang b/htdocs/langs/fr_FR/contracts.lang
index 391da0f696891fce43483c334537ee1acda789aa..5f9a8b4427dd0597d0bab7743ed99c6cd11e4e14 100644
--- a/htdocs/langs/fr_FR/contracts.lang
+++ b/htdocs/langs/fr_FR/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Espace contrats
ListOfContracts=Liste des contrats
-LastContracts=Les %s derniers contrats modifiés
+LastModifiedContracts=Last %s modified contracts
AllContracts=Tous les contrats
ContractCard=Fiche contrat
ContractStatus=État du contrat
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Liste des lignes de contrats en service
ListOfRunningServices=Liste des services actifs
NotActivatedServices=Services non activés (parmi les contrats validés)
BoardNotActivatedServices=Services à activer en contrat validé
-LastContracts=Les %s derniers contrats modifiés
+LastContracts=Last % contracts
LastActivatedServices=Les %s derniers services activés
LastModifiedServices=Les %s derniers services modifiés
EditServiceLine=Edition ligne du service
diff --git a/htdocs/langs/fr_FR/cron.lang b/htdocs/langs/fr_FR/cron.lang
index 85cfb747a5c73a7a3b4d22b629d0ae22270d1357..e559c9e5bcda710ed03a0088036ae1597dd22ac9 100644
--- a/htdocs/langs/fr_FR/cron.lang
+++ b/htdocs/langs/fr_FR/cron.lang
@@ -18,9 +18,8 @@ CronExplainHowToRunUnix=Sur un environnement Unix vous pouvez utiliser 'crontab'
CronExplainHowToRunWin=Sur un environement Microsoft(tm) Windows vous pouvez utiliser le planificateur de tâche pour lancer une commande toute les minutes
# Menu
CronJobs=Travaux programmés
-CronListActive= Liste des travaux actifs
-CronListInactive= Liste des travaux inactifs
-CronListActive= Liste des travaux actifs
+CronListActive=List of active/scheduled jobs
+CronListInactive=Liste des travaux inactifs
# Page list
CronDateLastRun=Dernier lancement
CronLastOutput=Sortie du dernier lancement
diff --git a/htdocs/langs/fr_FR/donations.lang b/htdocs/langs/fr_FR/donations.lang
index e4348ab6ffaa11785b19909a7eca1bdab814f002..84081b645761af8842ec25724ed08e6d80f3405a 100644
--- a/htdocs/langs/fr_FR/donations.lang
+++ b/htdocs/langs/fr_FR/donations.lang
@@ -31,3 +31,8 @@ DonationRecipient=Bénéficiaire des versements
ThankYou=Merci
IConfirmDonationReception=Le bénéficiaire reconnait avoir reçu au titre des versements ouvrant droit à réduction d'impôt, la somme de
MinimumAmount=Don minimum de %s
+FreeTextOnDonations=Mention complémentaire sur les dons
+FrenchOptions=Options propre à la france
+DONATION_ART200=Afficher article 200 du CGI si vous êtes concernés
+DONATION_ART238=Afficher article 238 du CGI si vous êtes concernés
+DONATION_ART885=Afficher article 885 du CGI si vous êtes concernés
diff --git a/htdocs/langs/fr_FR/externalsite.lang b/htdocs/langs/fr_FR/externalsite.lang
index 7d821b0005277e0bd6ca53d33a659853235a35b1..63194e8b8369b30ca60d80e085434fafa982a7b9 100644
--- a/htdocs/langs/fr_FR/externalsite.lang
+++ b/htdocs/langs/fr_FR/externalsite.lang
@@ -2,3 +2,4 @@
ExternalSiteSetup=Configuration du lien vers le site externe
ExternalSiteURL=URL du site externe
ExternalSiteModuleNotComplete=La configuration du module "Site externe" est incomplète.
+ExampleMyMenuEntry=Mon entrée de menu
diff --git a/htdocs/langs/fr_FR/holiday.lang b/htdocs/langs/fr_FR/holiday.lang
index 43e43277b3e1b27343365f9d3f3466bc2f9eafec..88da0f5c87bb25296042315d0e94e3460ca54e73 100644
--- a/htdocs/langs/fr_FR/holiday.lang
+++ b/htdocs/langs/fr_FR/holiday.lang
@@ -1,13 +1,13 @@
# Dolibarr language file - Source file is en_US - holiday
HRM=GRH
-Holidays=Congès
-CPTitreMenu=Congès
-MenuReportMonth=Etat mensuel
-MenuAddCP=Pose un congès
+Holidays=Congés
+CPTitreMenu=Congés
+MenuReportMonth=État mensuel
+MenuAddCP=Créer une demande de congés
NotActiveModCP=Vous devez activer le module Congés pour afficher cette page.
NotConfigModCP=Vous devez configurer le module Congés pour afficher cette page. Pour effectuer cette opération, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;">cliquer ici</a>.
NoCPforUser=Vous n'avez plus de jours disponibles
-AddCP=Poser une demande de congès
+AddCP=Créer une demande de congés
Employe=Employé
DateDebCP=Date Début
DateFinCP=Date Fin
@@ -18,12 +18,12 @@ ApprovedCP=Approuvé
CancelCP=Annulée
RefuseCP=Refusée
ValidatorCP=Approbateur
-ListeCP=Liste des demandes de congès
+ListeCP=Liste des demandes de congés
ReviewedByCP=Sera approuvé par
DescCP=Description
-SendRequestCP=Créer une demande de congès
+SendRequestCP=Créer une demande de congés
DelayToRequestCP=Les demandes de congés doivent être faites au moins <b>%s jour(s)</b> avant la date de ceux-ci.
-MenuConfCP=Editer solde de congès
+MenuConfCP=Éditer le solde de congés
UpdateAllCP=Mettre à jour les congés
SoldeCPUser=Solde de congés: <b>%s jours</b>.
ErrorEndDateCP=Vous devez choisir une date de fin supérieur à la date de début.
@@ -31,11 +31,11 @@ ErrorSQLCreateCP=Une erreur SQL est survenue durant la création :
ErrorIDFicheCP=Une erreur est survenue, cette demande de congés n'existe pas.
ReturnCP=Retour à la page précédente
ErrorUserViewCP=Vous n'êtes pas autorisé à lire cette demande de congés.
-InfosCP=Information sur la demande de congès
+InfosCP=Information sur la demande de congés
InfosWorkflowCP=Informations du workflow
RequestByCP=Demandée par
-TitreRequestCP=Demande de congès
-NbUseDaysCP=Nombre de jours de congès consommés
+TitreRequestCP=Demande de congés
+NbUseDaysCP=Nombre de jours de congés consommés
EditCP=Modifier
DeleteCP=Supprimer
ActionValidCP=Valider
@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirmer la suppression de cette demande de congés ?
ErrorCantDeleteCP=Erreur, vous n'avez pas le droit de supprimer cette demande de congés.
CantCreateCP=Erreur, vous n'avez pas le droit de supprimer cette demande de congés.
InvalidValidatorCP=Vous devez choisir un approbateur pour votre demande de congés.
-UpdateButtonCP=Mettre à jour
CantUpdate=Vous ne pouvez pas mettre à jour cette demande de congés.
NoDateDebut=Vous devez choisir une date de début.
NoDateFin=Vous devez choisir une date de fin.
ErrorDureeCP=Votre demande de congés payés ne contient aucun jour ouvré.
-TitleValidCP=Approuver la demande de congès
+TitleValidCP=Approuver la demande de congés
ConfirmValidCP=Êtes-vous sûr de vouloir approuver la demande de congés ?
DateValidCP=Date d'approbation
-TitleToValidCP=Send leave request
+TitleToValidCP=Envoyer la demande de congés
ConfirmToValidCP=Êtes-vous sûr de vouloir valider la demande de congés ?
-TitleRefuseCP=Refuser la demande de congès
+TitleRefuseCP=Refuser la demande de congés
ConfirmRefuseCP=Êtes-vous sûr de vouloir valider la demande de congés ?
NoMotifRefuseCP=Vous devez choisir un motif pour refuser cette demande.
-TitleCancelCP=Annuler la demande de dongès
+TitleCancelCP=Annuler la demande de congés
ConfirmCancelCP=Êtes-vous sûr de vouloir annuler la demande de congés ?
DetailRefusCP=Motif du refus
DateRefusCP=Date du refus
@@ -72,8 +71,8 @@ MotifCP=Motif
UserCP=Utilisateur
ErrorAddEventToUserCP=Une erreur est survenue durant l'ajout du congé exceptionnel.
AddEventToUserOkCP=L'ajout du congé exceptionnel à bien été effectué.
-MenuLogCP=Voir les logs des demandes de congés
-LogCP=Historique de la mise à jours de jours de congès disponibles
+MenuLogCP=Voir journal des demandes
+LogCP=Historique de la mise à jours de jours de congés disponibles
ActionByCP=Réalisée par
UserUpdateCP=Pour l'utilisateur
PrevSoldeCP=Précédent Solde
@@ -81,19 +80,19 @@ NewSoldeCP=Nouveau Solde
alreadyCPexist=Une demande de congés a déjà été faite sur cette période.
UserName=Nom Prénom
Employee=Salarié
-FirstDayOfHoliday=Premier jour de congès
-LastDayOfHoliday=Dernier jours de congès
+FirstDayOfHoliday=Premier jour de congés
+LastDayOfHoliday=Dernier jours de congés
HolidaysMonthlyUpdate=Mise à jour mensuelle
ManualUpdate=Mise à jour manuelle
-HolidaysCancelation=Annulation de la demande de congès
+HolidaysCancelation=Annulation de la demande de congés
## Configuration du Module ##
-ConfCP=Configuration du module congès
+ConfCP=Configuration du module congés
DescOptionCP=Description de l'option
ValueOptionCP=Valeur
GroupToValidateCP=Groupe ayant la possibilité d'approuver les congés
ConfirmConfigCP=Valider la configuration
-LastUpdateCP=Dernière mise à jour automatique de l'allocation des congès
+LastUpdateCP=Dernière mise à jour automatique de l'allocation des congés
UpdateConfCPOK=Mise à jour effectuée avec succès.
ErrorUpdateConfCP=Une erreur à eu lieu durant la mise à jour, merci de réessayer.
AddCPforUsers=Veuillez ajouter le solde des congés des utilisateurs en <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">cliquant ici</a>.
@@ -104,9 +103,9 @@ AlertValidorSoldeCP=Prévenir le valideur si l'utilisateur demande des congés d
nbUserCP=Nombre d'utilisateur pris en charge dans le module congés
nbHolidayDeductedCP=Nombre de congés payés à déduire par jour de congé pris
nbHolidayEveryMonthCP=Nombre de congés ajoutés chaque mois
-Module27130Name= Gestion des demandes de congès
-Module27130Desc= Ce module permet de gérer les demandes, approbations de congès.
-TitleOptionMainCP=Réglages principaux des demandes de congès
+Module27130Name= Gestion des demandes de congés
+Module27130Desc= Ce module permet de gérer les demandes, approbations de congés.
+TitleOptionMainCP=Réglages principaux des demandes de congés
TitleOptionEventCP=Réglages des congés liés à des évènements
ValidEventCP=Valider
UpdateEventCP=Mettre à jour les évènements
@@ -117,32 +116,32 @@ ErrorCreateEventCP=Erreur lors de la création de l'évènement.
UpdateEventOkCP=La mise à jour de l'évènement s'est bien déroulé.
ErrorUpdateEventCP=Erreur lors de la mise à jour de l'évènement.
DeleteEventCP=Supprimer l'évènement
-DeleteEventOkCP=L'évènement à bien été supprimé.
+DeleteEventOkCP=L'évènement a bien été supprimé.
ErrorDeleteEventCP=Erreur lors de la suppression de l'évènement.
TitleDeleteEventCP=Supprimer un congé exceptionnel
TitleCreateEventCP=Créer un congé exceptionnel
TitleUpdateEventCP=Modifier ou supprimer un congé exceptionnel
DeleteEventOptionCP=Supprimer
UpdateEventOptionCP=Mettre à jour
-ErrorMailNotSend=Une erreur est survenue lors de l'envoi du mail :
+ErrorMailNotSend=Une erreur est survenue lors de l'envoi de l'email :
NoCPforMonth=Aucun congé ce mois-ci.
nbJours=Nombre jours
-TitleAdminCP=Configuration du module congès
+TitleAdminCP=Configuration du module congés
#Messages
Hello=Bonjour
-HolidaysToValidate=Valider les demandes de congès
+HolidaysToValidate=Valider les demandes de congés
HolidaysToValidateBody=Veuillez trouver ci-dessous une demande de congés à valider.
-HolidaysToValidateDelay=Cette demande de congés à été effectué dans un délai de moins de %s jours avant ceux-ci.
+HolidaysToValidateDelay=Cette demande de congés a été effectuée dans un délai de moins de %s jours avant ceux-ci.
HolidaysToValidateAlertSolde=L'utilisateur ayant fait cette demande de congés payés n'a pas le solde requis.
-HolidaysValidated=Valider demande de congès
+HolidaysValidated=Valider demande de congés
HolidaysValidatedBody=Votre demande de congés du %s au %s vient d'être approuvée.
HolidaysRefused=Accès refusé
HolidaysRefusedBody=Votre demande de congés payés %s à %s vient d'être refusée pour le motif suivant :
-HolidaysCanceled=Abandonner la demande de congès
+HolidaysCanceled=Abandonner la demande de congés
HolidaysCanceledBody=Votre demande de congés du %s au %s a été annulée.
-Permission20000=Lire ses propres demandes de congès
-Permission20001=Créer/modifier une demande de congès
-Permission20002=Créer/modifier les congès pour tout le monde
+Permission20000=Lire ses propres demandes de congés
+Permission20001=Créer/modifier une demande de congés
+Permission20002=Créer/modifier les congés pour tout le monde
Permission20003=Supprimer la demande de Congés
Permission20004=Configuration des jours disponibles
Permission20005=Voir l'historique des demandes de congés
diff --git a/htdocs/langs/fr_FR/interventions.lang b/htdocs/langs/fr_FR/interventions.lang
index aa0db5b2355de7e9c88b532e42467b03996c64ce..3f15a1538230b23a69ffb1477d32b4d78595e831 100644
--- a/htdocs/langs/fr_FR/interventions.lang
+++ b/htdocs/langs/fr_FR/interventions.lang
@@ -31,6 +31,14 @@ RelatedInterventions=Interventions rattachées
ShowIntervention=Afficher intervention
SendInterventionRef=Envoi de la fiche intervention %s
SendInterventionByMail=Envoyer l'intervention par email
+InterventionCreatedInDolibarr=Intervention %s créée
+InterventionValidatedInDolibarr=Intervention %s validée
+InterventionModifiedInDolibarr=Intervention %s modifiée
+InterventionClassifiedBilledInDolibarr=Intervention %s positionné à facturé
+InterventionClassifiedUnbilledInDolibarr=Intervention %s positionné à non facturé
+InterventionSentByEMail=Intervention %s envoyé par EMail
+InterventionDeletedInDolibarr=Intervention %s effacée
+SearchAnIntervention=Chercher une intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Responsable suivi de l'intervention
TypeContact_fichinter_internal_INTERVENING=Intervenant
diff --git a/htdocs/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang
index 425a4504a6efa657cb98ef5c3fc7888b44a7360f..7316d81aebef5fae054efb5eeef5fced2951426e 100644
--- a/htdocs/langs/fr_FR/mails.lang
+++ b/htdocs/langs/fr_FR/mails.lang
@@ -75,18 +75,18 @@ SentTo=Envoyés à <b>%s</b>
MailingStatusRead=Lu
CheckRead=Accusé de réception
YourMailUnsubcribeOK=L'adresse email <b>%s</b> est bien désinscrite de la liste.
-MailtoEMail=Écrire un e-mail (lien)
+MailtoEMail=Écrire un email (lien)
ActivateCheckRead=Permettre l'utilisation du lien de désinscription
ActivateCheckReadKey=Clé de sécurité permettant le chiffrement des URL utilisées dans les fonctions d'accusé de lecture et de désinscription
EMailSentToNRecipients=Email envoyé à %s destinataires.
XTargetsAdded=<b>%s</b> destinataires ajoutés dans la liste cible
EachInvoiceWillBeAttachedToEmail=Un document utilisant le modèle par défaut de facture sera généré et attaché à l'email.
MailTopicSendRemindUnpaidInvoices=Rappel de la facture %s (%s)
-SendRemind=Envoyer relance par EMail
+SendRemind=Envoyer relance par email
RemindSent=%s relance(s) envoyée(s)
AllRecipientSelectedForRemind=Tous les tiers sélectionnés et qui ont un email défini (notez qu'un email par facture sera envoyé)
-NoRemindSent=Aucun EMail de relance envoyé
-ResultOfMassSending=Résultat de l'envoi de la relance en masse par EMail
+NoRemindSent=Aucun email de relance envoyé
+ResultOfMassSending=Résultat de l'envoi de la relance en masse par email
# Libelle des modules de liste de destinataires mailing
MailingModuleDescContactCompanies=Contacts de tiers (prospects, clients, fournisseurs…)
@@ -112,15 +112,15 @@ SearchAMailing=Rechercher un emailing
SendMailing=Envoi emailing
SendMail=Envoyer email
SentBy=Envoyé par
-MailingNeedCommand=Pour des raisons de sécurité, il est recommandé de faire les envois d'un mailing de masse depuis la ligne de commande. Si en avez, demandez à votre administrateur de serveurs de lancer la commande suivante pour envoyer le mailing à tous les destinataires :
-MailingNeedCommand2=Vous pouvez toutefois quand même les envoyer par l'interface écran en ajoutant le paramètre MAILING_LIMIT_SENDBYWEB avec la valeur du nombre max de mails envoyés par session d'envoi. Pour cela, aller dans Accueil - Configuration - Divers.
+MailingNeedCommand=Pour des raisons de sécurité, les emailings fonctionnent mieux depuis la ligne de commande. Si vous en avez un, demandez à votre administrateur de lancer la commande suivante pour envoyer l'emailing à tous les destinataires :
+MailingNeedCommand2=Vous pouvez toutefois quand même les envoyer par l'interface écran en ajoutant le paramètre MAILING_LIMIT_SENDBYWEB avec la valeur du nombre maximum d'emails envoyés par session d'envoi. Pour cela, aller dans Accueil - Configuration - Divers.
ConfirmSendingEmailing=Si vous n'en avez pas ou préferrez envoyer via votre navigateur web, confirmez simplement que vous désirez envoyer l'emailing maintenant depuis le mode web ?
-LimitSendingEmailing=Rem: L'envoi d'un emailing depuis les écrans est limité pour raisons de sécurité et de timeout à <b>%s</b> destinataires par session d'envoi.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=Vider liste
ToClearAllRecipientsClickHere=Pour vider la liste des destinataires de cet emailing, cliquez sur le bouton
ToAddRecipientsChooseHere=Pour ajouter des destinataires, choisir dans les listes ci-dessous
NbOfEMailingsReceived=Emailings de masse reçus
-NbOfEMailingsSend=EMailings de masse envoyés
+NbOfEMailingsSend=Emailings de masse envoyés
IdRecord=ID enregistrement
DeliveryReceipt=Accusé de réception
YouCanUseCommaSeparatorForSeveralRecipients=Vous pouvez utiliser le caractère de séparation <b>virgule</b> pour spécifier plusieurs destinataires.
@@ -136,3 +136,6 @@ SomeNotificationsWillBeSent=%s notifications vont être envoyées par email
AddNewNotification=Activer une nouvelle cible de notification email
ListOfActiveNotifications=Liste des cibles de notifications emails actives
ListOfNotificationsDone=Liste des notifications emails envoyées
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index c665de8ffeca9879b04b788a7c139e2dc56f622e..a9571b9ac15da964db8c76c318712d210de7b85d 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -39,7 +39,7 @@ ErrorSQL=Erreur SQL
ErrorLogoFileNotFound=Le fichier logo '%s' n'a pas été trouvé
ErrorGoToGlobalSetup=Allez dans la Configuration 'Société/Institution' pour corriger
ErrorGoToModuleSetup=Allez dans la Configuration du module pour corriger
-ErrorFailedToSendMail=Échec de l'envoi du mail (émetteur=%s, destinataire=%s)
+ErrorFailedToSendMail=Échec de l'envoi de l'email (émetteur=%s, destinataire=%s)
ErrorAttachedFilesDisabled=La gestion des fichiers associés est désactivée sur ce serveur
ErrorFileNotUploaded=Le fichier n'a pas été transféré. Vérifiez que sa taille ne dépasse pas le maxium autorisé, que l'espace disque est disponible et qu'un fichier du même nom n'existe pas déjà.
ErrorInternalErrorDetected=Erreur détectée
@@ -131,7 +131,7 @@ AddActionDone=Ajouter action faite
Close=Clôturer
Close2=Fermer
Confirm=Confirmer
-ConfirmSendCardByMail=Voulez vous envoyer le contenu de cette fiche par mail à l'adresse <b>%s</b> ?
+ConfirmSendCardByMail=Voulez vous envoyer le contenu de cette fiche par email à l'adresse <b>%s</b> ?
Delete=Supprimer
Remove=Enlever
Resiliate=Résilier
@@ -367,6 +367,7 @@ ActionsOnCompany=Événements vis à vis de ce tiers
ActionsOnMember=Événements vis à vis de cet adhérent
NActions=%s événements
NActionsLate=%s en retard
+RequestAlreadyDone=Requête déjà enregistrée
Filter=Filtre
RemoveFilter=Supprimer filtre
ChartGenerated=Graphiques générés
@@ -431,8 +432,8 @@ Late=Retard
Photo=Photo
Photos=Photos
AddPhoto=Ajouter photo
-Login=Login
-CurrentLogin=Login courant
+Login=Identifiant
+CurrentLogin=Identifiant courant
January=janvier
February=février
March=mars
@@ -544,15 +545,15 @@ Redo=Refaire
ExpandAll=Tout dérouler
UndoExpandAll=Annuler déroulement
Reason=Raison
-FeatureNotYetSupported=Fonctionnalité pas encore supportée
+FeatureNotYetSupported=Fonctionnalité pas encore prise en charge
CloseWindow=Fermer fenêtre
Question=Question
Response=Réponse
Priority=Priorité
-SendByMail=Envoyer par mail
+SendByMail=Envoyer par email
MailSentBy=Mail envoyé par
-TextUsedInTheMessageBody=Corps du mail
-SendAcknowledgementByMail=Envoi A.R. par mail
+TextUsedInTheMessageBody=Corps du message
+SendAcknowledgementByMail=Envoi A.R. par email
NoEMail=Pas d'email
NoMobilePhone=Pas de téléphone portable
Owner=Propriétaire
@@ -617,7 +618,7 @@ Merge=Fusion
PrintContentArea=Afficher page d'impression de la zone centrale
MenuManager=Gestionnaire de menu
NoMenu=Aucun sous-menu
-WarningYouAreInMaintenanceMode=Attention, vous êtes en mode maintenance, aussi seul le login <b>%s</b> est autorisé à utiliser l'application en ce moment.
+WarningYouAreInMaintenanceMode=Attention, vous êtes en mode maintenance, aussi seul l'utilisateur identifié par <b>%s</b> est autorisé à utiliser l'application en ce moment.
CoreErrorTitle=Erreur système
CoreErrorMessage=Désolé, une erreur s'est produite. Vérifier les logs ou contacter l'administrateur du système.
CreditCard=Carte de crédit
@@ -625,7 +626,7 @@ FieldsWithAreMandatory=Les champs marqués par un <b>%s</b> sont obligatoires
FieldsWithIsForPublic=Les champs marqués par <b>%s</b> seront affichés sur la liste publique des membres. Si vous ne le souhaitez pas, décochez la case "public".
AccordingToGeoIPDatabase=(obtenu par conversion GeoIP)
Line=Ligne
-NotSupported=Non supporté
+NotSupported=Non pris en charge
RequiredField=Champ obligatoire
Result=Résultat
ToTest=Tester
diff --git a/htdocs/langs/fr_FR/margins.lang b/htdocs/langs/fr_FR/margins.lang
index 6244b0b14ae2dab89e2819fbd266b5da5c44dfcc..94ffd5e48a64310d5f2effb5339e66c78bfb081f 100644
--- a/htdocs/langs/fr_FR/margins.lang
+++ b/htdocs/langs/fr_FR/margins.lang
@@ -41,3 +41,4 @@ AgentContactType=Type de contact agent commercial
AgentContactTypeDetails=Définissez quel type de contact (lié aux factures) sera utiliser pour le reporting des marges par commercial
rateMustBeNumeric=Le taux doit être une valeure numérique
markRateShouldBeLesserThan100=Le taux de marque doit être inférieur à 100
+ShowMarginInfos=Afficher les infos de marges
diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang
index a94bd8fff720e892a0207b83f8f0d8c3fcdd0b1e..1abf48003b9ed9bfd2828d34b03d0756d7ecc778 100644
--- a/htdocs/langs/fr_FR/orders.lang
+++ b/htdocs/langs/fr_FR/orders.lang
@@ -53,7 +53,7 @@ ShippingExist=Une expédition existe
DraftOrWaitingApproved=Brouillon ou approuvée pas encore commandée
DraftOrWaitingShipped=Brouillon ou validée pas encore expédiée
MenuOrdersToBill=Commandes délivrées
-MenuOrdersToBill2=Commandes à facturer
+MenuOrdersToBill2=Billable orders
SearchOrder=Rechercher une commande
SearchACustomerOrder=Rechercher une commande client
ShipProduct=Expédier produit
@@ -102,7 +102,7 @@ OnProcessOrders=Commandes en cours de traitement
RefOrder=Réf. commande
RefCustomerOrder=Réf. commande client
RefCustomerOrderShort=Réf. com. client
-SendOrderByMail=Envoyer commande par mail
+SendOrderByMail=Envoyer commande par email
ActionsOnOrder=Événements sur la commande
NoArticleOfTypeProduct=Pas d'article de type 'produit' et donc expédiable dans cette commande
OrderMode=Méthode de commande
@@ -154,7 +154,6 @@ OrderByPhone=Téléphone
CreateInvoiceForThisCustomer=Facturer commandes
NoOrdersToInvoice=Pas de commandes facturables
CloseProcessedOrdersAutomatically=Classer automatiquement à "Traitées" les commandes sélectionnées.
-MenuOrdersToBill2=Commandes à facturer
OrderCreation=Date de création
Ordered=Commandé
OrderCreated=Vos commandes ont été générées
diff --git a/htdocs/langs/fr_FR/oscommerce.lang b/htdocs/langs/fr_FR/oscommerce.lang
deleted file mode 100644
index 635a43cdddfe0ca392e4349a3b34cf182a45e263..0000000000000000000000000000000000000000
--- a/htdocs/langs/fr_FR/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=Configuration du module OS Commerce
-OSCommerceSetupSaved=Configuration OS Commerce sauvegardée
-OSCommerceServer=Nom d'hôte / adresse IP serveur base de données OS Commerce
-OSCommerceDatabaseName=Nom base de données OS Commerce
-OSCommercePrefix=Préfixe tables base de données OS Commerce
-OSCommerceUser=Identifiant d'accès base de données OS Commerce
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index 2156b451102d7fb8700115152bc54ac8740cfa82..1c23cce68cb5b6df9da301ccbab5fbb1836edf92 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -23,7 +23,7 @@ Notify_WITHDRAW_CREDIT=Crédit prélèvement
Notify_WITHDRAW_EMIT=Émission prélèvement
Notify_ORDER_SENTBYMAIL=Envoi commande client par email
Notify_COMPANY_CREATE=Tiers créé
-Notify_COMPANY_SENTBYMAIL=Mail envoyé depuis la fiche Tiers
+Notify_COMPANY_SENTBYMAIL=Email envoyé depuis la fiche Tiers
Notify_PROPAL_SENTBYMAIL=Envoi proposition commerciale par email
Notify_BILL_PAYED=Recouvrement facture client
Notify_BILL_CANCEL=Annulation facture client
@@ -85,11 +85,11 @@ ModifiedById=Id utilisateur du dernier changement
ValidatedById=ID utilisateur qui a validé
CanceledById=Id utilisateur qui a annulé
ClosedById=Id utilisateur qui a fermé
-CreatedByLogin=Login utilisateur créateur
-ModifiedByLogin=Login utilisateur du dernier changement
-ValidatedByLogin=Login utilisateur qui a validé
-CanceledByLogin=Login utilisateur qui a annulé
-ClosedByLogin=Login utilisateur qui a fermé
+CreatedByLogin=Identifiant utilisateur créateur
+ModifiedByLogin=Identifiant utilisateur du dernier changement
+ValidatedByLogin=Identifiant utilisateur qui a validé
+CanceledByLogin=Identifiant utilisateur qui a annulé
+ClosedByLogin=Identifiant utilisateur qui a fermé
FileWasRemoved=Le fichier %s a été supprimé
DirWasRemoved=Le répertoire %s a été supprimé
FeatureNotYetAvailableShort=Disponible dans une prochaine version
@@ -145,7 +145,7 @@ SizeUnitinch=pouce
SizeUnitfoot=pied
SizeUnitpoint=point
BugTracker=Suivi de tickets
-SendNewPasswordDesc=Ce formulaire permet d'envoyer un nouveau mot de passe. Il sera envoyé à l'adresse email de votre utilisateur.<br>La modification du mot de passe ne sera effective qu'après validation par le destinataire en suivant le lien de confirmation inclut dans ce mail.<br>Surveillez votre messagerie.
+SendNewPasswordDesc=Ce formulaire permet d'envoyer un nouveau mot de passe. Il sera envoyé à l'adresse email de votre utilisateur.<br>La modification du mot de passe ne sera effective qu'après validation par le destinataire en suivant le lien de confirmation inclut dans cet email.<br>Surveillez votre messagerie.
BackToLoginPage=Retour page de connexion
AuthenticationDoesNotAllowSendNewPassword=Le mode d'authentification de Dolibarr est configuré à "<b>%s</b>".<br>Dans ce mode, Dolibarr n'a pas la possibilité de connaître ni de modifier votre mot de passe.<br>Contactez votre administrateur pour connaitre les modalités de changement.
EnableGDLibraryDesc=Vous devez activer ou installer la librairie GD avec votre PHP pour pouvoir activer cette option.
@@ -199,29 +199,30 @@ NewKeyIs=Voici vos nouveaux identifiants pour vous connecter
NewKeyWillBe=Vos nouveaux identifiants pour vous connecter à l'application seront
ClickHereToGoTo=Cliquez ici pour aller sur %s
YouMustClickToChange=Vous devez toutefois auparavant cliquer sur le lien suivant, afin de valider ce changement de mot de passe
-ForgetIfNothing=Si vous n'êtes pas à l'origine de la demande, ignorez simplement ce mail. Votre accès reste sécurisé.
+ForgetIfNothing=Si vous n'êtes pas à l'origine de cette demande, ignorez simplement ce message. Vos identifiants restent sécurisés.
##### Calendar common #####
AddCalendarEntry=Ajouter entrée dans le calendrier %s
-NewCompanyToDolibarr=Société %s ajoutée dans Dolibarr
-ContractValidatedInDolibarr=Contrat %s validé dans Dolibarr
-ContractCanceledInDolibarr=Contrat %s annulé dans Dolibarr
-ContractClosedInDolibarr=Contrat %s fermé dans Dolibarr
-PropalClosedSignedInDolibarr=Proposition %s signée dans Dolibarr
-PropalClosedRefusedInDolibarr=Proposition %s refusée dans Dolibarr
-PropalValidatedInDolibarr=Proposition %s validée dans Dolibarr
-InvoiceValidatedInDolibarr=Facture %s validée dans Dolibarr
-InvoicePaidInDolibarr=Facture %s passée à payée dans Dolibarr
-InvoiceCanceledInDolibarr=Facture %s annulée dans Dolibarr
-PaymentDoneInDolibarr=Paiement %s réalisé dans Dolibarr
-CustomerPaymentDoneInDolibarr=Paiement client %s dans Dolibarr
-SupplierPaymentDoneInDolibarr=Paiement fournisseur %s dans Dolibarr
-MemberValidatedInDolibarr=Adhérent %s validé dans Dolibarr
-MemberResiliatedInDolibarr=Adhérent %s résilié dans Dolibarr
-MemberDeletedInDolibarr=Adhérent %s supprimé de Dolibarr
-MemberSubscriptionAddedInDolibarr=Souscription adhérent %s ajoutée dans Dolibarr
-ShipmentValidatedInDolibarr=Expédition %s validée dans Dolibarr
-ShipmentDeletedInDolibarr=Expédition %s supprimé de Dolibarr
+NewCompanyToDolibarr=Société %s ajoutée
+ContractValidatedInDolibarr=Contrat %s validé
+ContractCanceledInDolibarr=Contrat %s annulé
+ContractClosedInDolibarr=Contrat %s fermé
+PropalClosedSignedInDolibarr=Proposition %s signée
+PropalClosedRefusedInDolibarr=Proposition %s refusée
+PropalValidatedInDolibarr=Proposition %s validée
+PropalClassifiedBilledInDolibarr=Proposition %s classée payée
+InvoiceValidatedInDolibarr=Facture %s validée
+InvoicePaidInDolibarr=Facture %s passée à payée
+InvoiceCanceledInDolibarr=Facture %s annulée
+PaymentDoneInDolibarr=Paiement %s réalisé
+CustomerPaymentDoneInDolibarr=Paiement client %s
+SupplierPaymentDoneInDolibarr=Paiement fournisseur %s
+MemberValidatedInDolibarr=Adhérent %s validé
+MemberResiliatedInDolibarr=Adhérent %s résilié
+MemberDeletedInDolibarr=Adhérent %s supprimé
+MemberSubscriptionAddedInDolibarr=Souscription adhérent %s
+ShipmentValidatedInDolibarr=Expédition %s validée
+ShipmentDeletedInDolibarr=Expédition %s supprimée
##### Export #####
Export=Export
ExportsArea=Espace exports
diff --git a/htdocs/langs/fr_FR/paybox.lang b/htdocs/langs/fr_FR/paybox.lang
index 3b1f63dac2e4e7f7289e4f06200cd1ebacb7b85b..89074fa87f314c530710d2f60834a610f7b44eae 100644
--- a/htdocs/langs/fr_FR/paybox.lang
+++ b/htdocs/langs/fr_FR/paybox.lang
@@ -34,4 +34,7 @@ MessageOK=Message sur page de retour de paiement validé
MessageKO=Message sur page de retour de paiement annulé
NewPayboxPaymentReceived=Nouveau paiement Paybox reçu
NewPayboxPaymentFailed=Nouveau paiement Paybox tenté mais en échec
-PAYBOX_PAYONLINE_SENDEMAIL=EMail à prévenir en cas de paiement (succès ou non)
+PAYBOX_PAYONLINE_SENDEMAIL=Email à prévenir en cas de paiement (succès ou non)
+PAYBOX_PBX_SITE=Site
+PAYBOX_PBX_RANG=Rang
+PAYBOX_PBX_IDENTIFIANT=Identifiant
diff --git a/htdocs/langs/fr_FR/resource.lang b/htdocs/langs/fr_FR/resource.lang
old mode 100755
new mode 100644
index 5059d628092327031428e7562579572337c067a6..c7fb29d33725242d8cd3372edd09f04de1ab53df
--- a/htdocs/langs/fr_FR/resource.lang
+++ b/htdocs/langs/fr_FR/resource.lang
@@ -1,37 +1,36 @@
MenuResourceIndex=Ressources
MenuResourceAdd=Nouvelle ressource
-MenuResourcePlanning=Planning des Ressources
+MenuResourcePlanning=Resources
DeleteResource=Effacer ressource
-ConfirmDeleteResourceElement=Confirmer la suppression de la ressource pour cet élément
-NoResourceInDatabase=Aucune ressource en base de données.
+ConfirmDeleteResourceElement=Confirmer la suppression de cette ressource ?
+NoResourceInDatabase=Pas de ressource en base
NoResourceLinked=Aucune ressource liée
-ResourcePageIndex=Liste des Ressources
-ResourceSingular=Ressource
-ResourceCard=Fiche ressource
-AddResource=Ajouter une ressource
+ResourcePageIndex=Liste des ressources
+ResourceSingular=Resource
+ResourceCard=Fiche
+AddResource=Créer une ressource
ResourceFormLabel_ref=Nom de la ressource
-ResourceType=Type de la ressource
+ResourceType=Type de ressource
ResourceFormLabel_description=Description de la ressource
-ResourcesLinkedToElement=Ressources liées à l'élément
-RessourceLineSuccessfullyUpdated=Ressource mise à jour
-RessourceLineSuccessfullyDeleted=Ressource supprimée
+ResourcesLinkedToElement=Ressource lié au document
-ShowResourcePlanning=Montrer le planning des ressources
-PlanningOfAffectedResources=Planning des ressources affectées aux évènements
-GotoDate=Afficher la date
+ShowResourcePlanning=Afficher ressource
+GotoDate=Aller à un date
-ResourceElementPage=Ressources de l'élément
-ResourceCreatedWithSuccess=Ressource créee avec succès
-RessourceLineSuccessfullyDeleted=Ressource supprimée avec succès
-RessourceLineSuccessfullyUpdated=Ressource mise à jour
+ResourceElementPage=Ressources
+ResourceCreatedWithSuccess=Ressource créée avec succès
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
ResourceLinkedWithSuccess=Ressource liée avec succès
TitleResourceCard=Fiche ressource
-ConfirmDeleteResource=Confirmer la suppression de cette ressource?
-RessourceSuccessfullyDeleted=Ressource effacée avec succès
-DictionaryResourceType=Type de ressources
+ConfirmDeleteResource=Confirmer la suppression de cette ressource ?
+RessourceSuccessfullyDeleted=Ressource supprimée avec succès
+DictionaryResourceType=Type de ressource
-SelectResource=Sélectionner la ressource
+DictionaryEMailTemplates=Modèles d'emails
+
+SelectResource=Sélectionner ressource
diff --git a/htdocs/langs/fr_FR/sendings.lang b/htdocs/langs/fr_FR/sendings.lang
index 3f839ba9416c66f9b78ac98d600560dc5c8e5724..4e7528f2db702fe2d3fc16f2efd2c704af9197f5 100644
--- a/htdocs/langs/fr_FR/sendings.lang
+++ b/htdocs/langs/fr_FR/sendings.lang
@@ -61,8 +61,8 @@ ShipmentCreationIsDoneFromOrder=Pour le moment, la création d'une nouvelle exp
RelatedShippings=Expédition(s) associée(s)
ShipmentLine=Ligne d'expédition
CarrierList=Liste des transporteurs
-SendingRunning=Produits de commandes clients déjà expédiés
-SuppliersReceiptRunning=Produits de commandes fournisseurs déjà réceptionnés
+SendingRunning=Les produits de la commandes clients ont déjà été envoyés
+SuppliersReceiptRunning=Les produits de la commandes fournisseurs ont déjà été reçus
# Sending methods
SendingMethodCATCH=Enlèvement par le client
diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang
index 7e83ee744ede6a824a2b4d33d58c181679b9210c..8749207cd833de8e9e390771990db67e666892a4 100644
--- a/htdocs/langs/fr_FR/stocks.lang
+++ b/htdocs/langs/fr_FR/stocks.lang
@@ -10,7 +10,7 @@ WarehouseClosed=Entrepôt fermé
WarehouseSource=Entrepôt source
WarehouseSourceNotDefined=Aucun entrepôt défini,
AddOne=En ajouter un
-WarehouseTarget=Entrepôt cible
+WarehouseTarget=Entrepôt destination
ValidateSending=Valider expédition
CancelSending=Annuler expédition
DeleteSending=Supprimer expédition
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Le libellé de l'entrepôt est obligatoire
CorrectStock=Corriger le stock
ListOfWarehouses=Liste des entrepôts
ListOfStockMovements=Liste des mouvements de stock
-StocksArea=Espace stocks
+StocksArea=Espace entrepôts
Location=Lieu
LocationSummary=Nom court du lieu
NumberOfDifferentProducts=Nombre de produits différents
@@ -115,7 +115,7 @@ NbOfProductAfterPeriod=Quantité du produit <b>%s</b> en stock après la périod
MassMovement=Mouvement en masse
MassStockMovement=Mouvement de stock en masse
SelectProductInAndOutWareHouse=Sélectionner un produit, une quantité à transférer, un entrepôt source et destination et cliquer sur "%s". Une fois tous les mouvements choisis, cliquer sur "%s".
-RecordMovement=Enregistrer transferts
+RecordMovement=Enregistrer transfert
ReceivingForSameOrder=Réceptions pour cette commande
StockMovementRecorded=Mouvement de stocks enregistré
RuleForStockAvailability=Règles d'exigence sur les stocks
diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang
index a41a33da48dba06731219c8de15a255481df5b6d..5aaa267262781eca07390e227ff397f77bfe2b52 100644
--- a/htdocs/langs/fr_FR/users.lang
+++ b/htdocs/langs/fr_FR/users.lang
@@ -63,7 +63,6 @@ ShowGroup=Afficher groupe
ShowUser=Afficher utilisateur
NonAffectedUsers=Utilisateurs non affectés au groupe
UserModified=Utilisateur correctement modifié
-GroupModified=Groupe correctement modifié
PhotoFile=Fichier image
UserWithDolibarrAccess=Utilisateur avec accès Dolibarr
ListOfUsersInGroup=Liste des utilisateurs dans ce groupe
@@ -103,7 +102,7 @@ UserDisabled=Désactivation utilisateur %s
UserEnabled=Activation utilisateur %s
UserDeleted=Suppression utilisateur %s
NewGroupCreated=Création groupe %s
-GroupModified=Groupe correctement modifié
+GroupModified=Group %s modified
GroupDeleted=Suppression groupe %s
ConfirmCreateContact=Êtes-vous sûr de vouloir créer un compte Dolibarr pour ce contact ?
ConfirmCreateLogin=Êtes-vous sûr de vouloir créer un compte Dolibarr pour cet adhérent ?
diff --git a/htdocs/langs/fr_FR/withdrawals.lang b/htdocs/langs/fr_FR/withdrawals.lang
index d39b2dcea913a14546f3b10ae4c775dd3a98b96c..a8d290c25fa57b13d92ce211a178d5a1f2516b48 100644
--- a/htdocs/langs/fr_FR/withdrawals.lang
+++ b/htdocs/langs/fr_FR/withdrawals.lang
@@ -16,6 +16,7 @@ WithdrawedBills=Factures prélevées
WithdrawalsLines=Lignes de prélèvements
RequestStandingOrderToTreat=Demandes de prélèvements à traiter
RequestStandingOrderTreated=Demandes de prélèvements traitées
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Fonction non disponible. Le statut du bon de prélèvement doit être mis 'à créditer' avant d'effectuer un rejet sur des lignes spécifiques.
CustomersStandingOrders=Prélèvements clients
CustomerStandingOrder=Prélèvement client
NbOfInvoiceToWithdraw=Nombre de factures en attente de prélèvement
@@ -40,14 +41,13 @@ TransMetod=Méthode de transmission
Send=Envoyer
Lines=Lignes
StandingOrderReject=Émettre un rejet
-InvoiceRefused=Facture rejetée
WithdrawalRefused=Rejet de prélèvement
WithdrawalRefusedConfirm=Êtes-vous sûr de vouloir saisir un rejet de prélèvement pour la société
RefusedData=Date du rejet
RefusedReason=Motif du rejet
RefusedInvoicing=Facturation du rejet
NoInvoiceRefused=Ne pas facturer le rejet
-InvoiceRefused=Facture rejetée
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=État
StatusUnknown=Inconnu
StatusWaiting=En attente
@@ -76,7 +76,7 @@ WithBankUsingRIB=Pour les comptes bancaires utilisant le RIB
WithBankUsingBANBIC=Pour les comptes bancaires utilisant le code BAN/BIC/SWIFT
BankToReceiveWithdraw=Compte bancaire recevant les prélèvements
CreditDate=Crédité le
-WithdrawalFileNotCapable=Impossible de générer un fichier de bons de prélèvements pour votre pays
+WithdrawalFileNotCapable=Impossible de générer le fichier de reçu des prélèvement pour votre pays %s (Votre pays n'est pas supporté)
ShowWithdraw=Voir prélèvement
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Toutefois, si la facture a au moins un paiement par prélèvement non traité, elle ne le sera pas afin de permettre la gestion du prélèvement d'abord.
DoStandingOrdersBeforePayments=Cet onglet permet de faire une demande de prélèvement bancaire. Une fois réalisé, vous pourrez saisir le paiement sur la facture pour la clôturer.
diff --git a/htdocs/langs/he_IL/accountancy.lang b/htdocs/langs/he_IL/accountancy.lang
index 8cab9d2b651d75b0721d76fda619e2034e4509b4..39c2732ec29852cf93d41614ed1812c2a4c1ce4f 100644
--- a/htdocs/langs/he_IL/accountancy.lang
+++ b/htdocs/langs/he_IL/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts
Validate=Validate
Addanaccount=Add an accounting account
AccountAccounting=Accounting account
-Ventilation=Ventilation
+Ventilation=Breakdown
ToDispatch=To dispatch
Dispatched=Dispatched
-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
TradeMargin=Trade margin
Reports=Reports
ByCustomerInvoice=By invoices customers
@@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger
Bookkeeping=General ledger
AccountBalanceByMonth=Account balance by month
-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
Line=Line
CAHTF=Total purchase supplier HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice
IntoAccount=In the accounting account
Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
+VentilationAuto=Automatic breakdown
Processing=Processing
EndProcessing=The end of processing
@@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account
ACCOUNTING_SEPARATORCSV=Separator CSV
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
@@ -140,14 +140,14 @@ Active=Statement
NewFiscalYear=New fiscal year
-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
TotalVente=Total turnover HT
TotalMarge=Total sales margin
DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
ChangeAccount=Change the accounting account for lines selected by the account:
Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
@@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically
ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index a00efa4fd6d404e5c597644d0d2d0e28f007344e..d43027916e71844891025fbcde3d28942ae73f70 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -437,8 +437,8 @@ Module52Name=מניות
Module52Desc=המניה של וניהול של מוצרים
Module53Name=שירותים
Module53Desc=שירות של ניהול
-Module54Name=חוזים
-Module54Desc=חוזה של וניהול של שירות
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=ברקודים
Module55Desc=ברקוד של ההנהלה
Module56Name=טלפוניה
@@ -475,8 +475,8 @@ Module320Name=עדכוני RSS
Module320Desc=הוסף עדכון RSS בתוך דפי Dolibarr מסך
Module330Name=הסימניות
Module330Desc=הפוך ההנהלה
-Module400Name=פרוייקטים
-Module400Desc=פרויקט של ניהול בתוך מודולים אחרים
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=לוח השנה
Module410Desc=שילוב לוח השנה
Module500Name=Special expenses (tax, social contributions, dividends)
@@ -484,7 +484,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di
Module510Name=Salaries
Module510Desc=Management of employees salaries and payments
Module600Name=הודעות
-Module600Desc=שלח דיווחים בדואר אלקטרוני על כמה אירועים עסקיים Dolibarr לאנשי הקשר הצד השלישי
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=תרומות
Module700Desc=התרומה של ההנהלה
Module1200Name=גמל שלמה
@@ -514,16 +514,16 @@ Module5000Name=רב החברה
Module5000Desc=מאפשר לך לנהל מספר רב של חברות
Module6000Name=Workflow
Module6000Desc=Workflow management
-Module20000Name=Holidays
-Module20000Desc=Declare and follow employees holidays
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
Module39000Name=Product batch
Module39000Desc=Batch number, eat-by and sell-by date management on products
Module50000Name=PayBox
Module50000Desc=מודול להציע בדף התשלום באינטרנט באמצעות כרטיס אשראי עם PayBox
Module50100Name=נקודת מכירות
Module50100Desc=נקודת מודול מכירות
-Module50200Name= Paypal
-Module50200Desc= מודול להציע בדף התשלום באינטרנט באמצעות כרטיס אשראי עם Paypal
+Module50200Name=Paypal
+Module50200Desc=מודול להציע בדף התשלום באינטרנט באמצעות כרטיס אשראי עם Paypal
Module50400Name=Accounting (advanced)
Module50400Desc=Accounting management (double parties)
Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=לקרוא הוראות קבע
Permission152=צור / לשנות בקשה הוראות הקבע
Permission153=עומדים שידור הזמנות קבלות
Permission154=כרטיס אשראי / לסרב עומדים קבלות הזמנות
-Permission161=לקרוא חוזים
-Permission162=צור / לשנות חוזים
-Permission163=להפעיל שירות של החוזה
-Permission164=השבתת שירות של החוזה
-Permission165=מחק את החוזים
-Permission171=קרא טיולים
-Permission172=צור / לשנות טיולים
-Permission173=מחק טיולים
-Permission178=ייצוא טיולים
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Read trips and expenses (own and his subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
Permission180=קרא ספקים
Permission181=לקרוא הזמנות ספקים
Permission182=ליצור / לשנות הספק הזמנות
@@ -671,7 +672,7 @@ Permission300=לקרוא ברקודים
Permission301=צור / לשנות הברקודים
Permission302=מחק את הברקודים
Permission311=לקרוא שירותים
-Permission312=הקצאת שירות לחוזה
+Permission312=Assign service/subscription to contract
Permission331=קרא את הסימניות
Permission332=צור / לשנות הסימניות
Permission333=מחק סימניות
@@ -701,8 +702,8 @@ Permission701=לקרוא תרומות
Permission702=צור / לשנות תרומות
Permission703=מחק תרומות
Permission1001=לקרוא מניות
-Permission1002=יצירה / שינוי במניות
-Permission1003=מחיקת מניות
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=לקרוא תנועות של מניות
Permission1005=צור / לשנות תנועות של מניות
Permission1101=לקרוא הזמנות משלוחים
@@ -1038,7 +1039,6 @@ YesInSummer=Yes in summer
OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
SuhosinSessionEncrypt=Session storage encrypted by Suhosin
ConditionIsCurrently=Condition is currently %s
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
YouUseBestDriver=You use driver %s that is best driver available currently.
YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=חזור קוד חשבון נבנה על ידי: <br>
ModuleCompanyCodePanicum=חזור קוד חשבון ריק.
ModuleCompanyCodeDigitaria=קוד חשבונאות תלוי קוד של צד שלישי. הקוד מורכב בעל אופי "C" בעמדה 1 ואחריו את 5 התווים הראשונים של קוד של צד שלישי.
UseNotifications=השתמש הודעות
-NotificationsDesc=הודעות דוא"ל והודעות התכונה מאפשרת לך בשקט לשלוח דואר אוטומטי, על כמה אירועים Dolibarr, לצדדים שלישיים (לקוחות או ספקים) אשר מוגדרים. הבחירה של ההודעה פעיל במגעים מטרות עשוי צד אחד 3 בזמן.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
ModelModules=תבניות מסמכים
DocumentModelOdt=צור מסמכים מתבניות OpenDocuments (. ODT קבצים של אופן אופיס, KOffice, TextEdit, ...)
WatermarkOnDraft=סימן מים על מסמך טיוטה
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=הוסף תאריך יכולת המסירה
UseOptionLineIfNoQuantity=קו של המוצר / שירות עם כמות אפס נחשבת כאופציה
FreeLegalTextOnProposal=טקסט חופשי על הצעות מסחריות
WatermarkOnDraftProposal=סימן מים על הצעות טיוטה מסחריים (כל אם ריק)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=התקנה וניהול של סדר
OrdersNumberingModules=הזמנות מספור מודולים
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list
ValidOrderAfterPropalClosed=כדי לאמת את הסדר אחרי קרוב ההצעה, מאפשרת לא לדרוך על פי צו זמני
FreeLegalTextOnOrders=טקסט חינם על הזמנות
WatermarkOnDraftOrders=סימן מים על צווי הגיוס (כל אם ריק)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
##### Clicktodial #####
ClickToDialSetup=לחץ כדי לחייג ההתקנה מודול
ClickToDialUrlDesc=כתובת האתר נקרא כאשר לחיצה על הטלפון picto נעשה. ב-URL, ניתן להשתמש בתגיות <br> <b>__PHONETO__</b> כי יוחלף מספר הטלפון של אדם לקרוא <br> <b>__PHONEFROM__</b> כי יוחלף מספר הטלפון של אדם קורא (שלך) <br> <b>__LOGIN__</b> כי יוחלפו התחברות clicktodial שלך (המוגדר בכרטיס המשתמש שלך) <br> <b>__PASS__</b> כי יוחלף עם הסיסמה clicktodial שלך (המוגדר בכרטיס המשתמש שלך).
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=התערבות מודולים מספור
TemplatePDFInterventions=כרטיס התערבות מסמכים דגמים
WatermarkOnDraftInterventionCards=סימן מים על מסמכים כרטיס התערבות (כל אם ריק)
##### Contracts #####
-ContractsSetup=חוזים מודול ההתקנה
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=חוזים מספור מודולים
TemplatePDFContracts=Contracts documents models
FreeLegalTextOnContracts=Free text on contracts
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
CacheByServer=Cache by server
CacheByClient=Cache by browser
CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=מוצרים מודול ההתקנה
ServiceSetup=מודול שירותי התקנה
@@ -1382,9 +1384,10 @@ MailingSetup=שליחת הדוא"ל ההתקנה מודול
MailingEMailFrom=כתובת אימייל של השולח (מ) על הודעות דוא"ל שנשלחו על ידי דואר אלקטרוני מודול
MailingEMailError=חזור דואר אלקטרוני (שגיאות ל) עבור הודעות דוא"ל עם שגיאות
##### Notification #####
-NotificationSetup=הודעה על מודול bu דוא"ל ההתקנה
+NotificationSetup=EMail notification module setup
NotificationEMailFrom=כתובת אימייל של השולח (מ) על הודעות דוא"ל שנשלחו עבור הודעות
-ListOfAvailableNotifications=רשימת הודעות הזמינות (רשימה זו תלויה מודולים הופעל)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
##### Sendings #####
SendingsSetup=שליחת ההתקנה מודול
SendingsReceiptModel=שליחת מודל קבלת
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=חיבור "%s של שרת" %s "מסד נתונ
OSCommerceTestKo1=חיבור "%s" שרת להצליח אבל "%s" מסד נתונים לא ניתן היה להשיג.
OSCommerceTestKo2=חיבור "%s של שרת עם" %s "המשתמש נכשל.
##### Stock #####
-StockSetup=מודול תצורת המניות
-UserWarehouse=השתמש מניות משתמש אישיים
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=תפריט נמחק
TreeMenu=עץ תפריטים
@@ -1478,11 +1482,14 @@ ClickToDialDesc=מודול זה מאפשר להוסיף סמל אחרי מספר
##### Point Of Sales (CashDesk) #####
CashDesk=נקודת מכירות
CashDeskSetup=נקודת ההתקנה מודול מכירות
-CashDeskThirdPartyForSell=צד שלישי Generic להשתמש עבור מוכר
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=חשבון ברירת מחדל להשתמש כדי לקבל תשלומים במזומן
CashDeskBankAccountForCheque= חשבון ברירת מחדל להשתמש כדי לקבל תשלומים על ידי סימון
CashDeskBankAccountForCB= חשבון ברירת מחדל להשתמש כדי לקבל תשלומים במזומן באמצעות כרטיסי אשראי
-CashDeskIdWareHouse=מחסן לשימוש עבור מוכר
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=הפוך ההתקנה מודול
BookmarkDesc=מודול זה מאפשר לך לנהל את הסימניות. ניתן גם להוסיף קיצורי דרך לכל הדפים Dolibarr או אתרי אינטרנט externale בתפריט השמאלי.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Delete fiscal year
ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
Opened=Opened
Closed=Closed
-
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
diff --git a/htdocs/langs/he_IL/agenda.lang b/htdocs/langs/he_IL/agenda.lang
index cbfb9f7c49b71ced40e292fb0f44ab2521278f60..9dac68e1252c66ea08b2c277d1a5542d52720a9f 100644
--- a/htdocs/langs/he_IL/agenda.lang
+++ b/htdocs/langs/he_IL/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= Automatic filling
AgendaAutoActionDesc= Define here events for which you want Dolibarr to create automatically an event in agenda. If nothing is checked (by default), only manual actions will be included in agenda.
AgendaSetupOtherDesc= This page provides options to allow export of your Dolibarr events into an external calendar (thunderbird, google calendar, ...)
AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda.
-ActionsEvents= Events for which Dolibarr will create an action in agenda automatically
-PropalValidatedInDolibarr= Proposal %s validated
-InvoiceValidatedInDolibarr= Invoice %s validated
+ActionsEvents=Events for which Dolibarr will create an action in agenda automatically
+PropalValidatedInDolibarr=Proposal %s validated
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
InvoiceDeleteDolibarr=Invoice %s deleted
OrderValidatedInDolibarr= Order %s validated
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Order %s approved
OrderRefusedInDolibarr=Order %s refused
OrderBackToDraftInDolibarr=Order %s go back to draft status
OrderCanceledInDolibarr=Order %s canceled
-InterventionValidatedInDolibarr=Intervention %s validated
ProposalSentByEMail=Commercial proposal %s sent by EMail
OrderSentByEMail=Customer order %s sent by EMail
InvoiceSentByEMail=Customer invoice %s sent by EMail
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=Supplier order %s sent by EMail
SupplierInvoiceSentByEMail=Supplier invoice %s sent by EMail
ShippingSentByEMail=Shipping %s sent by EMail
ShippingValidated= Shipping %s validated
-InterventionSentByEMail=Intervention %s sent by EMail
-InterventionClassifiedBilled=Intervention %s classified as Billed
NewCompanyToDolibarr= Third party created
DateActionPlannedStart= Planned start date
DateActionPlannedEnd= Planned end date
@@ -70,9 +68,9 @@ DateActionStart= Start date
DateActionEnd= End date
AgendaUrlOptions1=You can also add following parameters to filter output:
AgendaUrlOptions2=<b>login=%s</b> to restrict output to actions created by, assigned to or done by user <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions created by user <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> to restrict output to actions done by user <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
AgendaShowBirthdayEvents=Show birthday's contacts
AgendaHideBirthdayEvents=Hide birthday's contacts
Busy=Busy
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=URL to access .ical file
ExtSiteNoLabel=No Description
WorkingTimeRange=Working time range
WorkingDaysRange=Working days range
-AddEvent=Add event
+AddEvent=Create event
MyAvailability=My availability
diff --git a/htdocs/langs/he_IL/bills.lang b/htdocs/langs/he_IL/bills.lang
index 1e2d936607f6c3bc1a654afa53eadf179788b9a0..1c56451ffdc65b7f0f4d90b67d69dd2c0ad8c4fd 100644
--- a/htdocs/langs/he_IL/bills.lang
+++ b/htdocs/langs/he_IL/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=כתב זכויות
InvoiceAvoirAsk=Credit note to correct invoice
InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example).
invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
-invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
ReplaceInvoice=Replace invoice %s
ReplacementInvoice=Replacement invoice
ReplacedByInvoice=Replaced by invoice %s
@@ -87,7 +87,7 @@ ClassifyCanceled=Classify 'Abandoned'
ClassifyClosed=Classify 'Closed'
ClassifyUnBilled=Classify 'Unbilled'
CreateBill=Create Invoice
-AddBill=Add invoice or credit note
+AddBill=Create invoice or credit note
AddToDraftInvoices=Add to draft invoice
DeleteBill=Delete invoice
SearchACustomerInvoice=Search for a customer invoice
@@ -99,7 +99,7 @@ DoPaymentBack=Do payment back
ConvertToReduc=Convert into future discount
EnterPaymentReceivedFromCustomer=Enter payment received from customer
EnterPaymentDueToCustomer=Make payment due to customer
-DisabledBecauseRemainderToPayIsZero=Disabled because remainder to pay is zero
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
Amount=Amount
PriceBase=Price base
BillStatus=Invoice status
@@ -137,8 +137,6 @@ BillFrom=From
BillTo=To
ActionsOnBill=Actions on invoice
NewBill=New invoice
-Prélèvements=Standing order
-Prélèvements=Standing order
LastBills=Last %s invoices
LastCustomersBills=Last %s customers invoices
LastSuppliersBills=Last %s suppliers invoices
@@ -156,9 +154,9 @@ ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b> ?
ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned' ?
ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid ?
ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice ?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
@@ -191,9 +189,9 @@ AlreadyPaid=Already paid
AlreadyPaidBack=Already paid back
AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposits)
Abandoned=Abandoned
-RemainderToPay=Remainder to pay
-RemainderToTake=Remainder to take
-RemainderToPayBack=Remainder to pay back
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
Rest=Pending
AmountExpected=Amount claimed
ExcessReceived=Excess received
@@ -219,19 +217,18 @@ NoInvoice=No invoice
ClassifyBill=Classify invoice
SupplierBillsToPay=Suppliers invoices to pay
CustomerBillsUnpaid=Unpaid customers invoices
-DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters
-DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=Non-recoverable
SetConditions=Set payment terms
SetMode=Set payment mode
Billed=Billed
-RepeatableInvoice=Pre-defined invoice
-RepeatableInvoices=Pre-defined invoices
-Repeatable=Pre-defined
-Repeatables=Pre-defined
-ChangeIntoRepeatableInvoice=Convert into pre-defined
-CreateRepeatableInvoice=Create pre-defined invoice
-CreateFromRepeatableInvoice=Create from pre-defined invoice
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines
CustomersInvoicesAndPayments=Customer invoices and payments
ExportDataset_invoice_1=Customer invoices list and invoice's lines
diff --git a/htdocs/langs/he_IL/categories.lang b/htdocs/langs/he_IL/categories.lang
index ae0b9d441affbe2b6630b3435d4cbe9c19fbc0a7..244341b4fba1349832bbc318598317b7213e6106 100644
--- a/htdocs/langs/he_IL/categories.lang
+++ b/htdocs/langs/he_IL/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories
CatCusLinks=Links between customers/prospects and categories
CatProdLinks=Links between products/services and categories
CatMemberLinks=Links between members and categories
-CatProdLinks=Links between products/services and categories
-CatCusLinks=Links between customers/prospects and categories
-CatSupLinks=Links between suppliers and categories
DeleteFromCat=Remove from category
DeletePicture=Picture delete
ConfirmDeletePicture=Confirm picture deletion?
@@ -112,3 +109,4 @@ CategoriesSetup=Categories setup
CategorieRecursiv=Link with parent category automatically
CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category
diff --git a/htdocs/langs/he_IL/compta.lang b/htdocs/langs/he_IL/compta.lang
index b172c139c4e240b5dc0588afc148766b2f3491ff..b0b9b337ac444b5b75480270d081fa5d3ef9bb57 100644
--- a/htdocs/langs/he_IL/compta.lang
+++ b/htdocs/langs/he_IL/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s
SuppliersProductsSellSalesTurnover=The generated turnover by the sales of supplier's products.
CheckReceipt=Check deposit
CheckReceiptShort=Check deposit
+LastCheckReceiptShort=Last %s check receipts
NewCheckReceipt=New discount
NewCheckDeposit=New check deposit
NewCheckDepositOn=Create receipt for deposit on account: %s
diff --git a/htdocs/langs/he_IL/contracts.lang b/htdocs/langs/he_IL/contracts.lang
index 245466d70e1f5e4ad4f8e2d680416c1a577b37db..3181cfe48369f4ea26401f93e816ee5f83829d12 100644
--- a/htdocs/langs/he_IL/contracts.lang
+++ b/htdocs/langs/he_IL/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Contracts area
ListOfContracts=List of contracts
-LastContracts=Last %s modified contracts
+LastModifiedContracts=Last %s modified contracts
AllContracts=All contracts
ContractCard=Contract card
ContractStatus=Contract status
@@ -27,7 +27,7 @@ MenuRunningServices=Running services
MenuExpiredServices=Expired services
MenuClosedServices=Closed services
NewContract=New contract
-AddContract=Add contract
+AddContract=Create contract
SearchAContract=Search a contract
DeleteAContract=Delete a contract
CloseAContract=Close a contract
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines
ListOfRunningServices=List of running services
NotActivatedServices=Inactive services (among validated contracts)
BoardNotActivatedServices=Services to activate among validated contracts
-LastContracts=Last %s modified contracts
+LastContracts=Last % contracts
LastActivatedServices=Last %s activated services
LastModifiedServices=Last %s modified services
EditServiceLine=Edit service line
diff --git a/htdocs/langs/he_IL/cron.lang b/htdocs/langs/he_IL/cron.lang
index c17606bb6eb48f85f5090158f165d9cd957d4e11..492e92c956ffdbb548d625d2d4a89c0d87c78570 100644
--- a/htdocs/langs/he_IL/cron.lang
+++ b/htdocs/langs/he_IL/cron.lang
@@ -1,114 +1,86 @@
# Dolibarr language file - Source file is en_US - cron
-#
# About page
-#
-# About = About
-# CronAbout = About Cron
-# CronAboutPage = Cron about page
-
-#
+About = About
+CronAbout = About Cron
+CronAboutPage = Cron about page
# Right
-#
-# Permission23101 = Read Scheduled task
-# Permission23102 = Create/update Scheduled task
-# Permission23103 = Delete Scheduled task
-# Permission23104 = Execute Scheduled task
-
-#
+Permission23101 = Read Scheduled task
+Permission23102 = Create/update Scheduled task
+Permission23103 = Delete Scheduled task
+Permission23104 = Execute Scheduled task
# Admin
-#
-# CronSetup= Scheduled job management setup
-# URLToLaunchCronJobs=URL to check and launch cron jobs if required
-# OrToLaunchASpecificJob=Or to check and launch a specific job
-# KeyForCronAccess=Security key for URL to launch cron jobs
-# FileToLaunchCronJobs=Command line to launch cron jobs
-# CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes
-# CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
-
-
-#
+CronSetup= Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch cron jobs if required
+OrToLaunchASpecificJob=Or to check and launch a specific job
+KeyForCronAccess=Security key for URL to launch cron jobs
+FileToLaunchCronJobs=Command line to launch cron jobs
+CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
# Menu
-#
-# CronJobs=Scheduled jobs
-# CronListActive= List of active jobs
-# CronListInactive= List of disabled jobs
-# CronListActive= List of active jobs
-
-
-#
+CronJobs=Scheduled jobs
+CronListActive=List of active/scheduled jobs
+CronListInactive=List of disabled jobs
# Page list
-#
-# CronDateLastRun=Last run
-# CronLastOutput=Last run output
-# CronLastResult=Last result code
-# CronListOfCronJobs=List of scheduled jobs
-# CronCommand=Command
-# CronList=Jobs list
-# CronDelete= Delete cron jobs
-# CronConfirmDelete= Are you sure you want to delete this cron job ?
-# CronExecute=Launch job
-# CronConfirmExecute= Are you sure to execute this job now
-# CronInfo= Jobs allow to execute task that have been planned
-# CronWaitingJobs=Wainting jobs
-# CronTask=Job
+CronDateLastRun=Last run
+CronLastOutput=Last run output
+CronLastResult=Last result code
+CronListOfCronJobs=List of scheduled jobs
+CronCommand=Command
+CronList=Jobs list
+CronDelete= Delete cron jobs
+CronConfirmDelete= Are you sure you want to delete this cron job ?
+CronExecute=Launch job
+CronConfirmExecute= Are you sure to execute this job now
+CronInfo= Jobs allow to execute task that have been planned
+CronWaitingJobs=Wainting jobs
+CronTask=Job
CronNone= None
-# CronDtStart=Start date
-# CronDtEnd=End date
-# CronDtNextLaunch=Next execution
-# CronDtLastLaunch=Last execution
-# CronFrequency=Frequancy
-# CronClass=Classe
-# CronMethod=Method
-# CronModule=Module
-# CronAction=Action
-# CronStatus=Status
-# CronStatusActive=Enabled
-# CronStatusInactive=Disabled
-# CronNoJobs=No jobs registered
-# CronPriority=Priority
+CronDtStart=Start date
+CronDtEnd=End date
+CronDtNextLaunch=Next execution
+CronDtLastLaunch=Last execution
+CronFrequency=Frequancy
+CronClass=Classe
+CronMethod=Method
+CronModule=Module
+CronAction=Action
+CronStatus=Status
+CronStatusActive=Enabled
+CronStatusInactive=Disabled
+CronNoJobs=No jobs registered
+CronPriority=Priority
CronLabel=תאור
-# CronNbRun=Nb. launch
-# CronEach=Every
-# JobFinished=Job launched and finished
-
-#
+CronNbRun=Nb. launch
+CronEach=Every
+JobFinished=Job launched and finished
#Page card
-#
-# CronAdd= Add jobs
-# CronHourStart= Start Hour and date of task
-# CronEvery= And execute task each
-# CronObject= Instance/Object to create
-# CronArgs=Parameters
-# CronSaveSucess=Save succesfully
-# CronNote=Comment
-# CronFieldMandatory=Fields %s is mandatory
-# CronErrEndDateStartDt=End date cannot be before start date
-# CronStatusActiveBtn=Enable
-# CronStatusInactiveBtn=Disable
-# CronTaskInactive=This job is disabled
-# CronDtLastResult=Last result date
-# CronId=Id
-# CronClassFile=Classes (filename.class.php)
-# CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-# CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-# CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-# CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is <i>fecth</i>
-# CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-# CronCommandHelp=The system command line to execute.
-
-#
+CronAdd= Add jobs
+CronHourStart= Start Hour and date of task
+CronEvery= And execute task each
+CronObject= Instance/Object to create
+CronArgs=Parameters
+CronSaveSucess=Save succesfully
+CronNote=Comment
+CronFieldMandatory=Fields %s is mandatory
+CronErrEndDateStartDt=End date cannot be before start date
+CronStatusActiveBtn=Enable
+CronStatusInactiveBtn=Disable
+CronTaskInactive=This job is disabled
+CronDtLastResult=Last result date
+CronId=Id
+CronClassFile=Classes (filename.class.php)
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
+CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronCommandHelp=The system command line to execute.
# Info
-#
-# CronInfoPage=Information
-
-
-#
+CronInfoPage=Information
# Common
-#
-# CronType=Task type
-# CronType_method=Call method of a Dolibarr Class
-# CronType_command=Shell command
-# CronMenu=Cron
-# CronCannotLoadClass=Cannot load class %s or object %s
-
-# UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+CronType=Task type
+CronType_method=Call method of a Dolibarr Class
+CronType_command=Shell command
+CronMenu=Cron
+CronCannotLoadClass=Cannot load class %s or object %s
+UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
diff --git a/htdocs/langs/he_IL/donations.lang b/htdocs/langs/he_IL/donations.lang
index 66ed9f4c8ab091d145a1a3316daeaaa2d7c3b4f6..8f009f4a115305a2dca1fb4a5778e1af533a1498 100644
--- a/htdocs/langs/he_IL/donations.lang
+++ b/htdocs/langs/he_IL/donations.lang
@@ -4,7 +4,7 @@ Donations=תרומות
DonationRef=Donation ref.
Donor=Donor
Donors=Donors
-AddDonation=Add a donation
+AddDonation=Create a donation
NewDonation=New donation
ShowDonation=Show donation
DonationPromise=Gift promise
@@ -31,3 +31,8 @@ DonationRecipient=Donation recipient
ThankYou=Thank You
IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
MinimumAmount=Minimum amount is %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/he_IL/externalsite.lang b/htdocs/langs/he_IL/externalsite.lang
index b915c37a5ab8fe3beb5335f7f4ec501a12749c15..da4853df0df086e3040a294cec116c590f4c2e9e 100644
--- a/htdocs/langs/he_IL/externalsite.lang
+++ b/htdocs/langs/he_IL/externalsite.lang
@@ -1,4 +1,5 @@
# Dolibarr language file - Source file is en_US - externalsite
-# ExternalSiteSetup=Setup link to external website
-# ExternalSiteURL=External Site URL
-# ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExternalSiteSetup=Setup link to external website
+ExternalSiteURL=External Site URL
+ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/he_IL/holiday.lang b/htdocs/langs/he_IL/holiday.lang
index afb0df633c2a1f4072f9994073362907e759d15d..0b2eb810e678bb3421745d3c2b2822ef06db51c3 100644
--- a/htdocs/langs/he_IL/holiday.lang
+++ b/htdocs/langs/he_IL/holiday.lang
@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
CantCreateCP=You don't have the right to make leave requests.
InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=Update
CantUpdate=You cannot update this leave request.
NoDateDebut=You must select a start date.
NoDateFin=You must select an end date.
-ErrorDureeCP=Your request for holidays does not contain working day.
-TitleValidCP=Approve the request holidays
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
ConfirmValidCP=Are you sure you want to approve the leave request?
DateValidCP=Date approved
TitleToValidCP=Send leave request
ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the request holidays
+TitleRefuseCP=Refuse the leave request
ConfirmRefuseCP=Are you sure you want to refuse the leave request?
NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
+TitleCancelCP=Cancel the leave request
ConfirmCancelCP=Are you sure you want to cancel the leave request?
DetailRefusCP=Reason for refusal
DateRefusCP=Date of refusal
@@ -78,7 +77,7 @@ ActionByCP=Performed by
UserUpdateCP=For the user
PrevSoldeCP=Previous Balance
NewSoldeCP=New Balance
-alreadyCPexist=A request for holidays has already been done on this period.
+alreadyCPexist=A leave request has already been done on this period.
UserName=שם
Employee=Employee
FirstDayOfHoliday=First day of vacation
@@ -88,25 +87,25 @@ ManualUpdate=Manual update
HolidaysCancelation=Leave request cancelation
## Configuration du Module ##
-ConfCP=Configuration of holidays module
+ConfCP=Configuration of leave request module
DescOptionCP=Description of the option
ValueOptionCP=Value
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
UpdateConfCPOK=Updated successfully.
ErrorUpdateConfCP=An error occurred during the update, please try again.
-AddCPforUsers=Please add the balance of holidays of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
Module27130Name= Management of leave requests
Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
TitleOptionEventCP=Settings of leave requets for events
ValidEventCP=Validate
UpdateEventCP=Update events
diff --git a/htdocs/langs/he_IL/interventions.lang b/htdocs/langs/he_IL/interventions.lang
index f60e9f6b19cc72ee3a0dbc317ddd646347733d86..b472c41f7a64c6582d19e39d2bd786a80d8b100c 100644
--- a/htdocs/langs/he_IL/interventions.lang
+++ b/htdocs/langs/he_IL/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Intervention
Interventions=התערבויות
InterventionCard=Intervention card
NewIntervention=New intervention
-AddIntervention=Add intervention
+AddIntervention=Create intervention
ListOfInterventions=List of interventions
EditIntervention=Edit intervention
ActionsOnFicheInter=Actions on intervention
@@ -30,6 +30,15 @@ StatusInterInvoiced=Billed
RelatedInterventions=Related interventions
ShowIntervention=Show intervention
SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention
TypeContact_fichinter_internal_INTERVENING=Intervening
diff --git a/htdocs/langs/he_IL/mails.lang b/htdocs/langs/he_IL/mails.lang
index 49a8bbc543bcd75b32c4df23c609ff6dd3b8f774..d7a601e8382c18573d2e73ac24d1e513c4edb3d3 100644
--- a/htdocs/langs/he_IL/mails.lang
+++ b/htdocs/langs/he_IL/mails.lang
@@ -115,7 +115,7 @@ SentBy=Sent by
MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=Clear list
ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
ToAddRecipientsChooseHere=Add recipients by choosing from the lists
@@ -133,6 +133,9 @@ Notifications=הודעות
NoNotificationsWillBeSent=No email notifications are planned for this event and company
ANotificationsWillBeSent=1 notification will be sent by email
SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification request
-ListOfActiveNotifications=List all active email notification requests
+AddNewNotification=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
ListOfNotificationsDone=List all email notifications sent
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/he_IL/main.lang b/htdocs/langs/he_IL/main.lang
index 3ce5da9ebe4cf9c9858fc07de7bb49f38efad1d4..5136c7c528dde7ecc77238433cc83f260da94686 100644
--- a/htdocs/langs/he_IL/main.lang
+++ b/htdocs/langs/he_IL/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr
ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'.
ErrorFailedToSaveFile=Error, failed to save file.
-ErrorOnlyPngJpgSupported=Error, only .png and .jpg image format file are supported.
-ErrorImageFormatNotSupported=Your PHP does not support functions to convert images of this format.
SetDate=Set date
SelectDate=Select a date
SeeAlso=See also %s
BackgroundColorByDefault=Default background color
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
NbOfEntries=Nb of entries
GoToWikiHelpPage=Read online help (need Internet access)
@@ -266,6 +266,7 @@ Afternoon=Afternoon
Quadri=Quadri
MonthOfDay=Month of the day
HourShort=H
+MinuteShort=mn
Rate=Rate
UseLocalTax=Include tax
Bytes=Bytes
@@ -340,6 +341,7 @@ FullList=Full list
Statistics=Statistics
OtherStatistics=Other statistics
Status=Status
+Favorite=Favorite
ShortInfo=Info.
Ref=Ref.
RefSupplier=Ref. supplier
@@ -365,6 +367,7 @@ ActionsOnCompany=Events about this third party
ActionsOnMember=Events about this member
NActions=%s events
NActionsLate=%s late
+RequestAlreadyDone=Request already recorded
Filter=Filter
RemoveFilter=Remove filter
ChartGenerated=Chart generated
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Extra attributes setup
URLPhoto=URL of photo/logo
SetLinkToThirdParty=Link to another third party
CreateDraft=Create draft
+SetToDraft=Back to draft
ClickToEdit=Click to edit
ObjectDeleted=Object %s deleted
ByCountry=By country
@@ -678,7 +682,7 @@ ViewPrivateNote=View notes
XMoreLines=%s line(s) hidden
PublicUrl=Public URL
AddBox=Add box
-
+SelectElementAndClickRefresh=Select an element and click Refresh
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/langs/he_IL/margins.lang b/htdocs/langs/he_IL/margins.lang
index e8d5fed1af9a379298973a5c33a511cf77ea3706..606d5e5053a25855631a7d6ee61b6c392c1fe32c 100644
--- a/htdocs/langs/he_IL/margins.lang
+++ b/htdocs/langs/he_IL/margins.lang
@@ -10,24 +10,18 @@ MarkRate=Mark rate
DisplayMarginRates=Display margin rates
DisplayMarkRates=Display mark rates
InputPrice=Input price
-
margin=Profit margins management
margesSetup=Profit margins management setup
-
MarginDetails=Margin details
-
ProductMargins=Product margins
CustomerMargins=Customer margins
SalesRepresentativeMargins=Sales representative margins
-
ProductService=Product or Service
AllProducts=All products and services
ChooseProduct/Service=Choose product or service
-
StartDate=Start date
EndDate=End date
Launch=Start
-
ForceBuyingPriceIfNull=Force buying price if null
ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0)
MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
@@ -35,16 +29,16 @@ UseDiscountAsProduct=As a product
UseDiscountAsService=As a service
UseDiscountOnTotal=On subtotal
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
-
MARGIN_TYPE=Margin type
MargeBrute=Raw margin
MargeNette=Net margin
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - Cost price
-
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
Charges=Charges
-
AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/he_IL/orders.lang b/htdocs/langs/he_IL/orders.lang
index 54926464c14750f47af11885c777acaedab7f180..7fe2fcc734875d4ab8864d73915f3d69944d021f 100644
--- a/htdocs/langs/he_IL/orders.lang
+++ b/htdocs/langs/he_IL/orders.lang
@@ -1,168 +1,162 @@
# Dolibarr language file - Source file is en_US - orders
-# OrdersArea=Customers orders area
-# SuppliersOrdersArea=Suppliers orders area
-# OrderCard=Order card
-# OrderId=Order Id
+OrdersArea=Customers orders area
+SuppliersOrdersArea=Suppliers orders area
+OrderCard=Order card
+OrderId=Order Id
Order=סדר
-# Orders=Orders
-# OrderLine=Order line
-# OrderFollow=Follow up
-# OrderDate=Order date
-# OrderToProcess=Order to process
-# NewOrder=New order
-# ToOrder=Make order
-# MakeOrder=Make order
-# SupplierOrder=Supplier order
-# SuppliersOrders=Suppliers orders
-# SuppliersOrdersRunning=Current suppliers orders
-# CustomerOrder=Customer order
-# CustomersOrders=Customer's orders
-# CustomersOrdersRunning=Current customer's orders
-# CustomersOrdersAndOrdersLines=Customer orders and order's lines
-# OrdersToValid=Customer's orders to validate
-# OrdersToBill=Customer's orders delivered
-# OrdersInProcess=Customer's orders in process
-# OrdersToProcess=Customer's orders to process
-# SuppliersOrdersToProcess=Supplier's orders to process
-# StatusOrderCanceledShort=Canceled
-# StatusOrderDraftShort=Draft
-# StatusOrderValidatedShort=Validated
-# StatusOrderSentShort=In process
-# StatusOrderSent=Shipment in process
-# StatusOrderOnProcessShort=Reception
-# StatusOrderProcessedShort=Processed
-# StatusOrderToBillShort=Delivered
-# StatusOrderToBill2Short=To bill
-# StatusOrderApprovedShort=Approved
-# StatusOrderRefusedShort=Refused
-# StatusOrderToProcessShort=To process
-# StatusOrderReceivedPartiallyShort=Partially received
-# StatusOrderReceivedAllShort=Everything received
-# StatusOrderCanceled=Canceled
-# StatusOrderDraft=Draft (needs to be validated)
-# StatusOrderValidated=Validated
-# StatusOrderOnProcess=Waiting to receive
-# StatusOrderProcessed=Processed
-# StatusOrderToBill=Delivered
-# StatusOrderToBill2=To bill
-# StatusOrderApproved=Approved
-# StatusOrderRefused=Refused
-# StatusOrderReceivedPartially=Partially received
-# StatusOrderReceivedAll=Everything received
-# ShippingExist=A shipment exists
-# DraftOrWaitingApproved=Draft or approved not yet ordered
-# DraftOrWaitingShipped=Draft or validated not yet shipped
-# MenuOrdersToBill=Orders delivered
-# MenuOrdersToBill2=Orders to bill
-# SearchOrder=Search order
-# SearchACustomerOrder=Search a customer order
-# ShipProduct=Ship product
-# Discount=Discount
-# CreateOrder=Create Order
-# RefuseOrder=Refuse order
-# ApproveOrder=Accept order
-# ValidateOrder=Validate order
-# UnvalidateOrder=Unvalidate order
-# DeleteOrder=Delete order
-# CancelOrder=Cancel order
-# AddOrder=Add order
-# AddToMyOrders=Add to my orders
-# AddToOtherOrders=Add to other orders
-# AddToDraftOrders=Add to draft order
-# ShowOrder=Show order
-# NoOpenedOrders=No opened orders
-# NoOtherOpenedOrders=No other opened orders
-# NoDraftOrders=No draft orders
-# OtherOrders=Other orders
-# LastOrders=Last %s orders
-# LastModifiedOrders=Last %s modified orders
-# LastClosedOrders=Last %s closed orders
-# AllOrders=All orders
-# NbOfOrders=Number of orders
-# OrdersStatistics=Order's statistics
-# OrdersStatisticsSuppliers=Supplier order's statistics
-# NumberOfOrdersByMonth=Number of orders by month
-# AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
-# ListOfOrders=List of orders
-# CloseOrder=Close order
-# ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed.
-# ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done.
-# ConfirmDeleteOrder=Are you sure you want to delete this order ?
-# ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b> ?
-# ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> to draft status ?
-# ConfirmCancelOrder=Are you sure you want to cancel this order ?
-# ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b> ?
-# GenerateBill=Generate invoice
-# ClassifyShipped=Classify delivered
-# ClassifyBilled=Classify billed
-# ComptaCard=Accountancy card
-# DraftOrders=Draft orders
-# RelatedOrders=Related orders
-# OnProcessOrders=In process orders
-# RefOrder=Ref. order
-# RefCustomerOrder=Ref. customer order
-# CustomerOrder=Customer order
-# RefCustomerOrderShort=Ref. cust. order
-# SendOrderByMail=Send order by mail
-# ActionsOnOrder=Events on order
-# NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
-# OrderMode=Order method
-# AuthorRequest=Request author
-# UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address
-# RunningOrders=Orders on process
-# UserWithApproveOrderGrant=Users granted with "approve orders" permission.
-# PaymentOrderRef=Payment of order %s
-# CloneOrder=Clone order
-# ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b> ?
-# DispatchSupplierOrder=Receiving supplier order %s
+Orders=Orders
+OrderLine=Order line
+OrderFollow=Follow up
+OrderDate=Order date
+OrderToProcess=Order to process
+NewOrder=New order
+ToOrder=Make order
+MakeOrder=Make order
+SupplierOrder=Supplier order
+SuppliersOrders=Suppliers orders
+SuppliersOrdersRunning=Current suppliers orders
+CustomerOrder=Customer order
+CustomersOrders=Customer's orders
+CustomersOrdersRunning=Current customer's orders
+CustomersOrdersAndOrdersLines=Customer orders and order's lines
+OrdersToValid=Customer's orders to validate
+OrdersToBill=Customer's orders delivered
+OrdersInProcess=Customer's orders in process
+OrdersToProcess=Customer's orders to process
+SuppliersOrdersToProcess=Supplier's orders to process
+StatusOrderCanceledShort=Canceled
+StatusOrderDraftShort=Draft
+StatusOrderValidatedShort=Validated
+StatusOrderSentShort=In process
+StatusOrderSent=Shipment in process
+StatusOrderOnProcessShort=Reception
+StatusOrderProcessedShort=Processed
+StatusOrderToBillShort=Delivered
+StatusOrderToBill2Short=To bill
+StatusOrderApprovedShort=Approved
+StatusOrderRefusedShort=Refused
+StatusOrderToProcessShort=To process
+StatusOrderReceivedPartiallyShort=Partially received
+StatusOrderReceivedAllShort=Everything received
+StatusOrderCanceled=Canceled
+StatusOrderDraft=Draft (needs to be validated)
+StatusOrderValidated=Validated
+StatusOrderOnProcess=Waiting to receive
+StatusOrderProcessed=Processed
+StatusOrderToBill=Delivered
+StatusOrderToBill2=To bill
+StatusOrderApproved=Approved
+StatusOrderRefused=Refused
+StatusOrderReceivedPartially=Partially received
+StatusOrderReceivedAll=Everything received
+ShippingExist=A shipment exists
+DraftOrWaitingApproved=Draft or approved not yet ordered
+DraftOrWaitingShipped=Draft or validated not yet shipped
+MenuOrdersToBill=Orders delivered
+MenuOrdersToBill2=Billable orders
+SearchOrder=Search order
+SearchACustomerOrder=Search a customer order
+ShipProduct=Ship product
+Discount=Discount
+CreateOrder=Create Order
+RefuseOrder=Refuse order
+ApproveOrder=Accept order
+ValidateOrder=Validate order
+UnvalidateOrder=Unvalidate order
+DeleteOrder=Delete order
+CancelOrder=Cancel order
+AddOrder=Create order
+AddToMyOrders=Add to my orders
+AddToOtherOrders=Add to other orders
+AddToDraftOrders=Add to draft order
+ShowOrder=Show order
+NoOpenedOrders=No opened orders
+NoOtherOpenedOrders=No other opened orders
+NoDraftOrders=No draft orders
+OtherOrders=Other orders
+LastOrders=Last %s orders
+LastModifiedOrders=Last %s modified orders
+LastClosedOrders=Last %s closed orders
+AllOrders=All orders
+NbOfOrders=Number of orders
+OrdersStatistics=Order's statistics
+OrdersStatisticsSuppliers=Supplier order's statistics
+NumberOfOrdersByMonth=Number of orders by month
+AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
+ListOfOrders=List of orders
+CloseOrder=Close order
+ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed.
+ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done.
+ConfirmDeleteOrder=Are you sure you want to delete this order ?
+ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b> ?
+ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> to draft status ?
+ConfirmCancelOrder=Are you sure you want to cancel this order ?
+ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b> ?
+GenerateBill=Generate invoice
+ClassifyShipped=Classify delivered
+ClassifyBilled=Classify billed
+ComptaCard=Accountancy card
+DraftOrders=Draft orders
+RelatedOrders=Related orders
+OnProcessOrders=In process orders
+RefOrder=Ref. order
+RefCustomerOrder=Ref. customer order
+RefCustomerOrderShort=Ref. cust. order
+SendOrderByMail=Send order by mail
+ActionsOnOrder=Events on order
+NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
+OrderMode=Order method
+AuthorRequest=Request author
+UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address
+RunningOrders=Orders on process
+UserWithApproveOrderGrant=Users granted with "approve orders" permission.
+PaymentOrderRef=Payment of order %s
+CloneOrder=Clone order
+ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b> ?
+DispatchSupplierOrder=Receiving supplier order %s
##### Types de contacts #####
-# TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
-# TypeContact_commande_internal_SHIPPING=Representative following-up shipping
-# TypeContact_commande_external_BILLING=Customer invoice contact
-# TypeContact_commande_external_SHIPPING=Customer shipping contact
-# TypeContact_commande_external_CUSTOMER=Customer contact following-up order
-# TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order
-# TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
-# TypeContact_order_supplier_external_BILLING=Supplier invoice contact
-# TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact
-# TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order
-
-# Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
-# Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
-# Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s'
-# Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s'
-# Error_OrderNotChecked=No orders to invoice selected
-
+TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
+TypeContact_commande_internal_SHIPPING=Representative following-up shipping
+TypeContact_commande_external_BILLING=Customer invoice contact
+TypeContact_commande_external_SHIPPING=Customer shipping contact
+TypeContact_commande_external_CUSTOMER=Customer contact following-up order
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order
+TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
+TypeContact_order_supplier_external_BILLING=Supplier invoice contact
+TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order
+Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
+Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
+Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s'
+Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s'
+Error_OrderNotChecked=No orders to invoice selected
# Sources
-# OrderSource0=Commercial proposal
-# OrderSource1=Internet
-# OrderSource2=Mail campaign
-# OrderSource3=Phone compaign
-# OrderSource4=Fax campaign
+OrderSource0=Commercial proposal
+OrderSource1=Internet
+OrderSource2=Mail campaign
+OrderSource3=Phone compaign
+OrderSource4=Fax campaign
OrderSource5=מסחרי
-# OrderSource6=Store
-# QtyOrdered=Qty ordered
-# AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order
-
+OrderSource6=Store
+QtyOrdered=Qty ordered
+AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order
# Documents models
-# PDFEinsteinDescription=A complete order model (logo...)
-# PDFEdisonDescription=A simple order model
-# PDFProformaDescription=A complete proforma invoice (logo…)
+PDFEinsteinDescription=A complete order model (logo...)
+PDFEdisonDescription=A simple order model
+PDFProformaDescription=A complete proforma invoice (logo…)
# Orders modes
-# OrderByMail=Mail
-# OrderByFax=Fax
-# OrderByEMail=EMail
-# OrderByWWW=Online
-# OrderByPhone=Phone
-
-# CreateInvoiceForThisCustomer=Bill orders
-# NoOrdersToInvoice=No orders billable
-# CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-# MenuOrdersToBill2=Orders to bill
-# OrderCreation=Order creation
-# Ordered=Ordered
-# OrderCreated=Your orders have been created
-# OrderFail=An error happened during your orders creation
-# CreateOrders=Create orders
-# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+OrderByMail=Mail
+OrderByFax=Fax
+OrderByEMail=EMail
+OrderByWWW=Online
+OrderByPhone=Phone
+CreateInvoiceForThisCustomer=Bill orders
+NoOrdersToInvoice=No orders billable
+CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
+OrderCreation=Order creation
+Ordered=Ordered
+OrderCreated=Your orders have been created
+OrderFail=An error happened during your orders creation
+CreateOrders=Create orders
+ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
diff --git a/htdocs/langs/he_IL/oscommerce.lang b/htdocs/langs/he_IL/oscommerce.lang
deleted file mode 100644
index 42a4a4551b6d42c92c114d1593dbc0f4f53ae4b3..0000000000000000000000000000000000000000
--- a/htdocs/langs/he_IL/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-# OSCommerce=OS Commerce
-# OSCommerceSetup=OS Commerce module setup
-# OSCommerceSetupSaved=OS Commerce setup saved
-# OSCommerceServer=OS Commerce server host/ip
-# OSCommerceDatabaseName=OS Commerce database name
-# OSCommercePrefix=OS Commerce tables prefix
-# OSCommerceUser=OS Commerce database login
diff --git a/htdocs/langs/he_IL/other.lang b/htdocs/langs/he_IL/other.lang
index 03da57d14940f7f9a44b58ef49e1aeb875f0531d..b9e26e405c84bc83dfa8dbd59e67eaa90b5c16a3 100644
--- a/htdocs/langs/he_IL/other.lang
+++ b/htdocs/langs/he_IL/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=Security code
Calendar=Calendar
-AddTrip=Add trip
Tools=Tools
ToolsDesc=This area is dedicated to group miscellaneous tools not available into other menu entries.<br><br>Those tools can be reached from menu on the side.
Birthday=Birthday
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation
Notify_TASK_CREATE=Task created
Notify_TASK_MODIFY=Task modified
Notify_TASK_DELETE=Task deleted
+SeeModuleSetup=See module setup
NbOfAttachedFiles=Number of attached files/documents
TotalSizeOfAttachedFiles=Total size of attached files/documents
MaxSize=Maximum size
@@ -80,6 +80,16 @@ ModifiedBy=Modified by %s
ValidatedBy=Validated by %s
CanceledBy=Canceled by %s
ClosedBy=Closed by %s
+CreatedById=User id who created
+ModifiedById=User id who made last change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made last change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
FileWasRemoved=File %s was removed
DirWasRemoved=Directory %s was removed
FeatureNotYetAvailableShort=Available in a next version
@@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your
##### Calendar common #####
AddCalendarEntry=Add entry in calendar %s
-NewCompanyToDolibarr=Company %s added into Dolibarr
-ContractValidatedInDolibarr=Contract %s validated in Dolibarr
-ContractCanceledInDolibarr=Contract %s canceled in Dolibarr
-ContractClosedInDolibarr=Contract %s closed in Dolibarr
-PropalClosedSignedInDolibarr=Proposal %s signed in Dolibarr
-PropalClosedRefusedInDolibarr=Proposal %s refused in Dolibarr
-PropalValidatedInDolibarr=Proposal %s validated in Dolibarr
-InvoiceValidatedInDolibarr=Invoice %s validated in Dolibarr
-InvoicePaidInDolibarr=Invoice %s changed to paid in Dolibarr
-InvoiceCanceledInDolibarr=Invoice %s canceled in Dolibarr
-PaymentDoneInDolibarr=Payment %s done in Dolibarr
-CustomerPaymentDoneInDolibarr=Customer payment %s done in Dolibarr
-SupplierPaymentDoneInDolibarr=Supplier payment %s done in Dolibarr
-MemberValidatedInDolibarr=Member %s validated in Dolibarr
-MemberResiliatedInDolibarr=Member %s resiliated in Dolibarr
-MemberDeletedInDolibarr=Member %s deleted from Dolibarr
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added in Dolibarr
-ShipmentValidatedInDolibarr=Shipment %s validated in Dolibarr
-ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
##### Export #####
Export=Export
ExportsArea=Exports area
diff --git a/htdocs/langs/he_IL/paybox.lang b/htdocs/langs/he_IL/paybox.lang
index b689bb6cebff21b067564cffd144aa4a6aaa2e98..aced32a49440a9ff7a1b1e0279522ff49cec7821 100644
--- a/htdocs/langs/he_IL/paybox.lang
+++ b/htdocs/langs/he_IL/paybox.lang
@@ -1,37 +1,40 @@
# Dolibarr language file - Source file is en_US - paybox
-# PayBoxSetup=PayBox module setup
-# PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
-# FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
-# PaymentForm=Payment form
-# WelcomeOnPaymentPage=Welcome on our online payment service
-# ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
-# ThisIsInformationOnPayment=This is information on payment to do
-# ToComplete=To complete
-# YourEMail=Email to receive payment confirmation
-# Creditor=Creditor
-# PaymentCode=Payment code
-# PayBoxDoPayment=Go on payment
-# YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
-# PleaseBePatient=Please, be patient
-# Continue=Next
-# ToOfferALinkForOnlinePayment=URL for %s payment
-# ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
-# ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
-# ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
-# ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
-# ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
-# YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
-# SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> to have payment created automatically when validated by paybox.
-# YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-# YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
-# AccountParameter=Account parameters
-# UsageParameter=Usage parameters
-# InformationToFindParameters=Help to find your %s account information
-# PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment
-# VendorName=Name of vendor
-# CSSUrlForPaymentForm=CSS style sheet url for payment form
-# MessageOK=Message on validated payment return page
-# MessageKO=Message on canceled payment return page
-# NewPayboxPaymentReceived=New Paybox payment received
-# NewPayboxPaymentFailed=New Paybox payment tried but failed
-# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PayBoxSetup=PayBox module setup
+PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
+FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
+PaymentForm=Payment form
+WelcomeOnPaymentPage=Welcome on our online payment service
+ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
+ThisIsInformationOnPayment=This is information on payment to do
+ToComplete=To complete
+YourEMail=Email to receive payment confirmation
+Creditor=Creditor
+PaymentCode=Payment code
+PayBoxDoPayment=Go on payment
+YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
+PleaseBePatient=Please, be patient
+Continue=Next
+ToOfferALinkForOnlinePayment=URL for %s payment
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
+ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
+YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> to have payment created automatically when validated by paybox.
+YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
+YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
+AccountParameter=Account parameters
+UsageParameter=Usage parameters
+InformationToFindParameters=Help to find your %s account information
+PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment
+VendorName=Name of vendor
+CSSUrlForPaymentForm=CSS style sheet url for payment form
+MessageOK=Message on validated payment return page
+MessageKO=Message on canceled payment return page
+NewPayboxPaymentReceived=New Paybox payment received
+NewPayboxPaymentFailed=New Paybox payment tried but failed
+PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/he_IL/resource.lang b/htdocs/langs/he_IL/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..d64075dfbf595897a63e3eebf19194d8f71030dd
--- /dev/null
+++ b/htdocs/langs/he_IL/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
diff --git a/htdocs/langs/he_IL/sendings.lang b/htdocs/langs/he_IL/sendings.lang
index 0789ed233ee7ea285590e11cd1db616dbf60abca..a3398b27c8b4e5c210d3af8e63f12d319a835e26 100644
--- a/htdocs/langs/he_IL/sendings.lang
+++ b/htdocs/langs/he_IL/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is do
RelatedShippings=Related shippings
ShipmentLine=Shipment line
CarrierList=List of transporters
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
# Sending methods
SendingMethodCATCH=Catch by customer
diff --git a/htdocs/langs/he_IL/stocks.lang b/htdocs/langs/he_IL/stocks.lang
index 5b785952730bdc25c6e873aadbf5081d3730980e..8d96d6ad9b7bfa3f542d6e8f3566c85d6dc6856a 100644
--- a/htdocs/langs/he_IL/stocks.lang
+++ b/htdocs/langs/he_IL/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Warehouse label is required
CorrectStock=Correct stock
ListOfWarehouses=List of warehouses
ListOfStockMovements=List of stock movements
-StocksArea=Stocks area
+StocksArea=Warehouses area
Location=Location
LocationSummary=Short name location
NumberOfDifferentProducts=Number of different products
diff --git a/htdocs/langs/he_IL/users.lang b/htdocs/langs/he_IL/users.lang
index 893d359a5b8c491f989294b16fbdd72a80eaa3c4..b6011056fc88feab8027f8316356acbf86ea8eab 100644
--- a/htdocs/langs/he_IL/users.lang
+++ b/htdocs/langs/he_IL/users.lang
@@ -63,7 +63,6 @@ ShowGroup=Show group
ShowUser=Show user
NonAffectedUsers=Non assigned users
UserModified=User modified successfully
-GroupModified=Group modified successfully
PhotoFile=Photo file
UserWithDolibarrAccess=User with Dolibarr access
ListOfUsersInGroup=List of users in this group
@@ -103,7 +102,7 @@ UserDisabled=User %s disabled
UserEnabled=User %s activated
UserDeleted=User %s removed
NewGroupCreated=Group %s created
-GroupModified=Group modified successfully
+GroupModified=Group %s modified
GroupDeleted=Group %s removed
ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact ?
ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member ?
@@ -114,8 +113,10 @@ YourRole=Your roles
YourQuotaOfUsersIsReached=Your quota of active users is reached !
NbOfUsers=Nb of users
DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
-HierarchicalResponsible=Hierarchical responsible
+HierarchicalResponsible=Supervisor
HierarchicView=Hierarchical view
UseTypeFieldToChange=Use field Type to change
OpenIDURL=OpenID URL
LoginUsingOpenID=Use OpenID to login
+WeeklyHours=Weekly hours
+ColorUser=Color of the user
diff --git a/htdocs/langs/he_IL/withdrawals.lang b/htdocs/langs/he_IL/withdrawals.lang
index d6a01597c97edd2e4660a78718a68ce975d85ce9..1bf0cf1f42d177322a61dcbfdf19ff4ef70a4feb 100644
--- a/htdocs/langs/he_IL/withdrawals.lang
+++ b/htdocs/langs/he_IL/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=Receipt
LastWithdrawalReceipts=Last %s withdrawal receipts
WithdrawedBills=Withdrawn invoices
WithdrawalsLines=Withdrawal lines
-RequestStandingOrderToTreat=Request for standing orders to treat
-RequestStandingOrderTreated=Request for standing orders treated
+RequestStandingOrderToTreat=Request for standing orders to process
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=Customer standing orders
CustomerStandingOrder=Customer standing order
NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
@@ -40,14 +41,13 @@ TransMetod=Transmission method
Send=Send
Lines=Lines
StandingOrderReject=Issue a rejection
-InvoiceRefused=Invoice refused
WithdrawalRefused=Withdrawal refused
WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society
RefusedData=Date of rejection
RefusedReason=Reason for rejection
RefusedInvoicing=Billing the rejection
NoInvoiceRefused=Do not charge the rejection
-InvoiceRefused=Invoice refused
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=Status
StatusUnknown=לא ידוע
StatusWaiting=Waiting
@@ -76,7 +76,7 @@ WithBankUsingRIB=For bank accounts using RIB
WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
BankToReceiveWithdraw=Bank account to receive withdraws
CreditDate=Credit on
-WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
ShowWithdraw=Show Withdraw
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
diff --git a/htdocs/langs/hr_HR/accountancy.lang b/htdocs/langs/hr_HR/accountancy.lang
index 8cab9d2b651d75b0721d76fda619e2034e4509b4..39c2732ec29852cf93d41614ed1812c2a4c1ce4f 100644
--- a/htdocs/langs/hr_HR/accountancy.lang
+++ b/htdocs/langs/hr_HR/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts
Validate=Validate
Addanaccount=Add an accounting account
AccountAccounting=Accounting account
-Ventilation=Ventilation
+Ventilation=Breakdown
ToDispatch=To dispatch
Dispatched=Dispatched
-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
TradeMargin=Trade margin
Reports=Reports
ByCustomerInvoice=By invoices customers
@@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger
Bookkeeping=General ledger
AccountBalanceByMonth=Account balance by month
-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
Line=Line
CAHTF=Total purchase supplier HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice
IntoAccount=In the accounting account
Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
+VentilationAuto=Automatic breakdown
Processing=Processing
EndProcessing=The end of processing
@@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account
ACCOUNTING_SEPARATORCSV=Separator CSV
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
@@ -140,14 +140,14 @@ Active=Statement
NewFiscalYear=New fiscal year
-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
TotalVente=Total turnover HT
TotalMarge=Total sales margin
DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
ChangeAccount=Change the accounting account for lines selected by the account:
Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
@@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically
ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index 0b0b69620f922fef31d6d84dc2e5220c6b423d98..3cc430078af2402a0a4ee01f0234c4c0eeaba1f3 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -437,8 +437,8 @@ Module52Name=Stocks
Module52Desc=Stock management (products)
Module53Name=Services
Module53Desc=Service management
-Module54Name=Contracts
-Module54Desc=Contract and service management
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=Barcodes
Module55Desc=Barcode management
Module56Name=Telephony
@@ -475,8 +475,8 @@ Module320Name=RSS Feed
Module320Desc=Add RSS feed inside Dolibarr screen pages
Module330Name=Bookmarks
Module330Desc=Bookmark management
-Module400Name=Projects
-Module400Desc=Project management inside other modules
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=Webcalendar
Module410Desc=Webcalendar integration
Module500Name=Special expenses (tax, social contributions, dividends)
@@ -484,7 +484,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di
Module510Name=Salaries
Module510Desc=Management of employees salaries and payments
Module600Name=Notifications
-Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Donations
Module700Desc=Donation management
Module1200Name=Mantis
@@ -514,16 +514,16 @@ Module5000Name=Multi-company
Module5000Desc=Allows you to manage multiple companies
Module6000Name=Workflow
Module6000Desc=Workflow management
-Module20000Name=Holidays
-Module20000Desc=Declare and follow employees holidays
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
Module39000Name=Product batch
Module39000Desc=Batch number, eat-by and sell-by date management on products
Module50000Name=PayBox
Module50000Desc=Module to offer an online payment page by credit card with PayBox
Module50100Name=Point of sales
Module50100Desc=Point of sales module
-Module50200Name= Paypal
-Module50200Desc= Module to offer an online payment page by credit card with Paypal
+Module50200Name=Paypal
+Module50200Desc=Module to offer an online payment page by credit card with Paypal
Module50400Name=Accounting (advanced)
Module50400Desc=Accounting management (double parties)
Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=Read standing orders
Permission152=Create/modify a standing orders request
Permission153=Transmission standing orders receipts
Permission154=Credit/refuse standing orders receipts
-Permission161=Read contracts
-Permission162=Create/modify contracts
-Permission163=Activate a service of a contract
-Permission164=Disable a service of a contract
-Permission165=Delete contracts
-Permission171=Read trips
-Permission172=Create/modify trips
-Permission173=Delete trips
-Permission178=Export trips
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Read trips and expenses (own and his subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
Permission180=Read suppliers
Permission181=Read supplier orders
Permission182=Create/modify supplier orders
@@ -671,7 +672,7 @@ Permission300=Read bar codes
Permission301=Create/modify bar codes
Permission302=Delete bar codes
Permission311=Read services
-Permission312=Assign service to contract
+Permission312=Assign service/subscription to contract
Permission331=Read bookmarks
Permission332=Create/modify bookmarks
Permission333=Delete bookmarks
@@ -701,8 +702,8 @@ Permission701=Read donations
Permission702=Create/modify donations
Permission703=Delete donations
Permission1001=Read stocks
-Permission1002=Create/modify stocks
-Permission1003=Delete stocks
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=Read stock movements
Permission1005=Create/modify stock movements
Permission1101=Read delivery orders
@@ -1038,7 +1039,6 @@ YesInSummer=Yes in summer
OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
SuhosinSessionEncrypt=Session storage encrypted by Suhosin
ConditionIsCurrently=Condition is currently %s
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
YouUseBestDriver=You use driver %s that is best driver available currently.
YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by
ModuleCompanyCodePanicum=Return an empty accountancy code.
ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
UseNotifications=Use notifications
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events, to third parties (customers or suppliers) that are configured to. Choice of active notification and targets contacts is made one third party at time.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
ModelModules=Documents templates
DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
WatermarkOnDraft=Watermark on draft document
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=Add delivery date ability
UseOptionLineIfNoQuantity=A line of product/service with a zero amount is considered as an option
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list
ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order
FreeLegalTextOnOrders=Free text on orders
WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
##### Clicktodial #####
ClickToDialSetup=Click To Dial module setup
ClickToDialUrlDesc=Url called when a click on phone picto is done. In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=Intervention numbering models
TemplatePDFInterventions=Intervention card documents models
WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
##### Contracts #####
-ContractsSetup=Contracts module setup
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=Contracts numbering modules
TemplatePDFContracts=Contracts documents models
FreeLegalTextOnContracts=Free text on contracts
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
CacheByServer=Cache by server
CacheByClient=Cache by browser
CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=Products module setup
ServiceSetup=Services module setup
@@ -1382,9 +1384,10 @@ MailingSetup=EMailing module setup
MailingEMailFrom=Sender EMail (From) for emails sent by emailing module
MailingEMailError=Return EMail (Errors-to) for emails with errors
##### Notification #####
-NotificationSetup=Notification bu email module setup
+NotificationSetup=EMail notification module setup
NotificationEMailFrom=Sender EMail (From) for emails sent for notifications
-ListOfAvailableNotifications=List of available notifications (This list depends on activated modules)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
##### Sendings #####
SendingsSetup=Sending module setup
SendingsReceiptModel=Sending receipt model
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe
OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
##### Stock #####
-StockSetup=Configuration module stock
-UserWarehouse=Use user personal stocks
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=Menu deleted
TreeMenu=Tree menus
@@ -1478,11 +1482,14 @@ ClickToDialDesc=This module allows to add an icon after phone numbers. A click o
##### Point Of Sales (CashDesk) #####
CashDesk=Point of sales
CashDeskSetup=Point of sales module setup
-CashDeskThirdPartyForSell=Generic third party to use for sells
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Default account to use to receive cash payments
CashDeskBankAccountForCheque= Default account to use to receive payments by cheque
CashDeskBankAccountForCB= Default account to use to receive payments by credit cards
-CashDeskIdWareHouse=Warehouse to use for sells
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Bookmark module setup
BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Delete fiscal year
ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
Opened=Opened
Closed=Closed
-
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
diff --git a/htdocs/langs/hr_HR/agenda.lang b/htdocs/langs/hr_HR/agenda.lang
index eb3b6a174f478a1012de5b72768cac5d0ffe8d75..f7775cea7e7914b35f6173cada6c12070b5a0dc1 100644
--- a/htdocs/langs/hr_HR/agenda.lang
+++ b/htdocs/langs/hr_HR/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= Automasko filtriranje
AgendaAutoActionDesc= Ovdje definirajte događaje za koje želite da Dolibarr automatski kreira događaj u podsjetnike. Ukoliko se ništa ne provjerava( po defaultu), samo manualne akcije će biti uključene u dnevni red.
AgendaSetupOtherDesc= Ova stranica omogućava opcije za izvoz događaja u vanjski kalendar (thunderbird, google calendar, ...)
AgendaExtSitesDesc=Ova stranica omogućuje postavu vanjskih izvora kalendara kako bi se mogli viditi svoje događaje u Dolibarr podsjetnicima
-ActionsEvents= Događaji za koje Dolibarr će kreirat akcije u podsjetnicima automatski
-PropalValidatedInDolibarr= Ponuda %s ovjerena
-InvoiceValidatedInDolibarr= Račun %s ovjeren
+ActionsEvents=Događaji za koje Dolibarr će kreirat akcije u podsjetnicima automatski
+PropalValidatedInDolibarr=Ponuda %s ovjerena
+InvoiceValidatedInDolibarr=Račun %s ovjeren
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=Račun %s vraćen u status skice
InvoiceDeleteDolibarr=Račun %s obrisan
OrderValidatedInDolibarr= Narudžba %s ovjerena
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Narudžba %s odobrena
OrderRefusedInDolibarr=Narudžba %s je odbijena
OrderBackToDraftInDolibarr=Narudžba %s vraćena u status skice
OrderCanceledInDolibarr=Narudžba %s otkazana
-InterventionValidatedInDolibarr=Intervencija %s ovjerena
ProposalSentByEMail=Komercijalni prijedlog %s poslan putem Emaila
OrderSentByEMail=Narudžba kupca %s poslana putem Emaila
InvoiceSentByEMail=Račun kupca %s poslan Emailom
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=Narudžba dobavljača %s poslana Emailom
SupplierInvoiceSentByEMail=Račun dobavljača %s poslan Emailom
ShippingSentByEMail=Dostava %s poslana putem Emaila
ShippingValidated= Pošiljka %s je ovjerena
-InterventionSentByEMail=Intervencija %s poslana putem Emaila
-InterventionClassifiedBilled=Intervention %s classified as Billed
NewCompanyToDolibarr= Treća stranka stvorena
DateActionPlannedStart= Planirani početni datum
DateActionPlannedEnd= Planirani završni datum
@@ -70,9 +68,9 @@ DateActionStart= Datum početka
DateActionEnd= Datum završetka
AgendaUrlOptions1=Možete isto dodati sljedeće paramete za filtriranje prikazanog:
AgendaUrlOptions2=<b>Prijava=%s</b> za ograničavanje prikaza akcije kreiranja , dodijeljene ili završene od strane korisnika<b>%s</b>.
-AgendaUrlOptions3=<b>Prijava=%s</b> da se ograniči prikaz akcija kreiranih od korisnika<b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
AgendaUrlOptions4=<b>Prijava=%s</b>da se ograniči prikaz na akcije dodijeljene korisniku <b>%s</b>.
-AgendaUrlOptions5=<b>Prijava=%s</b> da se ograniči prikaz na akcije završene od strane korisnika <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
AgendaShowBirthdayEvents=Prikaži rođendan kontakata
AgendaHideBirthdayEvents=Sakrij rođendane kontakata
Busy=Zauzet
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=URL za pristup .ical datoteki
ExtSiteNoLabel=Bez opisa
WorkingTimeRange=Working time range
WorkingDaysRange=Working days range
-AddEvent=Add event
+AddEvent=Create event
MyAvailability=My availability
diff --git a/htdocs/langs/hr_HR/bills.lang b/htdocs/langs/hr_HR/bills.lang
index 521638dc63277986f3e4446ee63e2df5889d91c4..f7ccb1a234feea612e512fbf525c9f2868873dfd 100644
--- a/htdocs/langs/hr_HR/bills.lang
+++ b/htdocs/langs/hr_HR/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Bonifikacija
InvoiceAvoirAsk=Bonifikacija za ispravan račun
InvoiceAvoirDesc=<b>kredit<b> je negativan račun koji se koristi prilikom riješavanja problema koji nastaje kada je na računu drugačiji iznos od plaćenog (npr. kada je kupac uplatio više greškom ili neće platiti sve jer je jedan dio proizvoda vratio).
invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
-invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
ReplaceInvoice=Zamjeni račun %s
ReplacementInvoice=Zamjenski račun
ReplacedByInvoice=Zamijenjen s računom %s
@@ -87,7 +87,7 @@ ClassifyCanceled=Označi kao napušteno
ClassifyClosed=Označi kao zatvoreno
ClassifyUnBilled=Klasificirati 'nefakturirano'
CreateBill=Izradi račun
-AddBill=Dodaj račun ili bonifikaciju
+AddBill=Create invoice or credit note
AddToDraftInvoices=Dodati u skice računa
DeleteBill=Izbriši račun
SearchACustomerInvoice=Traži račun za kupca
@@ -99,7 +99,7 @@ DoPaymentBack=Izvrši povrat plaćanja
ConvertToReduc=Pretvori u budući popust
EnterPaymentReceivedFromCustomer=Upiši zaprimljeno plaćanje kupca
EnterPaymentDueToCustomer=Napravi
-DisabledBecauseRemainderToPayIsZero=Onemogući jer je opomena manja od nule
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
Amount=Iznos
PriceBase=Osnovica
BillStatus=Stanje računa
@@ -137,8 +137,6 @@ BillFrom=Od
BillTo=Za
ActionsOnBill=Radnje na računu
NewBill=Novi račun
-Prélèvements=Otvorena narudžba
-Prélèvements=Otvorena narudžba
LastBills=Zadnjih %s računa
LastCustomersBills=Zadnjih %s računa kupaca
LastSuppliersBills=Zadnjih %s računa dobavljača
@@ -156,9 +154,9 @@ ConfirmCancelBill=Jeste li sigurni da poništiti račun <b>%s</b>?
ConfirmCancelBillQuestion=Zašto želite ovaj račun označiti kao napušten?
ConfirmClassifyPaidPartially=Jeste li sigurni da želite račun <b>%s</b> označiti kao plaćen?
ConfirmClassifyPaidPartiallyQuestion=Ovaj račun nije plaćen u cijelosti. Iz kojeg razloga ga želite zatvortiti?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
ConfirmClassifyPaidPartiallyReasonBadCustomer=Loš kupac
ConfirmClassifyPaidPartiallyReasonProductReturned=Proizvod djelomično vraćen
ConfirmClassifyPaidPartiallyReasonOther=Iznos otpisan iz drugih razloga
@@ -191,9 +189,9 @@ AlreadyPaid=Plaćeno do sada
AlreadyPaidBack=Povrati do sada
AlreadyPaidNoCreditNotesNoDeposits=Već plaćeno(bez bonifikacije i depozita)
Abandoned=Napušteno
-RemainderToPay=Podsjetnik za plaćanje
-RemainderToTake=Podsjetnik za uzimanje
-RemainderToPayBack=Podsjetnik za povrat
+RemainderToPay=Preostali neplaćeni iznos
+RemainderToTake=Preostali iznos za primiti
+RemainderToPayBack=Preostali iznos za vratiti
Rest=U toku
AmountExpected=Utvrđen iznos
ExcessReceived=Previše primljeno
@@ -219,8 +217,7 @@ NoInvoice=Nema računa
ClassifyBill=Svrstavanje računa
SupplierBillsToPay=Računi dobavljača za plaćanje
CustomerBillsUnpaid=Neplaćeni računi za kupce
-DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters
-DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=Nepovratno
SetConditions=Odredi rok plaćanja
SetMode=Odredi oblik plaćanja
@@ -228,8 +225,8 @@ Billed=Nplaćeno
RepeatableInvoice=Predložak računa
RepeatableInvoices=Predlošci računa
Repeatable=Predložak
-Repeatables=Predložak
-ChangeIntoRepeatableInvoice=Pretvori u predložak
+Repeatables=Predlošci
+ChangeIntoRepeatableInvoice=Pretvori u predložak računa
CreateRepeatableInvoice=Izradi predložak računa
CreateFromRepeatableInvoice=Izradi iz predloška računa
CustomersInvoicesAndInvoiceLines=Računi klijenata i redovi računa
diff --git a/htdocs/langs/hr_HR/categories.lang b/htdocs/langs/hr_HR/categories.lang
index ed61bfc08a61b4e5bfdadecfe7f6a15298afc6e3..22914931db137a565a45daad16b9b04fbd08465b 100644
--- a/htdocs/langs/hr_HR/categories.lang
+++ b/htdocs/langs/hr_HR/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories
CatCusLinks=Links between customers/prospects and categories
CatProdLinks=Links between products/services and categories
CatMemberLinks=Links between members and categories
-CatProdLinks=Links between products/services and categories
-CatCusLinks=Links between customers/prospects and categories
-CatSupLinks=Links between suppliers and categories
DeleteFromCat=Remove from category
DeletePicture=Picture delete
ConfirmDeletePicture=Confirm picture deletion?
@@ -112,3 +109,4 @@ CategoriesSetup=Categories setup
CategorieRecursiv=Link with parent category automatically
CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category
diff --git a/htdocs/langs/hr_HR/compta.lang b/htdocs/langs/hr_HR/compta.lang
index 3929cfde0367b6f5d8dc7945385de4877d9e4759..9fe5eff520d881c617f38aa7d9db675ec18f118a 100644
--- a/htdocs/langs/hr_HR/compta.lang
+++ b/htdocs/langs/hr_HR/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s
SuppliersProductsSellSalesTurnover=The generated turnover by the sales of supplier's products.
CheckReceipt=Check deposit
CheckReceiptShort=Check deposit
+LastCheckReceiptShort=Last %s check receipts
NewCheckReceipt=New discount
NewCheckDeposit=New check deposit
NewCheckDepositOn=Create receipt for deposit on account: %s
diff --git a/htdocs/langs/hr_HR/contracts.lang b/htdocs/langs/hr_HR/contracts.lang
index b5241ddd7f023ecc8edaeb6a2b437bba497f5465..d8a68e60e8676cadbdbb2689752f9ea8aff24df2 100644
--- a/htdocs/langs/hr_HR/contracts.lang
+++ b/htdocs/langs/hr_HR/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Područje ugovora
ListOfContracts=Popis ugovora
-LastContracts=Posljednji %s modificirani ugovori
+LastModifiedContracts=Last %s modified contracts
AllContracts=Svi ugovori
ContractCard=Kartice ugovora
ContractStatus=Status ugovora
@@ -27,7 +27,7 @@ MenuRunningServices=Pokrenute usluge
MenuExpiredServices=Usluge koje su istekle
MenuClosedServices=Završene usluge
NewContract=Novi ugovor
-AddContract=Dodaj ugovor
+AddContract=Izradi ugovor
SearchAContract=Pretraži ugovor
DeleteAContract=Izbriši ugovor
CloseAContract=Zatvori ugovor
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Lista otvorenih stavki ugovora
ListOfRunningServices=Lista usluga koje se odvijaju
NotActivatedServices=Neaktivne usluge(među ovjerenim ugovorima)
BoardNotActivatedServices=Usluge za aktivaciju među ovjerenim ugovorima
-LastContracts=Posljednji %s modificirani ugovori
+LastContracts=Last % contracts
LastActivatedServices=Zadnje %s aktivne usluge
LastModifiedServices=Zadnje %s modificirane usluge
EditServiceLine=Uredi liniju usluge
diff --git a/htdocs/langs/hr_HR/cron.lang b/htdocs/langs/hr_HR/cron.lang
index 1be23d72ca326eec0911d33ce575292516014918..195ad43c87c41ae0938fa27745ba14209fbac724 100644
--- a/htdocs/langs/hr_HR/cron.lang
+++ b/htdocs/langs/hr_HR/cron.lang
@@ -1,114 +1,86 @@
# Dolibarr language file - Source file is en_US - cron
-#
# About page
-#
-# About = About
-# CronAbout = About Cron
-# CronAboutPage = Cron about page
-
-#
+About = About
+CronAbout = About Cron
+CronAboutPage = Cron about page
# Right
-#
-# Permission23101 = Read Scheduled task
-# Permission23102 = Create/update Scheduled task
-# Permission23103 = Delete Scheduled task
-# Permission23104 = Execute Scheduled task
-
-#
+Permission23101 = Read Scheduled task
+Permission23102 = Create/update Scheduled task
+Permission23103 = Delete Scheduled task
+Permission23104 = Execute Scheduled task
# Admin
-#
-# CronSetup= Scheduled job management setup
-# URLToLaunchCronJobs=URL to check and launch cron jobs if required
-# OrToLaunchASpecificJob=Or to check and launch a specific job
-# KeyForCronAccess=Security key for URL to launch cron jobs
-# FileToLaunchCronJobs=Command line to launch cron jobs
-# CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes
-# CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
-
-
-#
+CronSetup= Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch cron jobs if required
+OrToLaunchASpecificJob=Or to check and launch a specific job
+KeyForCronAccess=Security key for URL to launch cron jobs
+FileToLaunchCronJobs=Command line to launch cron jobs
+CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
# Menu
-#
-# CronJobs=Scheduled jobs
-# CronListActive= List of active jobs
-# CronListInactive= List of disabled jobs
-# CronListActive= List of active jobs
-
-
-#
+CronJobs=Scheduled jobs
+CronListActive=List of active/scheduled jobs
+CronListInactive=List of disabled jobs
# Page list
-#
-# CronDateLastRun=Last run
-# CronLastOutput=Last run output
-# CronLastResult=Last result code
-# CronListOfCronJobs=List of scheduled jobs
-# CronCommand=Command
-# CronList=Jobs list
-# CronDelete= Delete cron jobs
-# CronConfirmDelete= Are you sure you want to delete this cron job ?
-# CronExecute=Launch job
-# CronConfirmExecute= Are you sure to execute this job now
-# CronInfo= Jobs allow to execute task that have been planned
-# CronWaitingJobs=Wainting jobs
-# CronTask=Job
-# CronNone= None
-# CronDtStart=Start date
-# CronDtEnd=End date
-# CronDtNextLaunch=Next execution
-# CronDtLastLaunch=Last execution
-# CronFrequency=Frequancy
-# CronClass=Classe
-# CronMethod=Method
-# CronModule=Module
-# CronAction=Action
-# CronStatus=Status
-# CronStatusActive=Enabled
-# CronStatusInactive=Disabled
-# CronNoJobs=No jobs registered
-# CronPriority=Priority
-# CronLabel=Description
-# CronNbRun=Nb. launch
-# CronEach=Every
-# JobFinished=Job launched and finished
-
-#
+CronDateLastRun=Last run
+CronLastOutput=Last run output
+CronLastResult=Last result code
+CronListOfCronJobs=List of scheduled jobs
+CronCommand=Command
+CronList=Jobs list
+CronDelete= Delete cron jobs
+CronConfirmDelete= Are you sure you want to delete this cron job ?
+CronExecute=Launch job
+CronConfirmExecute= Are you sure to execute this job now
+CronInfo= Jobs allow to execute task that have been planned
+CronWaitingJobs=Wainting jobs
+CronTask=Job
+CronNone= None
+CronDtStart=Start date
+CronDtEnd=End date
+CronDtNextLaunch=Next execution
+CronDtLastLaunch=Last execution
+CronFrequency=Frequancy
+CronClass=Classe
+CronMethod=Method
+CronModule=Module
+CronAction=Action
+CronStatus=Status
+CronStatusActive=Enabled
+CronStatusInactive=Disabled
+CronNoJobs=No jobs registered
+CronPriority=Priority
+CronLabel=Description
+CronNbRun=Nb. launch
+CronEach=Every
+JobFinished=Job launched and finished
#Page card
-#
-# CronAdd= Add jobs
-# CronHourStart= Start Hour and date of task
-# CronEvery= And execute task each
-# CronObject= Instance/Object to create
-# CronArgs=Parameters
-# CronSaveSucess=Save succesfully
-# CronNote=Comment
-# CronFieldMandatory=Fields %s is mandatory
-# CronErrEndDateStartDt=End date cannot be before start date
-# CronStatusActiveBtn=Enable
-# CronStatusInactiveBtn=Disable
-# CronTaskInactive=This job is disabled
-# CronDtLastResult=Last result date
-# CronId=Id
-# CronClassFile=Classes (filename.class.php)
-# CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-# CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-# CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-# CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is <i>fecth</i>
-# CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-# CronCommandHelp=The system command line to execute.
-
-#
+CronAdd= Add jobs
+CronHourStart= Start Hour and date of task
+CronEvery= And execute task each
+CronObject= Instance/Object to create
+CronArgs=Parameters
+CronSaveSucess=Save succesfully
+CronNote=Comment
+CronFieldMandatory=Fields %s is mandatory
+CronErrEndDateStartDt=End date cannot be before start date
+CronStatusActiveBtn=Enable
+CronStatusInactiveBtn=Disable
+CronTaskInactive=This job is disabled
+CronDtLastResult=Last result date
+CronId=Id
+CronClassFile=Classes (filename.class.php)
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
+CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronCommandHelp=The system command line to execute.
# Info
-#
-# CronInfoPage=Information
-
-
-#
+CronInfoPage=Information
# Common
-#
-# CronType=Task type
-# CronType_method=Call method of a Dolibarr Class
-# CronType_command=Shell command
-# CronMenu=Cron
-# CronCannotLoadClass=Cannot load class %s or object %s
-
-# UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+CronType=Task type
+CronType_method=Call method of a Dolibarr Class
+CronType_command=Shell command
+CronMenu=Cron
+CronCannotLoadClass=Cannot load class %s or object %s
+UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
diff --git a/htdocs/langs/hr_HR/deliveries.lang b/htdocs/langs/hr_HR/deliveries.lang
index 89a43f02189f2ac0ced696f4257e84fd5cbba86d..a740554d0499596d85e89b109aa7dd6a709a6f7b 100644
--- a/htdocs/langs/hr_HR/deliveries.lang
+++ b/htdocs/langs/hr_HR/deliveries.lang
@@ -24,3 +24,5 @@ Deliverer=Dostavljač:
Sender=Pošiljatelj
Recipient=Primatelj
ErrorStockIsNotEnough=Nema dovoljno robe na skladištu
+Shippable=Dostava je moguća
+NonShippable=Dostava nije moguća
diff --git a/htdocs/langs/hr_HR/dict.lang b/htdocs/langs/hr_HR/dict.lang
index a662b0f7573a6096303cccee5fa86c404fefc0c0..07cb4dcc4e36f09f3b31adf49b588e62085798f3 100644
--- a/htdocs/langs/hr_HR/dict.lang
+++ b/htdocs/langs/hr_HR/dict.lang
@@ -1,329 +1,327 @@
# Dolibarr language file - Source file is en_US - dict
-# CountryFR=France
-# CountryBE=Belgium
-# CountryIT=Italy
-# CountryES=Spain
-# CountryDE=Germany
-# CountryCH=Switzerland
-# CountryGB=Great Britain
-# CountryUK=United Kingdom
-# CountryIE=Ireland
-# CountryCN=China
-# CountryTN=Tunisia
-# CountryUS=United States
-# CountryMA=Morocco
-# CountryDZ=Algeria
-# CountryCA=Canada
-# CountryTG=Togo
-# CountryGA=Gabon
-# CountryNL=Netherlands
-# CountryHU=Hungary
-# CountryRU=Russia
-# CountrySE=Sweden
-# CountryCI=Ivoiry Coast
-# CountrySN=Senegal
-# CountryAR=Argentina
-# CountryCM=Cameroon
-# CountryPT=Portugal
-# CountrySA=Saudi Arabia
-# CountryMC=Monaco
-# CountryAU=Australia
-# CountrySG=Singapore
-# CountryAF=Afghanistan
-# CountryAX=Åland Islands
-# CountryAL=Albania
-# CountryAS=American Samoa
-# CountryAD=Andorra
-# CountryAO=Angola
-# CountryAI=Anguilla
-# CountryAQ=Antarctica
-# CountryAG=Antigua and Barbuda
-# CountryAM=Armenia
-# CountryAW=Aruba
-# CountryAT=Austria
-# CountryAZ=Azerbaijan
-# CountryBS=Bahamas
-# CountryBH=Bahrain
-# CountryBD=Bangladesh
-# CountryBB=Barbados
-# CountryBY=Belarus
-# CountryBZ=Belize
-# CountryBJ=Benin
-# CountryBM=Bermuda
-# CountryBT=Bhutan
-# CountryBO=Bolivia
-# CountryBA=Bosnia and Herzegovina
-# CountryBW=Botswana
-# CountryBV=Bouvet Island
-# CountryBR=Brazil
-# CountryIO=British Indian Ocean Territory
-# CountryBN=Brunei Darussalam
-# CountryBG=Bulgaria
-# CountryBF=Burkina Faso
-# CountryBI=Burundi
-# CountryKH=Cambodia
-# CountryCV=Cape Verde
-# CountryKY=Cayman Islands
-# CountryCF=Central African Republic
-# CountryTD=Chad
-# CountryCL=Chile
-# CountryCX=Christmas Island
-# CountryCC=Cocos (Keeling) Islands
-# CountryCO=Colombia
-# CountryKM=Comoros
-# CountryCG=Congo
-# CountryCD=Congo, The Democratic Republic of the
-# CountryCK=Cook Islands
-# CountryCR=Costa Rica
-# CountryHR=Croatia
-# CountryCU=Cuba
-# CountryCY=Cyprus
-# CountryCZ=Czech Republic
-# CountryDK=Denmark
-# CountryDJ=Djibouti
-# CountryDM=Dominica
-# CountryDO=Dominican Republic
-# CountryEC=Ecuador
-# CountryEG=Egypt
-# CountrySV=El Salvador
-# CountryGQ=Equatorial Guinea
-# CountryER=Eritrea
-# CountryEE=Estonia
-# CountryET=Ethiopia
-# CountryFK=Falkland Islands
-# CountryFO=Faroe Islands
-# CountryFJ=Fiji Islands
-# CountryFI=Finland
-# CountryGF=French Guiana
-# CountryPF=French Polynesia
-# CountryTF=French Southern Territories
-# CountryGM=Gambia
-# CountryGE=Georgia
-# CountryGH=Ghana
-# CountryGI=Gibraltar
-# CountryGR=Greece
-# CountryGL=Greenland
-# CountryGD=Grenada
-# CountryGP=Guadeloupe
-# CountryGU=Guam
-# CountryGT=Guatemala
-# CountryGN=Guinea
-# CountryGW=Guinea-Bissau
-# CountryGY=Guyana
-# CountryHT=Haïti
-# CountryHM=Heard Island and McDonald
-# CountryVA=Holy See (Vatican City State)
-# CountryHN=Honduras
-# CountryHK=Hong Kong
-# CountryIS=Icelande
-# CountryIN=India
-# CountryID=Indonesia
-# CountryIR=Iran
-# CountryIQ=Iraq
-# CountryIL=Israel
-# CountryJM=Jamaica
-# CountryJP=Japan
-# CountryJO=Jordan
-# CountryKZ=Kazakhstan
-# CountryKE=Kenya
-# CountryKI=Kiribati
-# CountryKP=North Korea
-# CountryKR=South Korea
-# CountryKW=Kuwait
-# CountryKG=Kyrghyztan
-# CountryLA=Lao
-# CountryLV=Latvia
-# CountryLB=Lebanon
-# CountryLS=Lesotho
-# CountryLR=Liberia
-# CountryLY=Libyan
-# CountryLI=Liechtenstein
-# CountryLT=Lituania
-# CountryLU=Luxembourg
-# CountryMO=Macao
-# CountryMK=Macedonia, the former Yugoslav of
-# CountryMG=Madagascar
-# CountryMW=Malawi
-# CountryMY=Malaysia
-# CountryMV=Maldives
-# CountryML=Mali
-# CountryMT=Malta
-# CountryMH=Marshall Islands
-# CountryMQ=Martinique
-# CountryMR=Mauritania
-# CountryMU=Mauritius
-# CountryYT=Mayotte
-# CountryMX=Mexico
-# CountryFM=Micronesia
-# CountryMD=Moldova
-# CountryMN=Mongolia
-# CountryMS=Monserrat
-# CountryMZ=Mozambique
-# CountryMM=Birmania (Myanmar)
-# CountryNA=Namibia
-# CountryNR=Nauru
-# CountryNP=Nepal
-# CountryAN=Netherlands Antilles
-# CountryNC=New Caledonia
-# CountryNZ=New Zealand
-# CountryNI=Nicaragua
-# CountryNE=Niger
-# CountryNG=Nigeria
-# CountryNU=Niue
-# CountryNF=Norfolk Island
-# CountryMP=Northern Mariana Islands
-# CountryNO=Norway
-# CountryOM=Oman
-# CountryPK=Pakistan
-# CountryPW=Palau
-# CountryPS=Palestinian Territory, Occupied
-# CountryPA=Panama
-# CountryPG=Papua New Guinea
-# CountryPY=Paraguay
-# CountryPE=Peru
-# CountryPH=Philippines
-# CountryPN=Pitcairn Islands
-# CountryPL=Poland
-# CountryPR=Puerto Rico
-# CountryQA=Qatar
-# CountryRE=Reunion
-# CountryRO=Romania
-# CountryRW=Rwanda
-# CountrySH=Saint Helena
-# CountryKN=Saint Kitts and Nevis
-# CountryLC=Saint Lucia
-# CountryPM=Saint Pierre and Miquelon
-# CountryVC=Saint Vincent and Grenadines
-# CountryWS=Samoa
-# CountrySM=San Marino
-# CountryST=Sao Tome and Principe
-# CountryRS=Serbia
-# CountrySC=Seychelles
-# CountrySL=Sierra Leone
-# CountrySK=Slovakia
-# CountrySI=Slovenia
-# CountrySB=Solomon Islands
-# CountrySO=Somalia
-# CountryZA=South Africa
-# CountryGS=South Georgia and the South Sandwich Islands
-# CountryLK=Sri Lanka
-# CountrySD=Sudan
-# CountrySR=Suriname
-# CountrySJ=Svalbard and Jan Mayen
-# CountrySZ=Swaziland
-# CountrySY=Syrian
-# CountryTW=Taiwan
-# CountryTJ=Tajikistan
-# CountryTZ=Tanzania
-# CountryTH=Thailand
-# CountryTL=Timor-Leste
-# CountryTK=Tokelau
-# CountryTO=Tonga
-# CountryTT=Trinidad and Tobago
-# CountryTR=Turkey
-# CountryTM=Turkmenistan
-# CountryTC=Turks and Cailos Islands
-# CountryTV=Tuvalu
-# CountryUG=Uganda
-# CountryUA=Ukraine
-# CountryAE=United Arab Emirates
-# CountryUM=United States Minor Outlying Islands
-# CountryUY=Uruguay
-# CountryUZ=Uzbekistan
-# CountryVU=Vanuatu
-# CountryVE=Venezuela
-# CountryVN=Viet Nam
-# CountryVG=Virgin Islands, British
-# CountryVI=Virgin Islands, U.S.
-# CountryWF=Wallis and Futuna
-# CountryEH=Western Sahara
-# CountryYE=Yemen
-# CountryZM=Zambia
-# CountryZW=Zimbabwe
-# CountryGG=Guernsey
-# CountryIM=Isle of Man
-# CountryJE=Jersey
-# CountryME=Montenegro
-# CountryBL=Saint Barthelemy
-# CountryMF=Saint Martin
+CountryFR=Francuska
+CountryBE=Belgija
+CountryIT=Italija
+CountryES=Španjolska
+CountryDE=Njemačka
+CountryCH=Švicarska
+CountryGB=Velika Britanija
+CountryUK=United Kingdom
+CountryIE=Irska
+CountryCN=Kina
+CountryTN=Tunis
+CountryUS=Sjedinjene Američke Države
+CountryMA=Maroko
+CountryDZ=Alžir
+CountryCA=Kanada
+CountryTG=Togo
+CountryGA=Gabon
+CountryNL=Nizozemska
+CountryHU=Mađarska
+CountryRU=Rusija
+CountrySE=Švedska
+CountryCI=Obala Bjelokosti
+CountrySN=Senegal
+CountryAR=Argentina
+CountryCM=Kamerun
+CountryPT=Portugal
+CountrySA=Saudijska Arabija
+CountryMC=Monako
+CountryAU=Australija
+CountrySG=Singapur
+CountryAF=Afganistan
+CountryAX=Åland Islands
+CountryAL=Albanija
+CountryAS=Američka Samoa
+CountryAD=Andora
+CountryAO=Angola
+CountryAI=Anguilla
+CountryAQ=Antartik
+CountryAG=Antigua and Barbuda
+CountryAM=Armenija
+CountryAW=Aruba
+CountryAT=Austrija
+CountryAZ=Azerbedžan
+CountryBS=Bahami
+CountryBH=Bahrein
+CountryBD=Bangladeš
+CountryBB=Barbados
+CountryBY=Bjelorusija
+CountryBZ=Belize
+CountryBJ=Benin
+CountryBM=Bermude
+CountryBT=Butan
+CountryBO=Bolivija
+CountryBA=Bosna i Hercegovina
+CountryBW=Botsvana
+CountryBV=Bouvet Island
+CountryBR=Brazil
+CountryIO=Britansko Indijsko otočje
+CountryBN=Brunei Darussalam
+CountryBG=Bugarska
+CountryBF=Burkina Faso
+CountryBI=Burundi
+CountryKH=Kabodža
+CountryCV=Cape Verde
+CountryKY=Kajmanski otoci
+CountryCF=Centralna Afrička Republika
+CountryTD=Čad
+CountryCL=Čile
+CountryCX=Božićni otoci
+CountryCC=Cocos (Keeling) Islands
+CountryCO=Kolumbija
+CountryKM=Comoros
+CountryCG=Kongo
+CountryCD=Kongo, demokratska republika
+CountryCK=Cook Islands
+CountryCR=Kostarika
+CountryHR=Hrvatska!
+CountryCU=Kuba
+CountryCY=Cipar
+CountryCZ=Češka
+CountryDK=Danska
+CountryDJ=Djibouti
+CountryDM=Dominica
+CountryDO=Dominikanska republika
+CountryEC=Ekvador
+CountryEG=Egipat
+CountrySV=Salvador
+CountryGQ=Equatorial Guinea
+CountryER=Eritrea
+CountryEE=Estonija
+CountryET=Etiopija
+CountryFK=Falkland Islands
+CountryFO=Faroski otoci
+CountryFJ=Fiđi
+CountryFI=Finska
+CountryGF=Francuska Gvajana
+CountryPF=Francuska Polinezija
+CountryTF=Francuski Južni teritorij
+CountryGM=Gambija
+CountryGE=Gruzija
+CountryGH=Gana
+CountryGI=Gibraltar
+CountryGR=Grčka
+CountryGL=Grenland
+CountryGD=Grenada
+CountryGP=Guadeloupe
+CountryGU=Guam
+CountryGT=Guatemala
+CountryGN=Guinea
+CountryGW=Guinea-Bissau
+CountryGY=Guyana
+CountryHT=Haiti
+CountryHM=Heard Island and McDonald
+CountryVA=Holy See (Vatican City State)
+CountryHN=Honduras
+CountryHK=Hong Kong
+CountryIS=Island
+CountryIN=Indija
+CountryID=Indonezija
+CountryIR=Iran
+CountryIQ=Irak
+CountryIL=Izrael
+CountryJM=Jamajka
+CountryJP=Japan
+CountryJO=Jordan
+CountryKZ=Kazahstan
+CountryKE=Kenija
+CountryKI=Kiribati
+CountryKP=Sjeverna Korea
+CountryKR=Južna Korea
+CountryKW=Kuvajt
+CountryKG=Kirgistan
+CountryLA=Lao
+CountryLV=Latvija
+CountryLB=Libanon
+CountryLS=Lesoto
+CountryLR=Liberija
+CountryLY=Libija
+CountryLI=Liechtenstein
+CountryLT=Litva
+CountryLU=Luksemburg
+CountryMO=Makao
+CountryMK=Makedonija
+CountryMG=Madagaskar
+CountryMW=Malawi
+CountryMY=Malezija
+CountryMV=Maldivi
+CountryML=Mali
+CountryMT=Malta
+CountryMH=Marshall Islands
+CountryMQ=Martinique
+CountryMR=Mauritania
+CountryMU=Mauritius
+CountryYT=Mayotte
+CountryMX=Meksiko
+CountryFM=Micronesia
+CountryMD=Moldavija
+CountryMN=Mongolia
+CountryMS=Monserrat
+CountryMZ=Mozambik
+CountryMM=Birmania (Myanmar)
+CountryNA=Nambija
+CountryNR=Nauru
+CountryNP=Nepal
+CountryAN=Nizozemski Antila
+CountryNC=New Caledonia
+CountryNZ=Novi Zeland
+CountryNI=Nikaragva
+CountryNE=Niger
+CountryNG=Nigerija
+CountryNU=Niue
+CountryNF=Norfolk Island
+CountryMP=Northern Mariana Islands
+CountryNO=Norveška
+CountryOM=Oman
+CountryPK=Pakistan
+CountryPW=Palau
+CountryPS=Palestina
+CountryPA=Panama
+CountryPG=Papa Nova Gvineja
+CountryPY=Paragvaj
+CountryPE=Peru
+CountryPH=Filipini
+CountryPN=Pitcairn Islands
+CountryPL=Poljska
+CountryPR=Portoriko
+CountryQA=Katar
+CountryRE=Reunion
+CountryRO=Rumunjska
+CountryRW=Ruanda
+CountrySH=Sveta Helena
+CountryKN=Saint Kitts and Nevis
+CountryLC=Sveta Lucija
+CountryPM=Saint Pierre and Miquelon
+CountryVC=Saint Vincent and Grenadines
+CountryWS=Samoa
+CountrySM=Sam Marino
+CountryST=Sao Tome and Principe
+CountryRS=Srbija
+CountrySC=Sejšeli
+CountrySL=Sierra Leone
+CountrySK=Slovačka
+CountrySI=Slovenija
+CountrySB=Solomon Islands
+CountrySO=Somalija
+CountryZA=Južna Afrika
+CountryGS=South Georgia and the South Sandwich Islands
+CountryLK=Šri LAnka
+CountrySD=udan
+CountrySR=Suriname
+CountrySJ=Svalbard and Jan Mayen
+CountrySZ=Swaziland
+CountrySY=Sirija
+CountryTW=Tajvan
+CountryTJ=Tajikistan
+CountryTZ=Tanzanija
+CountryTH=Tajland
+CountryTL=Timor-Leste
+CountryTK=Tokelau
+CountryTO=Tonga
+CountryTT=Trinidad i Tobago
+CountryTR=Turska
+CountryTM=Turkmenistan
+CountryTC=Turks and Cailos Islands
+CountryTV=Tuvalu
+CountryUG=Uganda
+CountryUA=Ukrajina
+CountryAE=Ujedinjeni Arapski Emirati
+CountryUM=United States Minor Outlying Islands
+CountryUY=Urugvaj
+CountryUZ=Uzbekistan
+CountryVU=Vanuatu
+CountryVE=Venezuela
+CountryVN=Vijetnam
+CountryVG=Djevičanski otoci, Britanski
+CountryVI=Djevičanski otoci, SAD
+CountryWF=Wallis and Futuna
+CountryEH=Zapadna Sahara
+CountryYE=Jemen
+CountryZM=Zambija
+CountryZW=Zimbabve
+CountryGG=Guernsey
+CountryIM=Isle of Man
+CountryJE=Jersey
+CountryME=Crna Gora
+CountryBL=Saint Barthelemy
+CountryMF=Saint Martin
##### Civilities #####
-# CivilityMME=Mrs.
-# CivilityMR=Mr.
-# CivilityMLE=Ms.
-# CivilityMTRE=Master
-# CivilityDR=Doctor
-
+CivilityMME=Gđa.
+CivilityMR=G.
+CivilityMLE=Gđica.
+CivilityMTRE=Master
+CivilityDR=Doktor
##### Currencies #####
-# Currencyeuros=Euros
-# CurrencyAUD=AU Dollars
-# CurrencySingAUD=AU Dollar
-# CurrencyCAD=CAN Dollars
-# CurrencySingCAD=CAN Dollar
-# CurrencyCHF=Swiss Francs
-# CurrencySingCHF=Swiss Franc
-# CurrencyEUR=Euros
-# CurrencySingEUR=Euro
-# CurrencyFRF=French Francs
-# CurrencySingFRF=French Franc
-# CurrencyGBP=GB Pounds
-# CurrencySingGBP=GB Pound
-# CurrencyINR=Indian rupees
-# CurrencySingINR=Indian rupee
-# CurrencyMAD=Dirham
-# CurrencySingMAD=Dirham
-# CurrencyMGA=Ariary
-# CurrencySingMGA=Ariary
-# CurrencyMUR=Mauritius rupees
-# CurrencySingMUR=Mauritius rupee
-# CurrencyNOK=Norwegian krones
-# CurrencySingNOK=Norwegian krone
-# CurrencyTND=Tunisian dinars
-# CurrencySingTND=Tunisian dinar
-# CurrencyUSD=US Dollars
-# CurrencySingUSD=US Dollar
-# CurrencyUAH=Hryvnia
-# CurrencySingUAH=Hryvnia
-# CurrencyXAF=CFA Francs BEAC
-# CurrencySingXAF=CFA Franc BEAC
-# CurrencyXOF=CFA Francs BCEAO
-# CurrencySingXOF=CFA Franc BCEAO
-# CurrencyXPF=CFP Francs
-# CurrencySingXPF=CFP Franc
-
-# CurrencyCentSingEUR=cent
-# CurrencyThousandthSingTND=thousandth
-
+Currencyeuros=Eura
+CurrencyAUD=AU Dolara
+CurrencySingAUD=AU Dolar
+CurrencyCAD=CAN Dolara
+CurrencySingCAD=CAN dolar
+CurrencyCHF=Švic. franaka
+CurrencySingCHF=Švic. Franaka
+CurrencyEUR=Eura
+CurrencySingEUR=Euro
+CurrencyFRF=Fran. Franaka
+CurrencySingFRF=Fran. Franaka
+CurrencyGBP=VB Funti
+CurrencySingGBP=VB Funta
+CurrencyINR=Ind. rupija
+CurrencySingINR=Ind. Rupi
+CurrencyMAD=Dirham
+CurrencySingMAD=Dirham
+CurrencyMGA=Ariary
+CurrencySingMGA=Ariary
+CurrencyMUR=Mauritius rupees
+CurrencySingMUR=Mauritius rupee
+CurrencyNOK=Norveških Kruna
+CurrencySingNOK=Norveška Kruna
+CurrencyTND=Tuniških Dinara
+CurrencySingTND=Tuniški Dinar
+CurrencyUSD=SAD Dolara
+CurrencySingUSD=SAD Dolar
+CurrencyUAH=Hryvnia
+CurrencySingUAH=Hryvnia
+CurrencyXAF=CFA Francs BEAC
+CurrencySingXAF=CFA Franc BEAC
+CurrencyXOF=CFA Francs BCEAO
+CurrencySingXOF=CFA Franc BCEAO
+CurrencyXPF=CFP Francs
+CurrencySingXPF=CFP Franc
+CurrencyCentSingEUR=Cent
+CurrencyCentINR=paisa
+CurrencyCentSingINR=paise
+CurrencyThousandthSingTND=tisućuti
#### Input reasons #####
-# DemandReasonTypeSRC_INTE=Internet
-# DemandReasonTypeSRC_CAMP_MAIL=Mailing campaign
-# DemandReasonTypeSRC_CAMP_EMAIL=EMailing campaign
-# DemandReasonTypeSRC_CAMP_PHO=Phone campaign
-# DemandReasonTypeSRC_CAMP_FAX=Fax campaign
-# DemandReasonTypeSRC_COMM=Commercial contact
-# DemandReasonTypeSRC_SHOP=Shop contact
-# DemandReasonTypeSRC_WOM=Word of mouth
-# DemandReasonTypeSRC_PARTNER=Partner
-# DemandReasonTypeSRC_EMPLOYEE=Employee
-# DemandReasonTypeSRC_SPONSORING=Sponsorship
-
+DemandReasonTypeSRC_INTE=Internet
+DemandReasonTypeSRC_CAMP_MAIL=Mailing campaign
+DemandReasonTypeSRC_CAMP_EMAIL=EMailing campaign
+DemandReasonTypeSRC_CAMP_PHO=Phone campaign
+DemandReasonTypeSRC_CAMP_FAX=Fax campaign
+DemandReasonTypeSRC_COMM=Commercial contact
+DemandReasonTypeSRC_SHOP=Shop contact
+DemandReasonTypeSRC_WOM=Word of mouth
+DemandReasonTypeSRC_PARTNER=Suradnik
+DemandReasonTypeSRC_EMPLOYEE=Zaposlenik
+DemandReasonTypeSRC_SPONSORING=Sponzorstvo
#### Paper formats ####
-# PaperFormatEU4A0=Format 4A0
-# PaperFormatEU2A0=Format 2A0
-# PaperFormatEUA0=Format A0
-# PaperFormatEUA1=Format A1
-# PaperFormatEUA2=Format A2
-# PaperFormatEUA3=Format A3
-# PaperFormatEUA4=Format A4
-# PaperFormatEUA5=Format A5
-# PaperFormatEUA6=Format A6
-# PaperFormatUSLETTER=Format Letter US
-# PaperFormatUSLEGAL=Format Legal US
-# PaperFormatUSEXECUTIVE=Format Executive US
-# PaperFormatUSLEDGER=Format Ledger/Tabloid
-# PaperFormatCAP1=Format P1 Canada
-# PaperFormatCAP2=Format P2 Canada
-# PaperFormatCAP3=Format P3 Canada
-# PaperFormatCAP4=Format P4 Canada
-# PaperFormatCAP5=Format P5 Canada
-# PaperFormatCAP6=Format P6 Canada
+PaperFormatEU4A0=4A0 format
+PaperFormatEU2A0=2A0 format
+PaperFormatEUA0=A0 format
+PaperFormatEUA1=A1 format
+PaperFormatEUA2=A2 format
+PaperFormatEUA3=A3 format
+PaperFormatEUA4=A4 format
+PaperFormatEUA5=A5 format
+PaperFormatEUA6=A6 format
+PaperFormatUSLETTER=Format Letter US
+PaperFormatUSLEGAL=Format Legal US
+PaperFormatUSEXECUTIVE=Format Executive US
+PaperFormatUSLEDGER=Format Ledger/Tabloid
+PaperFormatCAP1=Format P1 Canada
+PaperFormatCAP2=Format P2 Canada
+PaperFormatCAP3=Format P3 Canada
+PaperFormatCAP4=Format P4 Canada
+PaperFormatCAP5=Format P5 Canada
+PaperFormatCAP6=Format P6 Canada
diff --git a/htdocs/langs/hr_HR/donations.lang b/htdocs/langs/hr_HR/donations.lang
index 66ddea95a5c694d8044c40b7da05319d0b77a530..f7aed91cf81caf0e83e390519642ea1f199670c6 100644
--- a/htdocs/langs/hr_HR/donations.lang
+++ b/htdocs/langs/hr_HR/donations.lang
@@ -4,7 +4,7 @@ Donations=Donations
DonationRef=Donation ref.
Donor=Donor
Donors=Donors
-AddDonation=Add a donation
+AddDonation=Create a donation
NewDonation=New donation
ShowDonation=Show donation
DonationPromise=Gift promise
@@ -31,3 +31,8 @@ DonationRecipient=Donation recipient
ThankYou=Thank You
IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
MinimumAmount=Minimum amount is %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/hr_HR/externalsite.lang b/htdocs/langs/hr_HR/externalsite.lang
index 679e87587e8669b5f03eacf2ffec869261ca0f24..facf3bbea2fe731a34621b0eda1a804e4e333ef3 100644
--- a/htdocs/langs/hr_HR/externalsite.lang
+++ b/htdocs/langs/hr_HR/externalsite.lang
@@ -2,3 +2,4 @@
ExternalSiteSetup=Postavljanje linkova na vanjske web stranice
ExternalSiteURL=URL vanjske stranice
ExternalSiteModuleNotComplete=Modul ExternalSite nije ispravno podešen.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/hr_HR/holiday.lang b/htdocs/langs/hr_HR/holiday.lang
index c25abf6449ca2cc97d5dba6340d1530b5ea9c675..f5b87fefb0878c40cc75768a1d1c4bcf4cb80c72 100644
--- a/htdocs/langs/hr_HR/holiday.lang
+++ b/htdocs/langs/hr_HR/holiday.lang
@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
CantCreateCP=You don't have the right to make leave requests.
InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=Update
CantUpdate=You cannot update this leave request.
NoDateDebut=You must select a start date.
NoDateFin=You must select an end date.
-ErrorDureeCP=Your request for holidays does not contain working day.
-TitleValidCP=Approve the request holidays
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
ConfirmValidCP=Are you sure you want to approve the leave request?
DateValidCP=Date approved
TitleToValidCP=Send leave request
ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the request holidays
+TitleRefuseCP=Refuse the leave request
ConfirmRefuseCP=Are you sure you want to refuse the leave request?
NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
+TitleCancelCP=Cancel the leave request
ConfirmCancelCP=Are you sure you want to cancel the leave request?
DetailRefusCP=Reason for refusal
DateRefusCP=Date of refusal
@@ -78,7 +77,7 @@ ActionByCP=Performed by
UserUpdateCP=For the user
PrevSoldeCP=Previous Balance
NewSoldeCP=New Balance
-alreadyCPexist=A request for holidays has already been done on this period.
+alreadyCPexist=A leave request has already been done on this period.
UserName=Name
Employee=Employee
FirstDayOfHoliday=First day of vacation
@@ -88,25 +87,25 @@ ManualUpdate=Manual update
HolidaysCancelation=Leave request cancelation
## Configuration du Module ##
-ConfCP=Configuration of holidays module
+ConfCP=Configuration of leave request module
DescOptionCP=Description of the option
ValueOptionCP=Value
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
UpdateConfCPOK=Updated successfully.
ErrorUpdateConfCP=An error occurred during the update, please try again.
-AddCPforUsers=Please add the balance of holidays of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
Module27130Name= Management of leave requests
Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
TitleOptionEventCP=Settings of leave requets for events
ValidEventCP=Validate
UpdateEventCP=Update events
diff --git a/htdocs/langs/hr_HR/interventions.lang b/htdocs/langs/hr_HR/interventions.lang
index 17641a0ab3e499b2f66a4b4ddd80c46d478ff702..c79da05364e615bb2b234ce4211a373fc94e9168 100644
--- a/htdocs/langs/hr_HR/interventions.lang
+++ b/htdocs/langs/hr_HR/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Intervention
Interventions=Interventions
InterventionCard=Intervention card
NewIntervention=New intervention
-AddIntervention=Add intervention
+AddIntervention=Create intervention
ListOfInterventions=List of interventions
EditIntervention=Edit intervention
ActionsOnFicheInter=Actions on intervention
@@ -30,6 +30,15 @@ StatusInterInvoiced=Billed
RelatedInterventions=Related interventions
ShowIntervention=Show intervention
SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention
TypeContact_fichinter_internal_INTERVENING=Intervening
diff --git a/htdocs/langs/hr_HR/mails.lang b/htdocs/langs/hr_HR/mails.lang
index 98e6dc335eeced95e230de5b5ca5b8f78fc59681..7a2111988228ab02739bad001958aa455eb9013c 100644
--- a/htdocs/langs/hr_HR/mails.lang
+++ b/htdocs/langs/hr_HR/mails.lang
@@ -115,7 +115,7 @@ SentBy=Sent by
MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=Clear list
ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
ToAddRecipientsChooseHere=Add recipients by choosing from the lists
@@ -133,6 +133,9 @@ Notifications=Notifications
NoNotificationsWillBeSent=No email notifications are planned for this event and company
ANotificationsWillBeSent=1 notification will be sent by email
SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification request
-ListOfActiveNotifications=List all active email notification requests
+AddNewNotification=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
ListOfNotificationsDone=List all email notifications sent
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang
index 18add5c8e59bc45ebbc79dfda97532c95e9585ae..85422178c4e27b71bfa29f68fe199436881304e7 100644
--- a/htdocs/langs/hr_HR/main.lang
+++ b/htdocs/langs/hr_HR/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr
ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'.
ErrorFailedToSaveFile=Error, failed to save file.
-ErrorOnlyPngJpgSupported=Error, only .png and .jpg image format file are supported.
-ErrorImageFormatNotSupported=Your PHP does not support functions to convert images of this format.
SetDate=Set date
SelectDate=Select a date
SeeAlso=See also %s
BackgroundColorByDefault=Default background color
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
NbOfEntries=Nb of entries
GoToWikiHelpPage=Read online help (need Internet access)
@@ -266,6 +266,7 @@ Afternoon=Afternoon
Quadri=Quadri
MonthOfDay=Month of the day
HourShort=H
+MinuteShort=mn
Rate=Rate
UseLocalTax=Include tax
Bytes=Bytes
@@ -340,6 +341,7 @@ FullList=Full list
Statistics=Statistics
OtherStatistics=Other statistics
Status=Status
+Favorite=Favorite
ShortInfo=Info.
Ref=Ref.
RefSupplier=Ref. supplier
@@ -365,6 +367,7 @@ ActionsOnCompany=Events about this third party
ActionsOnMember=Events about this member
NActions=%s events
NActionsLate=%s late
+RequestAlreadyDone=Request already recorded
Filter=Filter
RemoveFilter=Remove filter
ChartGenerated=Chart generated
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Extra attributes setup
URLPhoto=URL of photo/logo
SetLinkToThirdParty=Link to another third party
CreateDraft=Create draft
+SetToDraft=Back to draft
ClickToEdit=Click to edit
ObjectDeleted=Object %s deleted
ByCountry=By country
@@ -678,7 +682,7 @@ ViewPrivateNote=View notes
XMoreLines=%s line(s) hidden
PublicUrl=Public URL
AddBox=Add box
-
+SelectElementAndClickRefresh=Select an element and click Refresh
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/langs/hr_HR/margins.lang b/htdocs/langs/hr_HR/margins.lang
index e8d5fed1af9a379298973a5c33a511cf77ea3706..606d5e5053a25855631a7d6ee61b6c392c1fe32c 100644
--- a/htdocs/langs/hr_HR/margins.lang
+++ b/htdocs/langs/hr_HR/margins.lang
@@ -10,24 +10,18 @@ MarkRate=Mark rate
DisplayMarginRates=Display margin rates
DisplayMarkRates=Display mark rates
InputPrice=Input price
-
margin=Profit margins management
margesSetup=Profit margins management setup
-
MarginDetails=Margin details
-
ProductMargins=Product margins
CustomerMargins=Customer margins
SalesRepresentativeMargins=Sales representative margins
-
ProductService=Product or Service
AllProducts=All products and services
ChooseProduct/Service=Choose product or service
-
StartDate=Start date
EndDate=End date
Launch=Start
-
ForceBuyingPriceIfNull=Force buying price if null
ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0)
MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
@@ -35,16 +29,16 @@ UseDiscountAsProduct=As a product
UseDiscountAsService=As a service
UseDiscountOnTotal=On subtotal
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
-
MARGIN_TYPE=Margin type
MargeBrute=Raw margin
MargeNette=Net margin
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - Cost price
-
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
Charges=Charges
-
AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/hr_HR/orders.lang b/htdocs/langs/hr_HR/orders.lang
index 8ed57ad3521deb5b74cb595c47522cba3ff61993..fed56574d89132c2e6f25ff6adb8f6b45270fc70 100644
--- a/htdocs/langs/hr_HR/orders.lang
+++ b/htdocs/langs/hr_HR/orders.lang
@@ -1,14 +1,14 @@
# Dolibarr language file - Source file is en_US - orders
-# OrdersArea=Customers orders area
-# SuppliersOrdersArea=Suppliers orders area
-# OrderCard=Order card
-# OrderId=Order Id
+OrdersArea=Customers orders area
+SuppliersOrdersArea=Suppliers orders area
+OrderCard=Order card
+OrderId=Order Id
Order=Narudžba
Orders=Narudžbe
-# OrderLine=Order line
-# OrderFollow=Follow up
+OrderLine=Order line
+OrderFollow=Follow up
OrderDate=Datum narudžbe
-# OrderToProcess=Order to process
+OrderToProcess=Order to process
NewOrder=Nova narudžba
ToOrder=Napravi narudžbu
MakeOrder=Napravi narudžbu
@@ -18,28 +18,28 @@ SuppliersOrdersRunning=Trenutne narudžbe dobavljaču
CustomerOrder=Narudžbe kupaca
CustomersOrders=Narudžba kupaca
CustomersOrdersRunning=Trenutne narudžba kupaca
-# CustomersOrdersAndOrdersLines=Customer orders and order's lines
-# OrdersToValid=Customer's orders to validate
-# OrdersToBill=Customer's orders delivered
-# OrdersInProcess=Customer's orders in process
-# OrdersToProcess=Customer's orders to process
-# SuppliersOrdersToProcess=Supplier's orders to process
-# StatusOrderCanceledShort=Canceled
+CustomersOrdersAndOrdersLines=Customer orders and order's lines
+OrdersToValid=Customer's orders to validate
+OrdersToBill=Customer's orders delivered
+OrdersInProcess=Customer's orders in process
+OrdersToProcess=Customer's orders to process
+SuppliersOrdersToProcess=Supplier's orders to process
+StatusOrderCanceledShort=Canceled
StatusOrderDraftShort=Skica
StatusOrderValidatedShort=Ovjereno
StatusOrderSentShort=U obradi
StatusOrderSent=Dostava u tijeku
-# StatusOrderOnProcessShort=Reception
-# StatusOrderProcessedShort=Processed
+StatusOrderOnProcessShort=Reception
+StatusOrderProcessedShort=Processed
StatusOrderToBillShort=Dostavljeno
StatusOrderToBill2Short=Za poslat račun
StatusOrderApprovedShort=Odobreno
StatusOrderRefusedShort=Odbijeno
-# StatusOrderToProcessShort=To process
-# StatusOrderReceivedPartiallyShort=Partially received
-# StatusOrderReceivedAllShort=Everything received
+StatusOrderToProcessShort=To process
+StatusOrderReceivedPartiallyShort=Partially received
+StatusOrderReceivedAllShort=Everything received
StatusOrderCanceled=Poništeno
-# StatusOrderDraft=Draft (needs to be validated)
+StatusOrderDraft=Draft (needs to be validated)
StatusOrderValidated=Ovjereno
StatusOrderOnProcess=Čekanje primitka
StatusOrderProcessed=Obrađeno
@@ -50,119 +50,113 @@ StatusOrderRefused=Odbijeno
StatusOrderReceivedPartially=Djelomično primljeno
StatusOrderReceivedAll=Primljena cijela pošiljka
ShippingExist=Dostava postoji
-# DraftOrWaitingApproved=Draft or approved not yet ordered
-# DraftOrWaitingShipped=Draft or validated not yet shipped
-# MenuOrdersToBill=Orders delivered
-MenuOrdersToBill2=Narudžbe za naplatu
+DraftOrWaitingApproved=Draft or approved not yet ordered
+DraftOrWaitingShipped=Draft or validated not yet shipped
+MenuOrdersToBill=Orders delivered
+MenuOrdersToBill2=Billable orders
SearchOrder=Pretraži narudžbe
-# SearchACustomerOrder=Search a customer order
+SearchACustomerOrder=Search a customer order
ShipProduct=Pošalji proizvod
Discount=Popust
CreateOrder=Kreiraj narudžbu
RefuseOrder=Odbij narudžbu
ApproveOrder=Prihvati narudžbu
ValidateOrder=Ovjeri narudžbu
-# UnvalidateOrder=Unvalidate order
+UnvalidateOrder=Unvalidate order
DeleteOrder=Obriši narudžbu
CancelOrder=Poništi narudžbu
-AddOrder=Dodaj narudžbu
+AddOrder=Create order
AddToMyOrders=Dodaj u moje narudžbe
AddToOtherOrders=Dodaj u ostale narudžbe
-# AddToDraftOrders=Add to draft order
+AddToDraftOrders=Add to draft order
ShowOrder=Prikaži narudžbu
NoOpenedOrders=Nema otvorenih narudžbi
NoOtherOpenedOrders=Nema ostalih otvorenih narudžbi
-# NoDraftOrders=No draft orders
-# OtherOrders=Other orders
-# LastOrders=Last %s orders
-# LastModifiedOrders=Last %s modified orders
-# LastClosedOrders=Last %s closed orders
+NoDraftOrders=No draft orders
+OtherOrders=Other orders
+LastOrders=Last %s orders
+LastModifiedOrders=Last %s modified orders
+LastClosedOrders=Last %s closed orders
AllOrders=Sve narudžbe
NbOfOrders=Broj narudžbe
OrdersStatistics=Statistike narudžbe
-# OrdersStatisticsSuppliers=Supplier order's statistics
-# NumberOfOrdersByMonth=Number of orders by month
-# AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
+OrdersStatisticsSuppliers=Supplier order's statistics
+NumberOfOrdersByMonth=Number of orders by month
+AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
ListOfOrders=Lista narudžbi
CloseOrder=Zatvori narudžbu
-# ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed.
-# ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done.
-# ConfirmDeleteOrder=Are you sure you want to delete this order ?
-# ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b> ?
-# ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> to draft status ?
-# ConfirmCancelOrder=Are you sure you want to cancel this order ?
-# ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b> ?
+ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed.
+ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done.
+ConfirmDeleteOrder=Are you sure you want to delete this order ?
+ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b> ?
+ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> to draft status ?
+ConfirmCancelOrder=Are you sure you want to cancel this order ?
+ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b> ?
GenerateBill=Kreiraj račun
-# ClassifyShipped=Classify delivered
-# ClassifyBilled=Classify billed
-# ComptaCard=Accountancy card
-# DraftOrders=Draft orders
-# RelatedOrders=Related orders
-# OnProcessOrders=In process orders
-# RefOrder=Ref. order
-# RefCustomerOrder=Ref. customer order
-CustomerOrder=Narudžbe kupaca
-# RefCustomerOrderShort=Ref. cust. order
-# SendOrderByMail=Send order by mail
-# ActionsOnOrder=Events on order
-# NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
-# OrderMode=Order method
-# AuthorRequest=Request author
-# UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address
-# RunningOrders=Orders on process
-# UserWithApproveOrderGrant=Users granted with "approve orders" permission.
-# PaymentOrderRef=Payment of order %s
-# CloneOrder=Clone order
-# ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b> ?
-# DispatchSupplierOrder=Receiving supplier order %s
+ClassifyShipped=Classify delivered
+ClassifyBilled=Classify billed
+ComptaCard=Accountancy card
+DraftOrders=Draft orders
+RelatedOrders=Related orders
+OnProcessOrders=In process orders
+RefOrder=Ref. order
+RefCustomerOrder=Ref. customer order
+RefCustomerOrderShort=Ref. cust. order
+SendOrderByMail=Send order by mail
+ActionsOnOrder=Events on order
+NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
+OrderMode=Order method
+AuthorRequest=Request author
+UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address
+RunningOrders=Orders on process
+UserWithApproveOrderGrant=Users granted with "approve orders" permission.
+PaymentOrderRef=Payment of order %s
+CloneOrder=Clone order
+ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b> ?
+DispatchSupplierOrder=Receiving supplier order %s
##### Types de contacts #####
-# TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
-# TypeContact_commande_internal_SHIPPING=Representative following-up shipping
-# TypeContact_commande_external_BILLING=Customer invoice contact
-# TypeContact_commande_external_SHIPPING=Customer shipping contact
-# TypeContact_commande_external_CUSTOMER=Customer contact following-up order
-# TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order
-# TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
-# TypeContact_order_supplier_external_BILLING=Supplier invoice contact
-# TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact
-# TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order
-
-# Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
-# Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
-# Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s'
-# Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s'
-# Error_OrderNotChecked=No orders to invoice selected
-
+TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
+TypeContact_commande_internal_SHIPPING=Representative following-up shipping
+TypeContact_commande_external_BILLING=Customer invoice contact
+TypeContact_commande_external_SHIPPING=Customer shipping contact
+TypeContact_commande_external_CUSTOMER=Customer contact following-up order
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order
+TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
+TypeContact_order_supplier_external_BILLING=Supplier invoice contact
+TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order
+Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
+Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
+Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s'
+Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s'
+Error_OrderNotChecked=No orders to invoice selected
# Sources
-# OrderSource0=Commercial proposal
-# OrderSource1=Internet
-# OrderSource2=Mail campaign
-# OrderSource3=Phone compaign
-# OrderSource4=Fax campaign
-# OrderSource5=Commercial
-# OrderSource6=Store
-# QtyOrdered=Qty ordered
-# AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order
-
+OrderSource0=Commercial proposal
+OrderSource1=Internet
+OrderSource2=Mail campaign
+OrderSource3=Phone compaign
+OrderSource4=Fax campaign
+OrderSource5=Commercial
+OrderSource6=Store
+QtyOrdered=Qty ordered
+AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order
# Documents models
-# PDFEinsteinDescription=A complete order model (logo...)
-# PDFEdisonDescription=A simple order model
-# PDFProformaDescription=A complete proforma invoice (logo…)
+PDFEinsteinDescription=A complete order model (logo...)
+PDFEdisonDescription=A simple order model
+PDFProformaDescription=A complete proforma invoice (logo…)
# Orders modes
-# OrderByMail=Mail
-# OrderByFax=Fax
-# OrderByEMail=EMail
-# OrderByWWW=Online
-# OrderByPhone=Phone
-
-# CreateInvoiceForThisCustomer=Bill orders
-# NoOrdersToInvoice=No orders billable
-# CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-MenuOrdersToBill2=Narudžbe za naplatu
-# OrderCreation=Order creation
-# Ordered=Ordered
-# OrderCreated=Your orders have been created
-# OrderFail=An error happened during your orders creation
-# CreateOrders=Create orders
-# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+OrderByMail=Mail
+OrderByFax=Fax
+OrderByEMail=EMail
+OrderByWWW=Online
+OrderByPhone=Phone
+CreateInvoiceForThisCustomer=Bill orders
+NoOrdersToInvoice=No orders billable
+CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
+OrderCreation=Order creation
+Ordered=Ordered
+OrderCreated=Your orders have been created
+OrderFail=An error happened during your orders creation
+CreateOrders=Create orders
+ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
diff --git a/htdocs/langs/hr_HR/oscommerce.lang b/htdocs/langs/hr_HR/oscommerce.lang
deleted file mode 100644
index 9971073044321862312d3712a3ee7c100ff16646..0000000000000000000000000000000000000000
--- a/htdocs/langs/hr_HR/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=OS Commerce postaljanje modula
-OSCommerceSetupSaved=OS Commerce postavljanje spremljeno
-OSCommerceServer=OS Commerce server host/ip
-OSCommerceDatabaseName=OS Commerce ime baze podataka
-OSCommercePrefix=OS Commerce prefix tablice
-OSCommerceUser=OS Commerce prijava u bazu podataka
diff --git a/htdocs/langs/hr_HR/other.lang b/htdocs/langs/hr_HR/other.lang
index b56ef2944951b7c0d44d285b1e7a02ad6077a579..889918881838dcbc59b7a031b8af656cec175167 100644
--- a/htdocs/langs/hr_HR/other.lang
+++ b/htdocs/langs/hr_HR/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=Security code
Calendar=Calendar
-AddTrip=Add trip
Tools=Tools
ToolsDesc=This area is dedicated to group miscellaneous tools not available into other menu entries.<br><br>Those tools can be reached from menu on the side.
Birthday=Birthday
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation
Notify_TASK_CREATE=Task created
Notify_TASK_MODIFY=Task modified
Notify_TASK_DELETE=Task deleted
+SeeModuleSetup=See module setup
NbOfAttachedFiles=Number of attached files/documents
TotalSizeOfAttachedFiles=Total size of attached files/documents
MaxSize=Maximum size
@@ -80,6 +80,16 @@ ModifiedBy=Modified by %s
ValidatedBy=Validated by %s
CanceledBy=Canceled by %s
ClosedBy=Closed by %s
+CreatedById=User id who created
+ModifiedById=User id who made last change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made last change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
FileWasRemoved=File %s was removed
DirWasRemoved=Directory %s was removed
FeatureNotYetAvailableShort=Available in a next version
@@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your
##### Calendar common #####
AddCalendarEntry=Add entry in calendar %s
-NewCompanyToDolibarr=Company %s added into Dolibarr
-ContractValidatedInDolibarr=Contract %s validated in Dolibarr
-ContractCanceledInDolibarr=Contract %s canceled in Dolibarr
-ContractClosedInDolibarr=Contract %s closed in Dolibarr
-PropalClosedSignedInDolibarr=Proposal %s signed in Dolibarr
-PropalClosedRefusedInDolibarr=Proposal %s refused in Dolibarr
-PropalValidatedInDolibarr=Proposal %s validated in Dolibarr
-InvoiceValidatedInDolibarr=Invoice %s validated in Dolibarr
-InvoicePaidInDolibarr=Invoice %s changed to paid in Dolibarr
-InvoiceCanceledInDolibarr=Invoice %s canceled in Dolibarr
-PaymentDoneInDolibarr=Payment %s done in Dolibarr
-CustomerPaymentDoneInDolibarr=Customer payment %s done in Dolibarr
-SupplierPaymentDoneInDolibarr=Supplier payment %s done in Dolibarr
-MemberValidatedInDolibarr=Member %s validated in Dolibarr
-MemberResiliatedInDolibarr=Member %s resiliated in Dolibarr
-MemberDeletedInDolibarr=Member %s deleted from Dolibarr
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added in Dolibarr
-ShipmentValidatedInDolibarr=Shipment %s validated in Dolibarr
-ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
##### Export #####
Export=Export
ExportsArea=Exports area
diff --git a/htdocs/langs/hr_HR/paybox.lang b/htdocs/langs/hr_HR/paybox.lang
index b689bb6cebff21b067564cffd144aa4a6aaa2e98..aced32a49440a9ff7a1b1e0279522ff49cec7821 100644
--- a/htdocs/langs/hr_HR/paybox.lang
+++ b/htdocs/langs/hr_HR/paybox.lang
@@ -1,37 +1,40 @@
# Dolibarr language file - Source file is en_US - paybox
-# PayBoxSetup=PayBox module setup
-# PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
-# FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
-# PaymentForm=Payment form
-# WelcomeOnPaymentPage=Welcome on our online payment service
-# ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
-# ThisIsInformationOnPayment=This is information on payment to do
-# ToComplete=To complete
-# YourEMail=Email to receive payment confirmation
-# Creditor=Creditor
-# PaymentCode=Payment code
-# PayBoxDoPayment=Go on payment
-# YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
-# PleaseBePatient=Please, be patient
-# Continue=Next
-# ToOfferALinkForOnlinePayment=URL for %s payment
-# ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
-# ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
-# ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
-# ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
-# ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
-# YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
-# SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> to have payment created automatically when validated by paybox.
-# YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-# YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
-# AccountParameter=Account parameters
-# UsageParameter=Usage parameters
-# InformationToFindParameters=Help to find your %s account information
-# PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment
-# VendorName=Name of vendor
-# CSSUrlForPaymentForm=CSS style sheet url for payment form
-# MessageOK=Message on validated payment return page
-# MessageKO=Message on canceled payment return page
-# NewPayboxPaymentReceived=New Paybox payment received
-# NewPayboxPaymentFailed=New Paybox payment tried but failed
-# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PayBoxSetup=PayBox module setup
+PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
+FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
+PaymentForm=Payment form
+WelcomeOnPaymentPage=Welcome on our online payment service
+ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
+ThisIsInformationOnPayment=This is information on payment to do
+ToComplete=To complete
+YourEMail=Email to receive payment confirmation
+Creditor=Creditor
+PaymentCode=Payment code
+PayBoxDoPayment=Go on payment
+YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
+PleaseBePatient=Please, be patient
+Continue=Next
+ToOfferALinkForOnlinePayment=URL for %s payment
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
+ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
+YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> to have payment created automatically when validated by paybox.
+YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
+YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
+AccountParameter=Account parameters
+UsageParameter=Usage parameters
+InformationToFindParameters=Help to find your %s account information
+PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment
+VendorName=Name of vendor
+CSSUrlForPaymentForm=CSS style sheet url for payment form
+MessageOK=Message on validated payment return page
+MessageKO=Message on canceled payment return page
+NewPayboxPaymentReceived=New Paybox payment received
+NewPayboxPaymentFailed=New Paybox payment tried but failed
+PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/hr_HR/propal.lang b/htdocs/langs/hr_HR/propal.lang
index 0a0f8a55ea4e5c86afb916659f36d50697f71613..802f4040febcf95c6971c9a44cedd73d8dd9cbd1 100644
--- a/htdocs/langs/hr_HR/propal.lang
+++ b/htdocs/langs/hr_HR/propal.lang
@@ -16,7 +16,7 @@ Prospect=Mogući kupac
ProspectList=Popis mogućih kupaca
DeleteProp=Izbriši trgovačku ponudu
ValidateProp=Ovjeri trgovačku ponudu
-AddProp=Napravi ponudu
+AddProp=Izradi ponudu
ConfirmDeleteProp=Jeste li sigurni da želite izbrisati ovu trgovačku ponudu?
ConfirmValidateProp=Jesti li sigurni da želite ovjeriti ovu trgovačku ponudu pod imenom <b>%s</b>?
LastPropals=Zadnjih %s proposals
@@ -55,8 +55,6 @@ NoOpenedPropals=Nema otvorenih trgovačkih ponuda
NoOtherOpenedPropals=nema drugih otvorenih trgovačkih ponuda
RefProposal=Broj trgovačke ponude
SendPropalByMail=Pošalji trgovačku ponudu e-poštom
-FileNotUploaded=Datoteka nije učitana
-FileUploaded=Datoteka je uspješno učitana
AssociatedDocuments=Dokumenti povezani s ovom ponudom:
ErrorCantOpenDir=Mapa se ne može otvoriti
DatePropal=Datum ponude
diff --git a/htdocs/langs/hr_HR/resource.lang b/htdocs/langs/hr_HR/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..d64075dfbf595897a63e3eebf19194d8f71030dd
--- /dev/null
+++ b/htdocs/langs/hr_HR/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
diff --git a/htdocs/langs/hr_HR/sendings.lang b/htdocs/langs/hr_HR/sendings.lang
index 0716aebfc79c963735c5af085f98bc8a0f940c5e..6e769ef91e7dc71f62b33cd6f9504f7a03e50ba4 100644
--- a/htdocs/langs/hr_HR/sendings.lang
+++ b/htdocs/langs/hr_HR/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is do
RelatedShippings=Povezane pošiljke
ShipmentLine=Shipment line
CarrierList=List of transporters
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
# Sending methods
SendingMethodCATCH=Catch by customer
diff --git a/htdocs/langs/hr_HR/stocks.lang b/htdocs/langs/hr_HR/stocks.lang
index 5d11b0fd7a0992284856369a2d4b919e56a34453..06c502504e9f19219ba028be8d02fbb55e5f0697 100644
--- a/htdocs/langs/hr_HR/stocks.lang
+++ b/htdocs/langs/hr_HR/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Warehouse label is required
CorrectStock=Correct stock
ListOfWarehouses=List of warehouses
ListOfStockMovements=List of stock movements
-StocksArea=Stocks area
+StocksArea=Warehouses area
Location=Location
LocationSummary=Short name location
NumberOfDifferentProducts=Number of different products
diff --git a/htdocs/langs/hr_HR/users.lang b/htdocs/langs/hr_HR/users.lang
index 45cc3c865a065c9ae5732dc645eade9c1998d159..922a3e316df141065152310ff8e76fb26abdd0ce 100644
--- a/htdocs/langs/hr_HR/users.lang
+++ b/htdocs/langs/hr_HR/users.lang
@@ -63,7 +63,6 @@ ShowGroup=Prikaži grupu
ShowUser=Prikaži korisnika
NonAffectedUsers=Non assigned users
UserModified=User modified successfully
-GroupModified=Group modified successfully
PhotoFile=Photo file
UserWithDolibarrAccess=User with Dolibarr access
ListOfUsersInGroup=List of users in this group
@@ -103,7 +102,7 @@ UserDisabled=Korisnik %s onemogućen
UserEnabled=Korisnik %s aktiviran
UserDeleted=Korisnik %s uklonjen
NewGroupCreated=Grupa %s kreirana
-GroupModified=Group modified successfully
+GroupModified=Group %s modified
GroupDeleted=Grupa %s uklonjena
ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact ?
ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member ?
@@ -114,8 +113,10 @@ YourRole=Vaše uloge
YourQuotaOfUsersIsReached=Your quota of active users is reached !
NbOfUsers=Broj korisnika
DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
-HierarchicalResponsible=Hierarchical responsible
+HierarchicalResponsible=Supervisor
HierarchicView=Hierarchical view
UseTypeFieldToChange=Use field Type to change
OpenIDURL=OpenID URL
LoginUsingOpenID=Use OpenID to login
+WeeklyHours=Weekly hours
+ColorUser=Color of the user
diff --git a/htdocs/langs/hr_HR/withdrawals.lang b/htdocs/langs/hr_HR/withdrawals.lang
index 58ac3e252ec59d67ff8d71c394b4c44265bc3add..e433730908416bbfa32c181a580b9e2e7e34717c 100644
--- a/htdocs/langs/hr_HR/withdrawals.lang
+++ b/htdocs/langs/hr_HR/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=Receipt
LastWithdrawalReceipts=Last %s withdrawal receipts
WithdrawedBills=Withdrawn invoices
WithdrawalsLines=Withdrawal lines
-RequestStandingOrderToTreat=Request for standing orders to treat
-RequestStandingOrderTreated=Request for standing orders treated
+RequestStandingOrderToTreat=Request for standing orders to process
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=Customer standing orders
CustomerStandingOrder=Customer standing order
NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
@@ -40,14 +41,13 @@ TransMetod=Transmission method
Send=Send
Lines=Lines
StandingOrderReject=Issue a rejection
-InvoiceRefused=Invoice refused
WithdrawalRefused=Withdrawal refused
WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society
RefusedData=Date of rejection
RefusedReason=Reason for rejection
RefusedInvoicing=Billing the rejection
NoInvoiceRefused=Do not charge the rejection
-InvoiceRefused=Invoice refused
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=Status
StatusUnknown=Unknown
StatusWaiting=Waiting
@@ -76,7 +76,7 @@ WithBankUsingRIB=For bank accounts using RIB
WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
BankToReceiveWithdraw=Bank account to receive withdraws
CreditDate=Credit on
-WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
ShowWithdraw=Show Withdraw
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
diff --git a/htdocs/langs/hu_HU/accountancy.lang b/htdocs/langs/hu_HU/accountancy.lang
index 8cab9d2b651d75b0721d76fda619e2034e4509b4..39c2732ec29852cf93d41614ed1812c2a4c1ce4f 100644
--- a/htdocs/langs/hu_HU/accountancy.lang
+++ b/htdocs/langs/hu_HU/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts
Validate=Validate
Addanaccount=Add an accounting account
AccountAccounting=Accounting account
-Ventilation=Ventilation
+Ventilation=Breakdown
ToDispatch=To dispatch
Dispatched=Dispatched
-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
TradeMargin=Trade margin
Reports=Reports
ByCustomerInvoice=By invoices customers
@@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger
Bookkeeping=General ledger
AccountBalanceByMonth=Account balance by month
-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
Line=Line
CAHTF=Total purchase supplier HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice
IntoAccount=In the accounting account
Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
+VentilationAuto=Automatic breakdown
Processing=Processing
EndProcessing=The end of processing
@@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account
ACCOUNTING_SEPARATORCSV=Separator CSV
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
@@ -140,14 +140,14 @@ Active=Statement
NewFiscalYear=New fiscal year
-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
TotalVente=Total turnover HT
TotalMarge=Total sales margin
DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
ChangeAccount=Change the accounting account for lines selected by the account:
Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
@@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically
ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index 9a80f5713454d72f1c9b647ae935794f002ddf14..61ccfb87d4946fafd7961bf98ee152409706a92b 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -437,8 +437,8 @@ Module52Name=Készletek
Module52Desc=Stock irányítása termékek
Module53Name=Szolgáltatások
Module53Desc=Szolgáltatás menedzsment
-Module54Name=Szerződések
-Module54Desc=Szerződés és a szolgáltatás menedzsment
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=Vonalkódok
Module55Desc=Vonalkód vezetése
Module56Name=Telefonálás
@@ -475,8 +475,8 @@ Module320Name=RSS Feed
Module320Desc=Add RSS feed belül Dolibarr képernyőre
Module330Name=Könyvjelzők
Module330Desc=Bookmark vezetése
-Module400Name=Projektek
-Module400Desc=Projekt menedzsment belül más modulok
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=WebCalendar
Module410Desc=WebCalendar integráció
Module500Name=Special expenses (tax, social contributions, dividends)
@@ -484,7 +484,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di
Module510Name=Salaries
Module510Desc=Management of employees salaries and payments
Module600Name=Értesítések
-Module600Desc=Küldés e-mailben értesítést néhány Dolibarr üzleti rendezvények, harmadik fél kapcsolatok
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Adományok
Module700Desc=Adomány vezetése
Module1200Name=Mantis
@@ -514,16 +514,16 @@ Module5000Name=Multi-cég
Module5000Desc=Lehetővé teszi, hogy több vállalat kezelése
Module6000Name=Workflow
Module6000Desc=Workflow management
-Module20000Name=Holidays
-Module20000Desc=Declare and follow employees holidays
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
Module39000Name=Product batch
Module39000Desc=Batch number, eat-by and sell-by date management on products
Module50000Name=Paybox
Module50000Desc=Modult kínál online fizetési oldalra bankkártyáját Paybox
Module50100Name=Értékesítési
Module50100Desc=Point of Sales Modul
-Module50200Name= Paypal
-Module50200Desc= Modult kínál online fizetési oldalra hitelkártya Paypal
+Module50200Name=Paypal
+Module50200Desc=Modult kínál online fizetési oldalra hitelkártya Paypal
Module50400Name=Accounting (advanced)
Module50400Desc=Accounting management (double parties)
Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=Olvassa házszabályok
Permission152=Hozzon létre / módosítható állandó megbízások kérés
Permission153=Átviteli állandó megbízások bevételek
Permission154=Hitel / elutasítása házszabály bevételek
-Permission161=Olvassa el szerződéseket
-Permission162=Létrehozza / módosítja szerződések
-Permission163=Szolgáltatás aktiválása a szerződés
-Permission164=Letiltása szolgáltatási szerződés
-Permission165=Törlés szerződések
-Permission171=Olvassa utak
-Permission172=Létrehozza / módosítja utak
-Permission173=Törlés utak
-Permission178=Export utak
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Read trips and expenses (own and his subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
Permission180=Olvassa beszállítók
Permission181=Olvassa szállító megrendelések
Permission182=Létrehozza / módosítja szállító megrendelések
@@ -671,7 +672,7 @@ Permission300=Olvassa vonalkódok
Permission301=Létrehozza / módosítja vonalkódok
Permission302=Törlés vonalkódok
Permission311=Olvassa szolgáltatások
-Permission312=Rendeljen szolgáltatást szerződés
+Permission312=Assign service/subscription to contract
Permission331=Olvassa könyvjelzők
Permission332=Létrehozza / módosítja könyvjelzők
Permission333=Törlés könyvjelzők
@@ -701,8 +702,8 @@ Permission701=Olvassa el adományokat
Permission702=Létrehozza / módosítja adományok
Permission703=Törlés adományok
Permission1001=Olvassa készletek
-Permission1002=Létrehozza / módosítja készletek
-Permission1003=Állományok törlése
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=Olvassa állomány mozgását
Permission1005=Létrehozza / módosítja állomány mozgását
Permission1101=Olvassa el szállítási megrendelések
@@ -1038,7 +1039,6 @@ YesInSummer=Yes in summer
OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
SuhosinSessionEncrypt=Session storage encrypted by Suhosin
ConditionIsCurrently=Condition is currently %s
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
YouUseBestDriver=You use driver %s that is best driver available currently.
YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=Vissza 1 számviteli kódot építette: <br> %s követ
ModuleCompanyCodePanicum=Vissza az üres számviteli kódot.
ModuleCompanyCodeDigitaria=Számviteli kód attól függ, hogy harmadik fél kódot. A kód áll a karakter "C"-ben az első helyen, majd az első 5 karakter a harmadik fél kódot.
UseNotifications=Használja értesítések
-NotificationsDesc=E-mailek értesítések funkció lehetővé teszi, hogy csendben küld automatikus mail, néhány Dolibarr események, harmadik felek (ügyfelek vagy beszállítók), hogy vannak beállítva. Választható aktív értesítési és célok kapcsolatok készítéséhez harmadik fél időpontban.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
ModelModules=Dokumentumok sablonok
DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
WatermarkOnDraft=Vízjel dokumentum tervezetét
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=Add szállítási határidő képessége
UseOptionLineIfNoQuantity=Egy sor termék / szolgáltatás nulla összeg szóba,
FreeLegalTextOnProposal=Szabad szöveg a kereskedelmi javaslatok
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=Order Management Setup
OrdersNumberingModules=Megrendelés számozási modulok
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list
ValidOrderAfterPropalClosed=Ahhoz, hogy érvényesítse a megbízást, miután javaslat közelebb, lehetővé teszi, hogy ne lépjen az ideiglenes sorrendben
FreeLegalTextOnOrders=Szabad szöveg rendelés
WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
##### Clicktodial #####
ClickToDialSetup=Kattintson a Tárcsázás modul beállítása
ClickToDialUrlDesc=Url meghívásra, ha egy kattintás a telefonon Picto történik. Az URL, akkor a tag <br> <b>__PHONETO__</b> Hogy fogja helyettesíteni a telefonszámot hívott személynek <br> <b>__PHONEFROM__</b> Hogy váltják fel a hívó telefonszámát személy (a tiéd) <br> <b>__LOGIN__</b> Hogy váltják fel clicktodial login (azaz a felhasználói kártya) <br> <b>__PASS__</b> Hogy váltják a clicktodial jelszót (amelyeket a felhasználói kártya).
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=Beavatkozás számozási modulok
TemplatePDFInterventions=Beavatkozás kártya dokumentumok modellek
WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
##### Contracts #####
-ContractsSetup=Szerződések modul beállítása
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=Szerződések számozási modulok
TemplatePDFContracts=Contracts documents models
FreeLegalTextOnContracts=Free text on contracts
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
CacheByServer=Cache by server
CacheByClient=Cache by browser
CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=Termékek modul beállítása
ServiceSetup=Szolgáltatások modul beállítása
@@ -1382,9 +1384,10 @@ MailingSetup=Küldése e-mailben modul beállítása
MailingEMailFrom=Feladó e-mail (-tól) az e-mailek által küldött e-mailezés modul
MailingEMailError=Vissza E-Mail (Hibák-ig) e-mailek hibákkal
##### Notification #####
-NotificationSetup=Értesítés bu-mail beállítási modul
+NotificationSetup=EMail notification module setup
NotificationEMailFrom=Feladó e-mail (-tól) az e-maileket küldött értesítések
-ListOfAvailableNotifications=A rendelkezésre álló bejelentések (Ez a lista függ aktivált modulok)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
##### Sendings #####
SendingsSetup=Küldő modul beállítása
SendingsReceiptModel=Küldése modell átvételét
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=Csatlakozás a szerverhez "%s" az adatbázis "%s
OSCommerceTestKo1=Csatlakozás a szerverhez "%s" sikerül, de adatbázis "%s" nem lehet elérni.
OSCommerceTestKo2=Csatlakozás a szerverhez "%s" felhasználói "%s" sikerült.
##### Stock #####
-StockSetup=Konfigurációs modul készlet
-UserWarehouse=Használja a felhasználó személyi állomány
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=Menü törölve
TreeMenu=Fa menük
@@ -1478,11 +1482,14 @@ ClickToDialDesc=Ez a modul lehetővé teszi, hogy egészítsék ki egy ikont tel
##### Point Of Sales (CashDesk) #####
CashDesk=Értékesítési
CashDeskSetup=Point of Sales Modul telepítés
-CashDeskThirdPartyForSell=Általános harmadik fél használni elad
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Alapértelmezett fiók kezelhető készpénz kifizetések
CashDeskBankAccountForCheque= Alapértelmezett fiók használata fizetések fogadására csekkel
CashDeskBankAccountForCB= Alapértelmezett fiók kezelhető készpénz kifizetések hitelkártyák
-CashDeskIdWareHouse=Raktár használni elad
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Könyvjelző beállítása modul
BookmarkDesc=Ez a modul lehetővé teszi a könyvjelzők kezelése. Azt is hozzá parancsikonokat bármely Dolibarr oldalakra vagy externale webhelyeket a bal oldali menüben.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Delete fiscal year
ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
Opened=Opened
Closed=Closed
-
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
diff --git a/htdocs/langs/hu_HU/agenda.lang b/htdocs/langs/hu_HU/agenda.lang
index fea301f7b24d958fffae70deccc8fa61c6b6819b..3a6a949b9c69c4cd1a8bd5202c395601ab8e822a 100644
--- a/htdocs/langs/hu_HU/agenda.lang
+++ b/htdocs/langs/hu_HU/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= Napirend automatikus kitöltése
AgendaAutoActionDesc= Define here events for which you want Dolibarr to create automatically an action in agenda. If nothing is checked (by default), only manual actions will be included in agenda.
AgendaSetupOtherDesc= Ez az oldal lehetővé teszi a napirend modul konfigurálását.
AgendaExtSitesDesc=Ez az oldal lehetővé teszi, hogy nyilvánítsa külső forrásokat naptárak látják eseményeket Dolibarr napirenden.
-ActionsEvents= Events for which Dolibarr will create an action in agenda automatically
-PropalValidatedInDolibarr= %s ajánlat érvényesítve
-InvoiceValidatedInDolibarr= %s számla érvényesítve
+ActionsEvents=Events for which Dolibarr will create an action in agenda automatically
+PropalValidatedInDolibarr=%s ajánlat érvényesítve
+InvoiceValidatedInDolibarr=%s számla érvényesítve
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=Számla %s menj vissza a tervezett jogállását
InvoiceDeleteDolibarr=Invoice %s deleted
OrderValidatedInDolibarr= %s megrendelés érvényesítve
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Rendelés %s jóváhagyott
OrderRefusedInDolibarr=Order %s refused
OrderBackToDraftInDolibarr=Rendelés %s menj vissza vázlat
OrderCanceledInDolibarr=Rendelés %s törölt
-InterventionValidatedInDolibarr=%s közbenjárás érvényesítve
ProposalSentByEMail=Üzleti ajánlat %s postáztuk
OrderSentByEMail=Ügyfél érdekében %s postáztuk
InvoiceSentByEMail=Az ügyfél számlát postáztuk %s
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=Szállító érdekében %s postáztuk
SupplierInvoiceSentByEMail=Szállító számlát postáztuk %s
ShippingSentByEMail=Szállítás %s postáztuk
ShippingValidated= Shipping %s validated
-InterventionSentByEMail=Beavatkozás %s postáztuk
-InterventionClassifiedBilled=Intervention %s classified as Billed
NewCompanyToDolibarr= Harmadik fél létrehozva
DateActionPlannedStart= Tervezett indulási dátum
DateActionPlannedEnd= Tervezett befejezési dátum
@@ -70,9 +68,9 @@ DateActionStart= Indulási dátum
DateActionEnd= Befejezési dátum
AgendaUrlOptions1=Az alábbi paramétereket hozzá lehet adni a kimenet szűréséhez:
AgendaUrlOptions2=<b>login=%s</b> kimenet szükítése a <b>%s</b> felhasználó által létrehozott cselekvésekre, érintő cselekvésekre,által végzett cselekvésekre.
-AgendaUrlOptions3=<b>logina=%s</b> kimenet szükítése a <b>%s</b> felhasználó által létrehozott cselekvésekre.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
AgendaUrlOptions4=<b>logint=%s</b> kimenet szükítése a <b>%s</b> felhasználó érintő cselekvésekre.
-AgendaUrlOptions5=<b>logind=%s</b> kimenet szükítése a <b>%s</b> felhasználó által végzett cselekvésekre.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
AgendaShowBirthdayEvents=Kapcsolatok születésnapjának mutatása
AgendaHideBirthdayEvents=Kapcsolatok születésnapjának elrejtése
Busy=Busy
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=URL eléréséhez. ICal fájl
ExtSiteNoLabel=Nincs leírás
WorkingTimeRange=Working time range
WorkingDaysRange=Working days range
-AddEvent=Add event
+AddEvent=Create event
MyAvailability=My availability
diff --git a/htdocs/langs/hu_HU/bills.lang b/htdocs/langs/hu_HU/bills.lang
index ea40c0bec453989429f6f4c3a1ba45f3792227bc..e030bdc8ba059a4e8fd3fb9eb5373ce55096e640 100644
--- a/htdocs/langs/hu_HU/bills.lang
+++ b/htdocs/langs/hu_HU/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Jóváírást
InvoiceAvoirAsk=Jóváírást kijavítani számla
InvoiceAvoirDesc=A <b>jóváírást</b> negatív számla megoldására használják arra, hogy egy számla van egy összeget, ami különbözik, mint a kifizetett összeg valóban (mert ügyfél fizetett túl sok a hiba, vagy nem fizetik vissza, mivel ő teljesen bizonyos termékek, például).
invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
-invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
ReplaceInvoice=Cserélje ki számlát %s
ReplacementInvoice=Csere számla
ReplacedByInvoice=Helyébe számla %s
@@ -87,7 +87,7 @@ ClassifyCanceled=Classify "elhagyott"
ClassifyClosed=Classify "zárt"
ClassifyUnBilled=Classify 'Unbilled'
CreateBill=Számla létrehozása
-AddBill=Add számla vagy jóváírás
+AddBill=Create invoice or credit note
AddToDraftInvoices=Add to draft invoice
DeleteBill=Törlés számla
SearchACustomerInvoice=Keressen, ha az ügyfél számla
@@ -99,7 +99,7 @@ DoPaymentBack=Do fizetési vissza
ConvertToReduc=Átalakulhat jövő kedvezmény
EnterPaymentReceivedFromCustomer=Adja meg a fizetési kapott ügyfél
EnterPaymentDueToCustomer=Legyen esedékes kifizetést az ügyfél
-DisabledBecauseRemainderToPayIsZero=Tiltva, mert maradékot kell fizetnie nulla
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
Amount=Összeg
PriceBase=Ár bázis
BillStatus=Számla állapota
@@ -137,8 +137,6 @@ BillFrom=-Tól
BillTo=Bill a
ActionsOnBill=Műveletek a számlán
NewBill=Új számla
-Prélèvements=Állandó érvényű parancs
-Prélèvements=Állandó érvényű parancs
LastBills=Utolsó %s számlák
LastCustomersBills=Utolsó %s ügyfelek számláit
LastSuppliersBills=Utolsó %s beszállítói számlák
@@ -156,9 +154,9 @@ ConfirmCancelBill=Biztosan meg akarja szakítani <b>%s</b> számlát?
ConfirmCancelBillQuestion=Miért akar minősíteni ezt a számlát "elhagyott"?
ConfirmClassifyPaidPartially=Biztosan meg szeretné változtatni a status <b>%s</b> számlát fizetni?
ConfirmClassifyPaidPartiallyQuestion=Ezt a számlát nem fizették ki teljesen. Mik az okai, hogy zárja be a számlát?
-ConfirmClassifyPaidPartiallyReasonAvoir=Fennmaradó fizetni <b>(%s %s)</b> egy engedmény, mert a fizetés előtt távon. Azt szabályozza az ÁFA-jóváírást.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Fennmaradó fizetni <b>(%s %s)</b> egy engedmény, mert a fizetés előtt távon. Elfogadom, hogy elveszíti a HÉA-e kedvezmény.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Fennmaradó fizetni <b>(%s %s)</b> egy engedmény, mert a fizetés előtt távon. Én vissza az ÁFA ezen kedvezmény nélkül jóváírást.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
ConfirmClassifyPaidPartiallyReasonBadCustomer=Rossz ügyfél
ConfirmClassifyPaidPartiallyReasonProductReturned=Termékek részben visszatért
ConfirmClassifyPaidPartiallyReasonOther=Összeg elhagyott más okból
@@ -191,9 +189,9 @@ AlreadyPaid=Már kifizetett
AlreadyPaidBack=Already paid back
AlreadyPaidNoCreditNotesNoDeposits=Már kifizetett (hitel nélkül jegyzetek és betétek)
Abandoned=Elhagyatott
-RemainderToPay=Fennmaradó fizetni
-RemainderToTake=Fennmaradó részt venni
-RemainderToPayBack=Remainder to pay back
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
Rest=Pending
AmountExpected=Követelt összeget
ExcessReceived=A felesleges kapott
@@ -219,19 +217,18 @@ NoInvoice=Nincs számla
ClassifyBill=Osztályozza számla
SupplierBillsToPay=Beszállítók számlákat fizetni
CustomerBillsUnpaid=Kifizetetlen számlák ügyfeleknek
-DispenseMontantLettres=A törvényjavaslat által kidolgozott mechanográfiai mentesek a betűk sorrendjét
-DispenseMontantLettres=A törvényjavaslat által kidolgozott mechanográfiai mentesek a betűk sorrendjét
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=Nem javítható
SetConditions=Állítsa fizetési feltételek
SetMode=Állítsa fizetési mód
Billed=Kiszámlázott
-RepeatableInvoice=Előre meghatározott számla
-RepeatableInvoices=Előre definiált számlák
-Repeatable=Előre definiált
-Repeatables=Előre definiált
-ChangeIntoRepeatableInvoice=Átalakulhat az előre meghatározott
-CreateRepeatableInvoice=Létrehozása előre meghatározott számla
-CreateFromRepeatableInvoice=Hozzon létre az előre meghatározott számla
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
CustomersInvoicesAndInvoiceLines=Vevői számlák és a számla sorai
CustomersInvoicesAndPayments=Vevői számlák és kifizetések
ExportDataset_invoice_1=Vevői számlák listája és számlát vonalak
diff --git a/htdocs/langs/hu_HU/categories.lang b/htdocs/langs/hu_HU/categories.lang
index 3591ea58e6b6e8c5f09654bf8f91143151862ccf..348f309e7f269021a436528863d01180a9f6a6f7 100644
--- a/htdocs/langs/hu_HU/categories.lang
+++ b/htdocs/langs/hu_HU/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories
CatCusLinks=Links between customers/prospects and categories
CatProdLinks=Links between products/services and categories
CatMemberLinks=Links between members and categories
-CatProdLinks=Links between products/services and categories
-CatCusLinks=Links between customers/prospects and categories
-CatSupLinks=Links between suppliers and categories
DeleteFromCat=Remove from category
DeletePicture=Picture delete
ConfirmDeletePicture=Confirm picture deletion?
@@ -112,3 +109,4 @@ CategoriesSetup=Categories setup
CategorieRecursiv=Link with parent category automatically
CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category
diff --git a/htdocs/langs/hu_HU/compta.lang b/htdocs/langs/hu_HU/compta.lang
index 8a7e484f3f080314aebcdc4170212b635d5540d5..cc6dabc7a18b728b6352f1cabe345f738d9f0d40 100644
--- a/htdocs/langs/hu_HU/compta.lang
+++ b/htdocs/langs/hu_HU/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Rossz ügyfél számviteli kódot %s
SuppliersProductsSellSalesTurnover=A forgalmat az eladások a beszállító termékeit.
CheckReceipt=Ellenőrizze a betéti
CheckReceiptShort=Ellenőrizze a betéti
+LastCheckReceiptShort=Last %s check receipts
NewCheckReceipt=Új kedvezmény
NewCheckDeposit=Új ellenőrizze betéti
NewCheckDepositOn=Készítsen nyugtát letét számla: %s
diff --git a/htdocs/langs/hu_HU/contracts.lang b/htdocs/langs/hu_HU/contracts.lang
index b0d80e83dae2e489eec2e315ae8b6ca48da68948..b22dcf89dc79b23ec403161a87fbd5685f406cc3 100644
--- a/htdocs/langs/hu_HU/contracts.lang
+++ b/htdocs/langs/hu_HU/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Szerzősdések terólet
ListOfContracts=Szerződések listája
-LastContracts=Utolsó %s módosított szerződés
+LastModifiedContracts=Last %s modified contracts
AllContracts=Minden szerződés
ContractCard=Szerződés kártya
ContractStatus=Szerződés állpaot
@@ -27,7 +27,7 @@ MenuRunningServices=Futó szolgáltatások
MenuExpiredServices=Lejárt szolgáltatások
MenuClosedServices=Lezárt szolgáltatások
NewContract=Új szerződés
-AddContract=Szerződés hozzáadása
+AddContract=Create contract
SearchAContract=Szerződés keresése
DeleteAContract=Szerződés törlése
CloseAContract=Szerződés lezárása
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Futó szerződések listája
ListOfRunningServices=Futó szolgáltatások listája
NotActivatedServices=Inaktív szolgáltatások (a hitelesített szerződések között)
BoardNotActivatedServices=Hitelesített szerződésekhez tartozó aktiválandó szolgáltatások
-LastContracts=Utolsó %s módosított szerződés
+LastContracts=Last % contracts
LastActivatedServices=Utolós %s aktivált szolgáltatás
LastModifiedServices=Utolsó %s módosított szolgáltatás
EditServiceLine=Szolgáltatás sor szerkesztése
diff --git a/htdocs/langs/hu_HU/cron.lang b/htdocs/langs/hu_HU/cron.lang
index c5c5db999c54093c21d236609ec590dd3dc50f96..896df7fa6a03ae2b7043694aa50bc70870087c09 100644
--- a/htdocs/langs/hu_HU/cron.lang
+++ b/htdocs/langs/hu_HU/cron.lang
@@ -1,114 +1,86 @@
# Dolibarr language file - Source file is en_US - cron
-#
# About page
-#
About = Róla
-# CronAbout = About Cron
-# CronAboutPage = Cron about page
-
-#
+CronAbout = About Cron
+CronAboutPage = Cron about page
# Right
-#
-# Permission23101 = Read Scheduled task
-# Permission23102 = Create/update Scheduled task
-# Permission23103 = Delete Scheduled task
-# Permission23104 = Execute Scheduled task
-
-#
+Permission23101 = Read Scheduled task
+Permission23102 = Create/update Scheduled task
+Permission23103 = Delete Scheduled task
+Permission23104 = Execute Scheduled task
# Admin
-#
-# CronSetup= Scheduled job management setup
-# URLToLaunchCronJobs=URL to check and launch cron jobs if required
-# OrToLaunchASpecificJob=Or to check and launch a specific job
-# KeyForCronAccess=Security key for URL to launch cron jobs
-# FileToLaunchCronJobs=Command line to launch cron jobs
-# CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes
-# CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
-
-
-#
+CronSetup= Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch cron jobs if required
+OrToLaunchASpecificJob=Or to check and launch a specific job
+KeyForCronAccess=Security key for URL to launch cron jobs
+FileToLaunchCronJobs=Command line to launch cron jobs
+CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
# Menu
-#
-# CronJobs=Scheduled jobs
-# CronListActive= List of active jobs
-# CronListInactive= List of disabled jobs
-# CronListActive= List of active jobs
-
-
-#
+CronJobs=Scheduled jobs
+CronListActive=List of active/scheduled jobs
+CronListInactive=List of disabled jobs
# Page list
-#
-# CronDateLastRun=Last run
-# CronLastOutput=Last run output
-# CronLastResult=Last result code
-# CronListOfCronJobs=List of scheduled jobs
-# CronCommand=Command
-# CronList=Jobs list
-# CronDelete= Delete cron jobs
-# CronConfirmDelete= Are you sure you want to delete this cron job ?
-# CronExecute=Launch job
-# CronConfirmExecute= Are you sure to execute this job now
-# CronInfo= Jobs allow to execute task that have been planned
-# CronWaitingJobs=Wainting jobs
-# CronTask=Job
+CronDateLastRun=Last run
+CronLastOutput=Last run output
+CronLastResult=Last result code
+CronListOfCronJobs=List of scheduled jobs
+CronCommand=Command
+CronList=Jobs list
+CronDelete= Delete cron jobs
+CronConfirmDelete= Are you sure you want to delete this cron job ?
+CronExecute=Launch job
+CronConfirmExecute= Are you sure to execute this job now
+CronInfo= Jobs allow to execute task that have been planned
+CronWaitingJobs=Wainting jobs
+CronTask=Job
CronNone= Nincs
CronDtStart=Kezdési dátum
CronDtEnd=Befejezési dátum
-# CronDtNextLaunch=Next execution
-# CronDtLastLaunch=Last execution
-# CronFrequency=Frequancy
-# CronClass=Classe
+CronDtNextLaunch=Next execution
+CronDtLastLaunch=Last execution
+CronFrequency=Frequancy
+CronClass=Classe
CronMethod=Módszer
CronModule=Modul
-# CronAction=Action
+CronAction=Action
CronStatus=Állapot
CronStatusActive=Enabled
CronStatusInactive=Kikapcsolva
-# CronNoJobs=No jobs registered
+CronNoJobs=No jobs registered
CronPriority=Prioritás
CronLabel=Leírás
-# CronNbRun=Nb. launch
-# CronEach=Every
-# JobFinished=Job launched and finished
-
-#
+CronNbRun=Nb. launch
+CronEach=Every
+JobFinished=Job launched and finished
#Page card
-#
-# CronAdd= Add jobs
-# CronHourStart= Start Hour and date of task
-# CronEvery= And execute task each
-# CronObject= Instance/Object to create
+CronAdd= Add jobs
+CronHourStart= Start Hour and date of task
+CronEvery= And execute task each
+CronObject= Instance/Object to create
CronArgs=Paraméterek
-# CronSaveSucess=Save succesfully
+CronSaveSucess=Save succesfully
CronNote=Megjegyzés
-# CronFieldMandatory=Fields %s is mandatory
-# CronErrEndDateStartDt=End date cannot be before start date
-# CronStatusActiveBtn=Enable
+CronFieldMandatory=Fields %s is mandatory
+CronErrEndDateStartDt=End date cannot be before start date
+CronStatusActiveBtn=Enable
CronStatusInactiveBtn=Letiltás
-# CronTaskInactive=This job is disabled
-# CronDtLastResult=Last result date
-# CronId=Id
-# CronClassFile=Classes (filename.class.php)
-# CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-# CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-# CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-# CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is <i>fecth</i>
-# CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-# CronCommandHelp=The system command line to execute.
-
-#
+CronTaskInactive=This job is disabled
+CronDtLastResult=Last result date
+CronId=Id
+CronClassFile=Classes (filename.class.php)
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
+CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronCommandHelp=The system command line to execute.
# Info
-#
-# CronInfoPage=Information
-
-
-#
+CronInfoPage=Information
# Common
-#
-# CronType=Task type
-# CronType_method=Call method of a Dolibarr Class
-# CronType_command=Shell command
-# CronMenu=Cron
-# CronCannotLoadClass=Cannot load class %s or object %s
-
-# UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+CronType=Task type
+CronType_method=Call method of a Dolibarr Class
+CronType_command=Shell command
+CronMenu=Cron
+CronCannotLoadClass=Cannot load class %s or object %s
+UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
diff --git a/htdocs/langs/hu_HU/donations.lang b/htdocs/langs/hu_HU/donations.lang
index 7e62d1b8e7cc11f0ef71b9b31259e160c03c083f..78108dcd9dc9ef6ae5b837a238537635e3b3670d 100644
--- a/htdocs/langs/hu_HU/donations.lang
+++ b/htdocs/langs/hu_HU/donations.lang
@@ -4,7 +4,7 @@ Donations=Adományok
DonationRef=Donation ref.
Donor=Donor
Donors=Donorok
-AddDonation=Új adomány hozzáadása
+AddDonation=Create a donation
NewDonation=Új adomány
ShowDonation=Show donation
DonationPromise=Ajándék ígéret
@@ -31,3 +31,8 @@ DonationRecipient=Donation recipient
ThankYou=Thank You
IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
MinimumAmount=Minimum amount is %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/hu_HU/externalsite.lang b/htdocs/langs/hu_HU/externalsite.lang
index 71e55ef41fef641d5c2fea8bdcf970dd0269a0b6..5905f248a2ff0a8f228d555d930d667f0b239872 100644
--- a/htdocs/langs/hu_HU/externalsite.lang
+++ b/htdocs/langs/hu_HU/externalsite.lang
@@ -1,4 +1,5 @@
# Dolibarr language file - Source file is en_US - externalsite
ExternalSiteSetup=Beállítás linket külső weboldal
ExternalSiteURL=Külső oldal URL
-# ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/hu_HU/holiday.lang b/htdocs/langs/hu_HU/holiday.lang
index cb4e1241079a1f24e77dd1a87d5923b5044d42ae..6b94d93f203ece147ed76db4a12a0430a70a2c31 100644
--- a/htdocs/langs/hu_HU/holiday.lang
+++ b/htdocs/langs/hu_HU/holiday.lang
@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
CantCreateCP=You don't have the right to make leave requests.
InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=Frissítés
CantUpdate=You cannot update this leave request.
NoDateDebut=You must select a start date.
NoDateFin=You must select an end date.
-ErrorDureeCP=Your request for holidays does not contain working day.
-TitleValidCP=Approve the request holidays
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
ConfirmValidCP=Are you sure you want to approve the leave request?
DateValidCP=Date approved
TitleToValidCP=Send leave request
ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the request holidays
+TitleRefuseCP=Refuse the leave request
ConfirmRefuseCP=Are you sure you want to refuse the leave request?
NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
+TitleCancelCP=Cancel the leave request
ConfirmCancelCP=Are you sure you want to cancel the leave request?
DetailRefusCP=Reason for refusal
DateRefusCP=Date of refusal
@@ -78,7 +77,7 @@ ActionByCP=Performed by
UserUpdateCP=For the user
PrevSoldeCP=Previous Balance
NewSoldeCP=New Balance
-alreadyCPexist=A request for holidays has already been done on this period.
+alreadyCPexist=A leave request has already been done on this period.
UserName=Vezetéknév
Employee=Employee
FirstDayOfHoliday=First day of vacation
@@ -88,25 +87,25 @@ ManualUpdate=Manual update
HolidaysCancelation=Leave request cancelation
## Configuration du Module ##
-ConfCP=Configuration of holidays module
+ConfCP=Configuration of leave request module
DescOptionCP=Description of the option
ValueOptionCP=Érték
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
UpdateConfCPOK=Updated successfully.
ErrorUpdateConfCP=An error occurred during the update, please try again.
-AddCPforUsers=Please add the balance of holidays of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
Module27130Name= Management of leave requests
Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
TitleOptionEventCP=Settings of leave requets for events
ValidEventCP=Hitelesítés
UpdateEventCP=Update events
diff --git a/htdocs/langs/hu_HU/interventions.lang b/htdocs/langs/hu_HU/interventions.lang
index 59578b47fe231e38d13707edf27e21c10cde62cf..45ba17c149fcc492dc3c01c33270e31d2289b0ee 100644
--- a/htdocs/langs/hu_HU/interventions.lang
+++ b/htdocs/langs/hu_HU/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Intervenció
Interventions=Intervenciók
InterventionCard=Intervenció kártya
NewIntervention=Új intervenció
-AddIntervention=Intervenció hozzáadása
+AddIntervention=Create intervention
ListOfInterventions=Intervenciók liskáta
EditIntervention=Intervenció szerkesztése
ActionsOnFicheInter=Műveletek az intervenciós
@@ -30,6 +30,15 @@ StatusInterInvoiced=Számlázott
RelatedInterventions=Kapcsolódó beavatkozások
ShowIntervention=Mutasd beavatkozás
SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Reprezentatív követési intervenció
TypeContact_fichinter_internal_INTERVENING=Beavatkozás
diff --git a/htdocs/langs/hu_HU/mails.lang b/htdocs/langs/hu_HU/mails.lang
index 12d1864851961fce2517d708423da78ba0c66924..60741482144f80fa89c077201cafc5fa5ef09a13 100644
--- a/htdocs/langs/hu_HU/mails.lang
+++ b/htdocs/langs/hu_HU/mails.lang
@@ -115,7 +115,7 @@ SentBy=Által küldött
MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
MailingNeedCommand2=Ön azonban elküldheti őket az interneten hozzáadásával paraméter MAILING_LIMIT_SENDBYWEB az értéke max e-mailek száma szeretne küldeni a session. Ehhez menj a Home - telepítés - Más.
ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=Lista törlése
ToClearAllRecipientsClickHere=Kattintson ide, hogy törölje a címzettek listáját erre a levelezés
ToAddRecipientsChooseHere=Add címzettek közül választhatja ki a listák
@@ -133,6 +133,9 @@ Notifications=Értesítések
NoNotificationsWillBeSent=Nincs e-mail értesítést terveznek erre az eseményre és vállalati
ANotificationsWillBeSent=1 értesítést küldünk e-mailben
SomeNotificationsWillBeSent=%s értesítést küldünk e-mailben
-AddNewNotification=Aktiválása egy új e-mail értesítést kérésére
-ListOfActiveNotifications=Lista az összes aktív e-mail értesítést kér
+AddNewNotification=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
ListOfNotificationsDone=Lista minden e-mail értesítést küldeni
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang
index efa3cd0c653405875df4e9c678d4f21ceb3dd4bd..4303848fc8194a05a868a3dfa68b4df593bb46ff 100644
--- a/htdocs/langs/hu_HU/main.lang
+++ b/htdocs/langs/hu_HU/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=<b>%s</b> felhasználó nem található a
ErrorNoVATRateDefinedForSellerCountry=Hiba '%s' számára nincs Áfa meghatározva.
ErrorNoSocialContributionForSellerCountry=Hiba, nincs szociális hozzájárulás meghatározva '%s' számára.
ErrorFailedToSaveFile=Hiba, nem sikerült a fájl mentése.
-ErrorOnlyPngJpgSupported=Hiba, csak .jpg és .png képfájlok vannak támogatva.
-ErrorImageFormatNotSupported=A PHP-ja nem támogatja a kép konvertálási funkciókat erre a formátumra.
SetDate=Set date
SelectDate=Select a date
SeeAlso=See also %s
BackgroundColorByDefault=Alapértelmezett háttérszin
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
FileWasNotUploaded=Egy fájl ki lett választva csatolásra, de még nincs feltöltve. Kattintson a "Fájl Csatolása" gombra.
NbOfEntries=Bejegyzések száma
GoToWikiHelpPage=Online segítésg olvasása (Internet hozzáférés kell)
@@ -266,6 +266,7 @@ Afternoon=Afternoon
Quadri=Quadri
MonthOfDay=Nap hónapja
HourShort=Ó
+MinuteShort=mn
Rate=Arány
UseLocalTax=Include tax
Bytes=Byte-ok
@@ -340,6 +341,7 @@ FullList=Teljes lista
Statistics=Statisztika
OtherStatistics=Egyéb statisztikák
Status=Állapot
+Favorite=Favorite
ShortInfo=Info.
Ref=Ref.
RefSupplier=Beszállító Ref.
@@ -365,6 +367,7 @@ ActionsOnCompany=Ezzel a harmadikféllel kapcsolatos cselekvések
ActionsOnMember=Események ebben a
NActions=%s cselekvések
NActionsLate=%s késés
+RequestAlreadyDone=Request already recorded
Filter=Szűrő
RemoveFilter=Szűrő eltávolítása
ChartGenerated=Grafikon generálva
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Extra tulajdonságok beállítása
URLPhoto=Url fotó / logo
SetLinkToThirdParty=Link egy másik harmadik fél
CreateDraft=Tervezet készítése
+SetToDraft=Back to draft
ClickToEdit=Kattintson a szerkeszteni
ObjectDeleted=Az objektum törölve %s
ByCountry=Ország szerint
@@ -678,7 +682,7 @@ ViewPrivateNote=View notes
XMoreLines=%s line(s) hidden
PublicUrl=Public URL
AddBox=Add box
-
+SelectElementAndClickRefresh=Select an element and click Refresh
# Week day
Monday=Hétfő
Tuesday=Kedd
diff --git a/htdocs/langs/hu_HU/margins.lang b/htdocs/langs/hu_HU/margins.lang
index 8ad7a7190f5f5132d80ec51c3516bb1067757e42..fc988c12ac841867f73b0e8a7ac76ac1a5363a1f 100644
--- a/htdocs/langs/hu_HU/margins.lang
+++ b/htdocs/langs/hu_HU/margins.lang
@@ -10,24 +10,18 @@ MarkRate=Mark rate
DisplayMarginRates=Display margin rates
DisplayMarkRates=Display mark rates
InputPrice=Input price
-
margin=Profit margins management
margesSetup=Profit margins management setup
-
MarginDetails=Margin details
-
ProductMargins=Product margins
CustomerMargins=Customer margins
SalesRepresentativeMargins=Sales representative margins
-
ProductService=Termék vagy Szolgáltatás
AllProducts=All products and services
ChooseProduct/Service=Choose product or service
-
StartDate=Kezdési dátum
EndDate=Befejezési dátum
Launch=START
-
ForceBuyingPriceIfNull=Force buying price if null
ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0)
MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
@@ -35,16 +29,16 @@ UseDiscountAsProduct=As a product
UseDiscountAsService=As a service
UseDiscountOnTotal=On subtotal
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
-
MARGIN_TYPE=Margin type
MargeBrute=Raw margin
MargeNette=Net margin
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - Cost price
-
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
Charges=Charges
-
AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/hu_HU/orders.lang b/htdocs/langs/hu_HU/orders.lang
index b4d47948996c0d5aa3ead69d89304026e086a2a3..40f05505df7bbe1f25000905b5e7d797fcdda365 100644
--- a/htdocs/langs/hu_HU/orders.lang
+++ b/htdocs/langs/hu_HU/orders.lang
@@ -2,7 +2,7 @@
OrdersArea=Az ügyfelek megrendelések területén
SuppliersOrdersArea=Beszállítók megrendelések területén
OrderCard=Megrendelőlap
-# OrderId=Order Id
+OrderId=Order Id
Order=Megrendelés
Orders=Megrendelés
OrderLine=Rendelés vonal
@@ -28,7 +28,7 @@ StatusOrderCanceledShort=Törölve
StatusOrderDraftShort=Tervezet
StatusOrderValidatedShort=Hitelesítette
StatusOrderSentShort=A folyamat
-# StatusOrderSent=Shipment in process
+StatusOrderSent=Shipment in process
StatusOrderOnProcessShort=Recepció
StatusOrderProcessedShort=Feldolgozott
StatusOrderToBillShort=Bill
@@ -53,9 +53,9 @@ ShippingExist=A szállítmány létezik
DraftOrWaitingApproved=Vagy jóváhagyott tervezet még nem rendelhető
DraftOrWaitingShipped=Tervezet még nem hitelesített vagy szállított
MenuOrdersToBill=Megrendelés Bill
-# MenuOrdersToBill2=Orders to bill
+MenuOrdersToBill2=Billable orders
SearchOrder=Keresés érdekében
-# SearchACustomerOrder=Search a customer order
+SearchACustomerOrder=Search a customer order
ShipProduct=Hajó termék
Discount=Kedvezmény
CreateOrder=Rendet
@@ -65,14 +65,14 @@ ValidateOrder=Érvényesítése érdekében
UnvalidateOrder=Unvalidate érdekében
DeleteOrder=Törlése érdekében
CancelOrder=Mégsem érdekében
-AddOrder=Add érdekében
+AddOrder=Create order
AddToMyOrders=Hozzáadás a megrendelések
AddToOtherOrders=Add az egyéb megrendelések
-# AddToDraftOrders=Add to draft order
+AddToDraftOrders=Add to draft order
ShowOrder=Megjelenítése érdekében
NoOpenedOrders=Nem nyitott megrendelések
NoOtherOpenedOrders=Nincs más nyitott megrendelések
-# NoDraftOrders=No draft orders
+NoDraftOrders=No draft orders
OtherOrders=Egyéb megrendelések
LastOrders=Utolsó %s megrendelések
LastModifiedOrders=Utolsó módosítás %s megrendelések
@@ -82,7 +82,7 @@ NbOfOrders=Megrendelések száma
OrdersStatistics=Rend statisztikák
OrdersStatisticsSuppliers=Szállító rend statisztikák
NumberOfOrdersByMonth=Megrendelések száma a hónap
-# AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
+AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
ListOfOrders=Megrendelések listája
CloseOrder=Bezárása érdekében
ConfirmCloseOrder=Biztosan be akarja zárni ezt a sorrendet? Ha a megrendelés zárva van, csak akkor lehet számlázni.
@@ -93,7 +93,7 @@ ConfirmUnvalidateOrder=Biztos vagy benne, hogy helyreállítsa a rendet <b>%s</b
ConfirmCancelOrder=Biztosan meg akarja szakítani ezt a sorrendet?
ConfirmMakeOrder=Biztos vagy benne, hogy megerősítse annak érdekében tették ezt a <b>%s?</b>
GenerateBill=Számla generálása
-# ClassifyShipped=Classify delivered
+ClassifyShipped=Classify delivered
ClassifyBilled=Classify "számlázott"
ComptaCard=Számviteli kártya
DraftOrders=Tervezet megrendelések
@@ -101,7 +101,6 @@ RelatedOrders=Kapcsolódó megrendelések
OnProcessOrders=A folyamat sorrendek
RefOrder=Ref. érdekében
RefCustomerOrder=Ref. az ügyfelek érdekében
-CustomerOrder=Az ügyfelek érdekében
RefCustomerOrderShort=Ref. Cust. érdekében
SendOrderByMail=A megrendelés elküldése levélben
ActionsOnOrder=Események megrendelésre
@@ -131,9 +130,7 @@ Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Állandó COMMANDE_SUPPLIER_ADDON nincs
Error_COMMANDE_ADDON_NotDefined=Állandó COMMANDE_ADDON nincs definiálva
Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Nem sikerült betölteni a modul fájlt "%s"
Error_FailedToLoad_COMMANDE_ADDON_File=Nem sikerült betölteni a modul fájlt "%s"
-# Error_OrderNotChecked=No orders to invoice selected
-
-
+Error_OrderNotChecked=No orders to invoice selected
# Sources
OrderSource0=Üzleti ajánlat
OrderSource1=Internet
@@ -144,25 +141,22 @@ OrderSource5=Kereskedelmi
OrderSource6=Tárolja
QtyOrdered=Mennyiség megrendelt
AddDeliveryCostLine=Add a szállítási költség vonal jelzi a súlya a sorrendben
-
# Documents models
PDFEinsteinDescription=A teljes order (logo. ..)
PDFEdisonDescription=Egy egyszerű modell érdekében
-# PDFProformaDescription=A complete proforma invoice (logo…)
+PDFProformaDescription=A complete proforma invoice (logo…)
# Orders modes
OrderByMail=Mail
OrderByFax=Fax
OrderByEMail=E-mail
OrderByWWW=Online
OrderByPhone=Telefon
-
-# CreateInvoiceForThisCustomer=Bill orders
-# NoOrdersToInvoice=No orders billable
-# CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-# MenuOrdersToBill2=Orders to bill
-# OrderCreation=Order creation
-# Ordered=Ordered
-# OrderCreated=Your orders have been created
-# OrderFail=An error happened during your orders creation
-# CreateOrders=Create orders
-# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+CreateInvoiceForThisCustomer=Bill orders
+NoOrdersToInvoice=No orders billable
+CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
+OrderCreation=Order creation
+Ordered=Ordered
+OrderCreated=Your orders have been created
+OrderFail=An error happened during your orders creation
+CreateOrders=Create orders
+ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
diff --git a/htdocs/langs/hu_HU/oscommerce.lang b/htdocs/langs/hu_HU/oscommerce.lang
deleted file mode 100644
index 3cb5760422cf1126cb0d04d58afc5d82f347a786..0000000000000000000000000000000000000000
--- a/htdocs/langs/hu_HU/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=OS Commerce modul beállítása
-OSCommerceSetupSaved=OS Commerce beállítás mentése
-OSCommerceServer=OS Commerce Server host / ip
-OSCommerceDatabaseName=OS Commerce adatbázis neve
-OSCommercePrefix=OS Commerce táblázatok előtag
-OSCommerceUser=OS Commerce adatbázis bejelentkezés
diff --git a/htdocs/langs/hu_HU/other.lang b/htdocs/langs/hu_HU/other.lang
index 104fcc8a357a8ad5f5830376951c70b8ddcf02d6..e9ddc4edf8121863add55508089c0267641c8fd3 100644
--- a/htdocs/langs/hu_HU/other.lang
+++ b/htdocs/langs/hu_HU/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=Biztonsági kód
Calendar=Naptár
-AddTrip=Add utazás
Tools=Eszközök
ToolsDesc=Ez a terület elkötelezett csoportja különféle eszközök nem állnak rendelkezésre más menüpontok. <br><br> Ezek az eszközök lehet elérni a menüből az oldalon.
Birthday=Születésnap
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation
Notify_TASK_CREATE=Task created
Notify_TASK_MODIFY=Task modified
Notify_TASK_DELETE=Task deleted
+SeeModuleSetup=See module setup
NbOfAttachedFiles=Száma csatolt fájlok / dokumentumok
TotalSizeOfAttachedFiles=Teljes méretű csatolt fájlok / dokumentumok
MaxSize=Maximális méret
@@ -80,6 +80,16 @@ ModifiedBy=Módosította %s
ValidatedBy=Érvényesíti %s
CanceledBy=Megszakította %s
ClosedBy=Lezárta %s
+CreatedById=User id who created
+ModifiedById=User id who made last change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made last change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
FileWasRemoved=Fájl %s eltávolították
DirWasRemoved=Directory %s eltávolították
FeatureNotYetAvailableShort=Elérhető a következő verziója
@@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your
##### Calendar common #####
AddCalendarEntry=Add bejegyzés a naptárban %s
-NewCompanyToDolibarr=Cég %s beilleszthető Dolibarr
-ContractValidatedInDolibarr=A szerződés %s hitelesítettek Dolibarr
-ContractCanceledInDolibarr=A szerződés %s törölték Dolibarr
-ContractClosedInDolibarr=%s szerződés lezárva Dolibarr
-PropalClosedSignedInDolibarr=Javaslat: %s aláírt Dolibarr
-PropalClosedRefusedInDolibarr=Javaslat: %s visszautasította Dolibarr
-PropalValidatedInDolibarr=Javaslat: %s érvényesíteni Dolibarr
-InvoiceValidatedInDolibarr=Számla %s érvényesíteni Dolibarr
-InvoicePaidInDolibarr=Számla %s változott fizetett Dolibarr
-InvoiceCanceledInDolibarr=Számla %s törölni Dolibarr
-PaymentDoneInDolibarr=Fizetés %s történt Dolibarr
-CustomerPaymentDoneInDolibarr=Az ügyfél fizetési %s történt Dolibarr
-SupplierPaymentDoneInDolibarr=Szállító fizetési %s történt Dolibarr
-MemberValidatedInDolibarr=Tagja %s érvényesíteni Dolibarr
-MemberResiliatedInDolibarr=Tagja %s resiliated a Dolibarr
-MemberDeletedInDolibarr=Tag %s törölni Dolibarr
-MemberSubscriptionAddedInDolibarr=Előfizetés a tag %s hozzáadott Dolibarr
-ShipmentValidatedInDolibarr=Szállítás %s hitelesítettek Dolibarr
-ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
##### Export #####
Export=Export
ExportsArea=Az export területén
diff --git a/htdocs/langs/hu_HU/paybox.lang b/htdocs/langs/hu_HU/paybox.lang
index 894206d19d57671818aa63dad44f6e7530114d8c..b5449933c37e920d197a11e61b2c5cbec0b03046 100644
--- a/htdocs/langs/hu_HU/paybox.lang
+++ b/htdocs/langs/hu_HU/paybox.lang
@@ -32,6 +32,9 @@ VendorName=Neve eladó
CSSUrlForPaymentForm=CSS stíluslapot url fizetési forma
MessageOK=Üzenet érvényesített fizetési vissza oldal
MessageKO=Üzenet a törölt kifizetési visszatérés oldal
-# NewPayboxPaymentReceived=New Paybox payment received
-# NewPayboxPaymentFailed=New Paybox payment tried but failed
-# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+NewPayboxPaymentReceived=New Paybox payment received
+NewPayboxPaymentFailed=New Paybox payment tried but failed
+PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/hu_HU/resource.lang b/htdocs/langs/hu_HU/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..d64075dfbf595897a63e3eebf19194d8f71030dd
--- /dev/null
+++ b/htdocs/langs/hu_HU/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
diff --git a/htdocs/langs/hu_HU/sendings.lang b/htdocs/langs/hu_HU/sendings.lang
index 78863047b5ea0ae68fed13c52a6a714b6b2c1d3f..dc143062fc827f86b4af76a602d5c3700247d0be 100644
--- a/htdocs/langs/hu_HU/sendings.lang
+++ b/htdocs/langs/hu_HU/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=Ebben a pillanatban, létrejön egy új szállí
RelatedShippings=Related shippings
ShipmentLine=Shipment line
CarrierList=List of transporters
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
# Sending methods
SendingMethodCATCH=Ügyfél fogád
diff --git a/htdocs/langs/hu_HU/stocks.lang b/htdocs/langs/hu_HU/stocks.lang
index 181fd1e9bff5f0991cfe1454fffef24273018e8e..78645940e23325187773fdbbfc68600729ffa93d 100644
--- a/htdocs/langs/hu_HU/stocks.lang
+++ b/htdocs/langs/hu_HU/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Raktár címke név szükséges
CorrectStock=Jelenlegi készlet
ListOfWarehouses=Raktárak listája
ListOfStockMovements=Készlet mozgatások listája
-StocksArea=Készletek területe
+StocksArea=Warehouses area
Location=Hely
LocationSummary=Hely rövid neve
NumberOfDifferentProducts=Number of different products
diff --git a/htdocs/langs/hu_HU/users.lang b/htdocs/langs/hu_HU/users.lang
index 3166ffd0a97ef928bdaff58d0602714e5056ea6b..0a315b86711e6801c03094da10da8bf65242f14f 100644
--- a/htdocs/langs/hu_HU/users.lang
+++ b/htdocs/langs/hu_HU/users.lang
@@ -63,7 +63,6 @@ ShowGroup=Csoport mutatása
ShowUser=Felhasználó mutatása
NonAffectedUsers=Nem érintett felhasználók
UserModified=Felhasználó sikeresen módosítva
-GroupModified=Csoport sikeresen módosítva
PhotoFile=Fénykép
UserWithDolibarrAccess=Felhasználó Dolibarr hozzáféréssel
ListOfUsersInGroup=Csoporthoz tartozó felhasználók listája
@@ -103,7 +102,7 @@ UserDisabled=Felhasználó %s kikapcsolva
UserEnabled=Felhasználó %s aktiválva
UserDeleted=Felhasználó %s eltávolítva
NewGroupCreated=Csoport %s létrehozva
-GroupModified=Csoport sikeresen módosítva
+GroupModified=Group %s modified
GroupDeleted=Csoport %s eltávolítva
ConfirmCreateContact=Biztos szeretne Dolibarr fiókot létrehozni ehhez a kapcsolathoz?
ConfirmCreateLogin=Biztos szeretne Dolibarr fiókot létrehozni ennek a tagnak?
@@ -114,8 +113,10 @@ YourRole=Szerepkörei
YourQuotaOfUsersIsReached=Aktív felhasználói kvóta elérve!
NbOfUsers=Nb felhasználók
DontDowngradeSuperAdmin=Csak egy superadmin lehet downgrade 1 superadmin
-HierarchicalResponsible=Hierarchical responsible
+HierarchicalResponsible=Supervisor
HierarchicView=Hierarchical view
UseTypeFieldToChange=Use field Type to change
OpenIDURL=OpenID URL
LoginUsingOpenID=Use OpenID to login
+WeeklyHours=Weekly hours
+ColorUser=Color of the user
diff --git a/htdocs/langs/hu_HU/withdrawals.lang b/htdocs/langs/hu_HU/withdrawals.lang
index 5d01a243e281772d5672d4d7c58821c08ac546d5..081450169265d4a178814174e26787f4b6eb2f6c 100644
--- a/htdocs/langs/hu_HU/withdrawals.lang
+++ b/htdocs/langs/hu_HU/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=Bizonylat
LastWithdrawalReceipts=%s utolsó visszavonási bizonylatok
WithdrawedBills=Visszavont bizonylatok
WithdrawalsLines=Visszavonási sorok
-RequestStandingOrderToTreat=Kérelem házszabályok kezelésére
-RequestStandingOrderTreated=Request for standing orders treated
+RequestStandingOrderToTreat=Request for standing orders to process
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=Vásárlói házszabályok
CustomerStandingOrder=Vásárlói házszabály
NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
@@ -40,14 +41,13 @@ TransMetod=Átviteli módszer
Send=Küld
Lines=Vonalak
StandingOrderReject=Add ki egy visszautasító
-InvoiceRefused=Számla visszautasította
WithdrawalRefused=Megtagadta visszavonása
WithdrawalRefusedConfirm=Biztosan meg szeretné adni a visszavonás elutasító a társadalom
RefusedData=Elutasításának napjától
RefusedReason=Az elutasítás indoka
RefusedInvoicing=Billing elutasítása
NoInvoiceRefused=Ne töltse az elutasítás
-InvoiceRefused=Számla visszautasította
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=Állapot
StatusUnknown=Ismeretlen
StatusWaiting=Várakozás
@@ -76,7 +76,7 @@ WithBankUsingRIB=A bankszámlák segítségével RIB
WithBankUsingBANBIC=A bankszámlák segítségével IBAN / BIC / SWIFT
BankToReceiveWithdraw=Bankszámla kapni kilép
CreditDate=Hitelt
-WithdrawalFileNotCapable=Nem sikerült létrehozni visszavonása kézhezvétele fájlt az Ön országában
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
ShowWithdraw=Mutasd Kifizetés
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Azonban, ha számlát legalább egy fizetési visszavonása még nem feldolgozott, akkor nem kell beállítani, hogy fizetni kell kezelni visszavonása előtt.
DoStandingOrdersBeforePayments=Ez a lap lehetővé teszi, hogy kérje a fennálló rendelés. Amint kész lesz, akkor írja be a fizetési zárja be a számlát.
diff --git a/htdocs/langs/id_ID/accountancy.lang b/htdocs/langs/id_ID/accountancy.lang
index 8cab9d2b651d75b0721d76fda619e2034e4509b4..c8fa072f8b1a04a03c8da227b610ae6560418f98 100644
--- a/htdocs/langs/id_ID/accountancy.lang
+++ b/htdocs/langs/id_ID/accountancy.lang
@@ -1,53 +1,53 @@
# Dolibarr language file - en_US - Accounting Expert
CHARSET=UTF-8
-Accounting=Accounting
-Globalparameters=Global parameters
-Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
-Menuaccount=Accounting accounts
-Menuthirdpartyaccount=Thirdparty accounts
-MenuTools=Tools
-
-ConfigAccountingExpert=Configuration of the module accounting expert
-Journaux=Journals
-JournalFinancial=Financial journals
-Exports=Exports
-Modelcsv=Model of export
-Selectmodelcsv=Select a model of export
-Modelcsv_normal=Classic export
+Accounting=Akuntansi
+Globalparameters=Parameter Global
+Chartofaccounts=Tabel Akun
+Fiscalyear=Tahun Pajak
+Menuaccount=Akun akuntansi
+Menuthirdpartyaccount=Akun Pihak Ketiga
+MenuTools=Alat
+
+ConfigAccountingExpert=Konfigurasi modul ahli akuntansi
+Journaux=Jurnal
+JournalFinancial=Jurnal Keuangan
+Exports=Ekspor
+Modelcsv=Model Ekspor
+Selectmodelcsv=Pilih satu model Ekspor
+Modelcsv_normal=Ekspor Klasik
Modelcsv_CEGID=Export towards CEGID Expert
-BackToChartofaccounts=Return chart of accounts
-Back=Return
-
-Definechartofaccounts=Define a chart of accounts
-Selectchartofaccounts=Select a chart of accounts
-Validate=Validate
-Addanaccount=Add an accounting account
-AccountAccounting=Accounting account
-Ventilation=Ventilation
+BackToChartofaccounts=Akun pembalik
+Back=Retur
+
+Definechartofaccounts=Jelaskan satu akun
+Selectchartofaccounts=Pilih satu akun
+Validate=Validasi
+Addanaccount=Tambahkan sebuah akun akuntansi
+AccountAccounting=Akun akuntansi
+Ventilation=Breakdown
ToDispatch=To dispatch
Dispatched=Dispatched
-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
-TradeMargin=Trade margin
-Reports=Reports
-ByCustomerInvoice=By invoices customers
-ByMonth=By Month
-NewAccount=New accounting account
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+TradeMargin=Margin Usaha
+Reports=Laporan
+ByCustomerInvoice=Berdasarkan invoice langganan
+ByMonth=Bulanan
+NewAccount=Akun akuntansi baru
Update=Update
-List=List
-Create=Create
-UpdateAccount=Modification of an accounting account
+List=Daftar
+Create=Buat
+UpdateAccount=Modifikasi satu akun akuntansi
UpdateMvts=Modification of a movement
WriteBookKeeping=Record accounts in general ledger
Bookkeeping=General ledger
AccountBalanceByMonth=Account balance by month
-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
Line=Line
CAHTF=Total purchase supplier HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice
IntoAccount=In the accounting account
Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
+VentilationAuto=Automatic breakdown
Processing=Processing
EndProcessing=The end of processing
@@ -68,23 +68,23 @@ NotVentilatedinAccount=Not ventilated in the accounting account
ACCOUNTING_SEPARATORCSV=Separator CSV
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+ACCOUNTING_LENGTH_GACCOUNT=Panjang akun umum
+ACCOUNTING_LENGTH_AACCOUNT=Panjang akun pihak ketiga
-ACCOUNTING_SELL_JOURNAL=Sell journal
-ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
-ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
-ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_SELL_JOURNAL=Jurnal Penjualan
+ACCOUNTING_PURCHASE_JOURNAL=Jurnal Pembayaran
+ACCOUNTING_BANK_JOURNAL=Jurnal Bank
+ACCOUNTING_CASH_JOURNAL=Jurnal Kas
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Jurnal lain-lain
+ACCOUNTING_SOCIAL_JOURNAL=Jurnal Sosial
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Akun transfer
ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait
ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
@@ -92,27 +92,27 @@ ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold produ
ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
-Doctype=Type of document
-Docdate=Date
-Docref=Reference
-Numerocompte=Account
-Code_tiers=Thirdparty
-Labelcompte=Label account
-Debit=Debit
-Credit=Credit
-Amount=Amount
+Doctype=Tipe Dokumen
+Docdate=Tanggal
+Docref=Referensi
+Numerocompte=Akun
+Code_tiers=Pihak ketiga
+Labelcompte=Label Akun
+Debit=Debet
+Credit=Kredit
+Amount=Jumlah
Sens=Sens
-Codejournal=Journal
+Codejournal=Jurnal
DelBookKeeping=Delete the records of the general ledger
-SellsJournal=Sells journal
-PurchasesJournal=Purchases journal
-DescSellsJournal=Sells journal
-DescPurchasesJournal=Purchases journal
-BankJournal=Bank journal
+SellsJournal=Jurnal Penjualan
+PurchasesJournal=Jurnal Pembayaran
+DescSellsJournal=Jurnal Penjualan
+DescPurchasesJournal=Jurnal Pembayaran
+BankJournal=Jurnal Bank
DescBankJournal=Bank journal including all the types of payments other than cash
-CashJournal=Cash journal
+CashJournal=Jurnal Kas
DescCashJournal=Cash journal including the type of payment cash
CashPayment=Cash Payment
@@ -120,7 +120,7 @@ CashPayment=Cash Payment
SupplierInvoicePayment=Payment of invoice supplier
CustomerInvoicePayment=Payment of invoice customer
-ThirdPartyAccount=Thirdparty account
+ThirdPartyAccount=Akun pihak ketiga
NewAccountingMvt=New movement
NumMvts=Number of movement
@@ -138,21 +138,21 @@ Pcgsubtype=Under class of account
Accountparent=Root of the account
Active=Statement
-NewFiscalYear=New fiscal year
+NewFiscalYear=Tahun Pajak Baru
-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
TotalVente=Total turnover HT
-TotalMarge=Total sales margin
+TotalMarge=Total margin penjualan
DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
ChangeAccount=Change the accounting account for lines selected by the account:
Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
-ValidateHistory=Validate Automatically
+ValidateHistory=Validasi Otomatis
ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index 37b7fd37335c9cb1744ff18740bdc4633e91081b..48d4ac06c661ff9f679d004519e035ab75cc2932 100644
--- a/htdocs/langs/id_ID/admin.lang
+++ b/htdocs/langs/id_ID/admin.lang
@@ -437,8 +437,8 @@ Module52Name=Stocks
Module52Desc=Stock management (products)
Module53Name=Services
Module53Desc=Service management
-Module54Name=Contracts
-Module54Desc=Contract and service management
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=Barcodes
Module55Desc=Barcode management
Module56Name=Telephony
@@ -475,8 +475,8 @@ Module320Name=RSS Feed
Module320Desc=Add RSS feed inside Dolibarr screen pages
Module330Name=Bookmarks
Module330Desc=Bookmark management
-Module400Name=Projects
-Module400Desc=Project management inside other modules
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=Webcalendar
Module410Desc=Webcalendar integration
Module500Name=Special expenses (tax, social contributions, dividends)
@@ -484,7 +484,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di
Module510Name=Salaries
Module510Desc=Management of employees salaries and payments
Module600Name=Notifications
-Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Donations
Module700Desc=Donation management
Module1200Name=Mantis
@@ -514,16 +514,16 @@ Module5000Name=Multi-company
Module5000Desc=Allows you to manage multiple companies
Module6000Name=Workflow
Module6000Desc=Workflow management
-Module20000Name=Holidays
-Module20000Desc=Declare and follow employees holidays
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
Module39000Name=Product batch
Module39000Desc=Batch number, eat-by and sell-by date management on products
Module50000Name=PayBox
Module50000Desc=Module to offer an online payment page by credit card with PayBox
Module50100Name=Point of sales
Module50100Desc=Point of sales module
-Module50200Name= Paypal
-Module50200Desc= Module to offer an online payment page by credit card with Paypal
+Module50200Name=Paypal
+Module50200Desc=Module to offer an online payment page by credit card with Paypal
Module50400Name=Accounting (advanced)
Module50400Desc=Accounting management (double parties)
Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=Read standing orders
Permission152=Create/modify a standing orders request
Permission153=Transmission standing orders receipts
Permission154=Credit/refuse standing orders receipts
-Permission161=Read contracts
-Permission162=Create/modify contracts
-Permission163=Activate a service of a contract
-Permission164=Disable a service of a contract
-Permission165=Delete contracts
-Permission171=Read trips
-Permission172=Create/modify trips
-Permission173=Delete trips
-Permission178=Export trips
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Read trips and expenses (own and his subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
Permission180=Read suppliers
Permission181=Read supplier orders
Permission182=Create/modify supplier orders
@@ -671,7 +672,7 @@ Permission300=Read bar codes
Permission301=Create/modify bar codes
Permission302=Delete bar codes
Permission311=Read services
-Permission312=Assign service to contract
+Permission312=Assign service/subscription to contract
Permission331=Read bookmarks
Permission332=Create/modify bookmarks
Permission333=Delete bookmarks
@@ -701,8 +702,8 @@ Permission701=Read donations
Permission702=Create/modify donations
Permission703=Delete donations
Permission1001=Read stocks
-Permission1002=Create/modify stocks
-Permission1003=Delete stocks
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=Read stock movements
Permission1005=Create/modify stock movements
Permission1101=Read delivery orders
@@ -1038,7 +1039,6 @@ YesInSummer=Yes in summer
OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
SuhosinSessionEncrypt=Session storage encrypted by Suhosin
ConditionIsCurrently=Condition is currently %s
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
YouUseBestDriver=You use driver %s that is best driver available currently.
YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by
ModuleCompanyCodePanicum=Return an empty accountancy code.
ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
UseNotifications=Use notifications
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events, to third parties (customers or suppliers) that are configured to. Choice of active notification and targets contacts is made one third party at time.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
ModelModules=Documents templates
DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
WatermarkOnDraft=Watermark on draft document
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=Add delivery date ability
UseOptionLineIfNoQuantity=A line of product/service with a zero amount is considered as an option
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list
ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order
FreeLegalTextOnOrders=Free text on orders
WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
##### Clicktodial #####
ClickToDialSetup=Click To Dial module setup
ClickToDialUrlDesc=Url called when a click on phone picto is done. In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=Intervention numbering models
TemplatePDFInterventions=Intervention card documents models
WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
##### Contracts #####
-ContractsSetup=Contracts module setup
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=Contracts numbering modules
TemplatePDFContracts=Contracts documents models
FreeLegalTextOnContracts=Free text on contracts
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
CacheByServer=Cache by server
CacheByClient=Cache by browser
CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=Products module setup
ServiceSetup=Services module setup
@@ -1382,9 +1384,10 @@ MailingSetup=EMailing module setup
MailingEMailFrom=Sender EMail (From) for emails sent by emailing module
MailingEMailError=Return EMail (Errors-to) for emails with errors
##### Notification #####
-NotificationSetup=Notification bu email module setup
+NotificationSetup=EMail notification module setup
NotificationEMailFrom=Sender EMail (From) for emails sent for notifications
-ListOfAvailableNotifications=List of available notifications (This list depends on activated modules)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
##### Sendings #####
SendingsSetup=Sending module setup
SendingsReceiptModel=Sending receipt model
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe
OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
##### Stock #####
-StockSetup=Configuration module stock
-UserWarehouse=Use user personal stocks
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=Menu deleted
TreeMenu=Tree menus
@@ -1478,11 +1482,14 @@ ClickToDialDesc=This module allows to add an icon after phone numbers. A click o
##### Point Of Sales (CashDesk) #####
CashDesk=Point of sales
CashDeskSetup=Point of sales module setup
-CashDeskThirdPartyForSell=Generic third party to use for sells
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Default account to use to receive cash payments
CashDeskBankAccountForCheque= Default account to use to receive payments by cheque
CashDeskBankAccountForCB= Default account to use to receive payments by credit cards
-CashDeskIdWareHouse=Warehouse to use for sells
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Bookmark module setup
BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Delete fiscal year
ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
Opened=Opened
Closed=Closed
-
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
diff --git a/htdocs/langs/id_ID/agenda.lang b/htdocs/langs/id_ID/agenda.lang
index 1dd21b4c14e2a8d1dbedd9e4472d49a56e1a7250..05e67508b1a4cffd99017e064f5c0d693cef6357 100644
--- a/htdocs/langs/id_ID/agenda.lang
+++ b/htdocs/langs/id_ID/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= Otomatis mengisi
AgendaAutoActionDesc= Tentukan sini peristiwa yang Anda ingin Dolibarr untuk membuat secara otomatis sebuah acara di agenda. Jika tidak dicentang (secara default), hanya tindakan manual akan dimasukkan dalam agenda.
AgendaSetupOtherDesc= Halaman ini menyediakan opsi untuk memungkinkan ekspor peristiwa Dolibarr Anda menjadi kalender eksternal (thunderbird, google calendar, ...)
AgendaExtSitesDesc=Halaman ini memungkinkan untuk menyatakan sumber eksternal dari kalender untuk melihat acara mereka ke dalam agenda Dolibarr.
-ActionsEvents= Acara yang Dolibarr akan membuat tindakan dalam agenda otomatis
-PropalValidatedInDolibarr= Proposal% s divalidasi
-InvoiceValidatedInDolibarr= Invoice %s validated
+ActionsEvents=Acara yang Dolibarr akan membuat tindakan dalam agenda otomatis
+PropalValidatedInDolibarr=Proposal% s divalidasi
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
InvoiceDeleteDolibarr=Invoice %s deleted
OrderValidatedInDolibarr= Order %s validated
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Order %s approved
OrderRefusedInDolibarr=Order %s refused
OrderBackToDraftInDolibarr=Order %s go back to draft status
OrderCanceledInDolibarr=Order %s canceled
-InterventionValidatedInDolibarr=Intervention %s validated
ProposalSentByEMail=Commercial proposal %s sent by EMail
OrderSentByEMail=Customer order %s sent by EMail
InvoiceSentByEMail=Customer invoice %s sent by EMail
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=Supplier order %s sent by EMail
SupplierInvoiceSentByEMail=Supplier invoice %s sent by EMail
ShippingSentByEMail=Shipping %s sent by EMail
ShippingValidated= Shipping %s validated
-InterventionSentByEMail=Intervention %s sent by EMail
-InterventionClassifiedBilled=Intervention %s classified as Billed
NewCompanyToDolibarr= Third party created
DateActionPlannedStart= Planned start date
DateActionPlannedEnd= Planned end date
@@ -70,9 +68,9 @@ DateActionStart= Start date
DateActionEnd= End date
AgendaUrlOptions1=You can also add following parameters to filter output:
AgendaUrlOptions2=<b>login=%s</b> to restrict output to actions created by, assigned to or done by user <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions created by user <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> to restrict output to actions done by user <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
AgendaShowBirthdayEvents=Show birthday's contacts
AgendaHideBirthdayEvents=Hide birthday's contacts
Busy=Busy
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=URL to access .ical file
ExtSiteNoLabel=No Description
WorkingTimeRange=Working time range
WorkingDaysRange=Working days range
-AddEvent=Add event
+AddEvent=Create event
MyAvailability=My availability
diff --git a/htdocs/langs/id_ID/bills.lang b/htdocs/langs/id_ID/bills.lang
index cd66586326bb902b660474b8d6ae6fee3d0cc21a..adf1a89cd637b87ec331d43ad4300a1d0f2bf004 100644
--- a/htdocs/langs/id_ID/bills.lang
+++ b/htdocs/langs/id_ID/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Catatan kredit
InvoiceAvoirAsk=Catatan kredit untuk tagihan yang cocok atau yang sudah benar
InvoiceAvoirDesc=<b>Catatan kredit</b> adalah catatan untuk tagihan negatif yang biasanya digunakan sebagai bukti fakta terhadap tagihan yang jumlah tagihannya berbeda dari jumlah yang seharusnya dibayar (contoh kasus: pelanggan yang pembayarannya lebih karena kesalahan pelanggan, atau tidak akan dibayarkan sejak beberapa produk atau barang dikembalikan).
invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
-invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
ReplaceInvoice=Ganti tagihan %s
ReplacementInvoice=Penggantian tagihan
ReplacedByInvoice=Digantikan dengan tagihan %s
@@ -87,7 +87,7 @@ ClassifyCanceled=Menggolongkan 'Ditinggalkan'
ClassifyClosed=Menggolongkan 'Ditutup'
ClassifyUnBilled=Classify 'Unbilled'
CreateBill=Buat tagihan
-AddBill=Tambah tagihan atau nota kredit
+AddBill=Create invoice or credit note
AddToDraftInvoices=Add to draft invoice
DeleteBill=Hapus tagihan
SearchACustomerInvoice=Cari tagihan pelanggan
@@ -99,7 +99,7 @@ DoPaymentBack=Lakukan pembayaran kembali
ConvertToReduc=Ubah kedalam diskon untuk selanjutnya
EnterPaymentReceivedFromCustomer=Masukkan pembayaran yang diterima dari pelanggan
EnterPaymentDueToCustomer=Buat tempo pembayaran ke pelanggan
-DisabledBecauseRemainderToPayIsZero=Matikan karena pengingat pembayaran bernilai nol.
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
Amount=Jumlah
PriceBase=Harga dasar
BillStatus=Status tagihan
@@ -137,8 +137,6 @@ BillFrom=Dari
BillTo=Kepada
ActionsOnBill=Tindak lanjut tagihan
NewBill=Tagihan baru
-Prélèvements=Pesanan tetap
-Prélèvements=Pesanan tetap
LastBills=Tagihan %s terakhir
LastCustomersBills=Tagihan - tagihan %s terakhir para pelanggan
LastSuppliersBills=Tagihan - tagihan %s terakhir para pemasok / suplier
@@ -156,9 +154,9 @@ ConfirmCancelBill=Anda yakin untuk membatalkan tagihan <b>%s</b> ?
ConfirmCancelBillQuestion=Kenapa Anda ingin memasukan tagihan ini kedalam klasifikasi 'diabaikan' ?
ConfirmClassifyPaidPartially=Anda yakin untuk merubah tagihan <b>%s</b> ke status sudah dibayar ?
ConfirmClassifyPaidPartiallyQuestion=Tagihan ini belum dibayar sepenuhnya. Apa alasan Anda untuk menutup tagihan ini ?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
@@ -191,9 +189,9 @@ AlreadyPaid=Already paid
AlreadyPaidBack=Already paid back
AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposits)
Abandoned=Abandoned
-RemainderToPay=Remainder to pay
-RemainderToTake=Remainder to take
-RemainderToPayBack=Remainder to pay back
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
Rest=Pending
AmountExpected=Amount claimed
ExcessReceived=Excess received
@@ -219,19 +217,18 @@ NoInvoice=No invoice
ClassifyBill=Classify invoice
SupplierBillsToPay=Suppliers invoices to pay
CustomerBillsUnpaid=Unpaid customers invoices
-DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters
-DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=Non-recoverable
SetConditions=Set payment terms
SetMode=Set payment mode
Billed=Billed
-RepeatableInvoice=Pre-defined invoice
-RepeatableInvoices=Pre-defined invoices
-Repeatable=Pre-defined
-Repeatables=Pre-defined
-ChangeIntoRepeatableInvoice=Convert into pre-defined
-CreateRepeatableInvoice=Create pre-defined invoice
-CreateFromRepeatableInvoice=Create from pre-defined invoice
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines
CustomersInvoicesAndPayments=Customer invoices and payments
ExportDataset_invoice_1=Customer invoices list and invoice's lines
diff --git a/htdocs/langs/id_ID/categories.lang b/htdocs/langs/id_ID/categories.lang
index ed61bfc08a61b4e5bfdadecfe7f6a15298afc6e3..22914931db137a565a45daad16b9b04fbd08465b 100644
--- a/htdocs/langs/id_ID/categories.lang
+++ b/htdocs/langs/id_ID/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories
CatCusLinks=Links between customers/prospects and categories
CatProdLinks=Links between products/services and categories
CatMemberLinks=Links between members and categories
-CatProdLinks=Links between products/services and categories
-CatCusLinks=Links between customers/prospects and categories
-CatSupLinks=Links between suppliers and categories
DeleteFromCat=Remove from category
DeletePicture=Picture delete
ConfirmDeletePicture=Confirm picture deletion?
@@ -112,3 +109,4 @@ CategoriesSetup=Categories setup
CategorieRecursiv=Link with parent category automatically
CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category
diff --git a/htdocs/langs/id_ID/compta.lang b/htdocs/langs/id_ID/compta.lang
index 3929cfde0367b6f5d8dc7945385de4877d9e4759..9fe5eff520d881c617f38aa7d9db675ec18f118a 100644
--- a/htdocs/langs/id_ID/compta.lang
+++ b/htdocs/langs/id_ID/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s
SuppliersProductsSellSalesTurnover=The generated turnover by the sales of supplier's products.
CheckReceipt=Check deposit
CheckReceiptShort=Check deposit
+LastCheckReceiptShort=Last %s check receipts
NewCheckReceipt=New discount
NewCheckDeposit=New check deposit
NewCheckDepositOn=Create receipt for deposit on account: %s
diff --git a/htdocs/langs/id_ID/contracts.lang b/htdocs/langs/id_ID/contracts.lang
index e5ad112b222db93bedf8e6ded250a39d062215c6..511516dc755e4f3aba2d67e91238426896629cbd 100644
--- a/htdocs/langs/id_ID/contracts.lang
+++ b/htdocs/langs/id_ID/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Contracts area
ListOfContracts=List of contracts
-LastContracts=Last %s modified contracts
+LastModifiedContracts=Last %s modified contracts
AllContracts=All contracts
ContractCard=Contract card
ContractStatus=Contract status
@@ -27,7 +27,7 @@ MenuRunningServices=Running services
MenuExpiredServices=Expired services
MenuClosedServices=Closed services
NewContract=New contract
-AddContract=Add contract
+AddContract=Create contract
SearchAContract=Search a contract
DeleteAContract=Delete a contract
CloseAContract=Close a contract
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines
ListOfRunningServices=List of running services
NotActivatedServices=Inactive services (among validated contracts)
BoardNotActivatedServices=Services to activate among validated contracts
-LastContracts=Last %s modified contracts
+LastContracts=Last % contracts
LastActivatedServices=Last %s activated services
LastModifiedServices=Last %s modified services
EditServiceLine=Edit service line
diff --git a/htdocs/langs/id_ID/cron.lang b/htdocs/langs/id_ID/cron.lang
index 1be23d72ca326eec0911d33ce575292516014918..195ad43c87c41ae0938fa27745ba14209fbac724 100644
--- a/htdocs/langs/id_ID/cron.lang
+++ b/htdocs/langs/id_ID/cron.lang
@@ -1,114 +1,86 @@
# Dolibarr language file - Source file is en_US - cron
-#
# About page
-#
-# About = About
-# CronAbout = About Cron
-# CronAboutPage = Cron about page
-
-#
+About = About
+CronAbout = About Cron
+CronAboutPage = Cron about page
# Right
-#
-# Permission23101 = Read Scheduled task
-# Permission23102 = Create/update Scheduled task
-# Permission23103 = Delete Scheduled task
-# Permission23104 = Execute Scheduled task
-
-#
+Permission23101 = Read Scheduled task
+Permission23102 = Create/update Scheduled task
+Permission23103 = Delete Scheduled task
+Permission23104 = Execute Scheduled task
# Admin
-#
-# CronSetup= Scheduled job management setup
-# URLToLaunchCronJobs=URL to check and launch cron jobs if required
-# OrToLaunchASpecificJob=Or to check and launch a specific job
-# KeyForCronAccess=Security key for URL to launch cron jobs
-# FileToLaunchCronJobs=Command line to launch cron jobs
-# CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes
-# CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
-
-
-#
+CronSetup= Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch cron jobs if required
+OrToLaunchASpecificJob=Or to check and launch a specific job
+KeyForCronAccess=Security key for URL to launch cron jobs
+FileToLaunchCronJobs=Command line to launch cron jobs
+CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
# Menu
-#
-# CronJobs=Scheduled jobs
-# CronListActive= List of active jobs
-# CronListInactive= List of disabled jobs
-# CronListActive= List of active jobs
-
-
-#
+CronJobs=Scheduled jobs
+CronListActive=List of active/scheduled jobs
+CronListInactive=List of disabled jobs
# Page list
-#
-# CronDateLastRun=Last run
-# CronLastOutput=Last run output
-# CronLastResult=Last result code
-# CronListOfCronJobs=List of scheduled jobs
-# CronCommand=Command
-# CronList=Jobs list
-# CronDelete= Delete cron jobs
-# CronConfirmDelete= Are you sure you want to delete this cron job ?
-# CronExecute=Launch job
-# CronConfirmExecute= Are you sure to execute this job now
-# CronInfo= Jobs allow to execute task that have been planned
-# CronWaitingJobs=Wainting jobs
-# CronTask=Job
-# CronNone= None
-# CronDtStart=Start date
-# CronDtEnd=End date
-# CronDtNextLaunch=Next execution
-# CronDtLastLaunch=Last execution
-# CronFrequency=Frequancy
-# CronClass=Classe
-# CronMethod=Method
-# CronModule=Module
-# CronAction=Action
-# CronStatus=Status
-# CronStatusActive=Enabled
-# CronStatusInactive=Disabled
-# CronNoJobs=No jobs registered
-# CronPriority=Priority
-# CronLabel=Description
-# CronNbRun=Nb. launch
-# CronEach=Every
-# JobFinished=Job launched and finished
-
-#
+CronDateLastRun=Last run
+CronLastOutput=Last run output
+CronLastResult=Last result code
+CronListOfCronJobs=List of scheduled jobs
+CronCommand=Command
+CronList=Jobs list
+CronDelete= Delete cron jobs
+CronConfirmDelete= Are you sure you want to delete this cron job ?
+CronExecute=Launch job
+CronConfirmExecute= Are you sure to execute this job now
+CronInfo= Jobs allow to execute task that have been planned
+CronWaitingJobs=Wainting jobs
+CronTask=Job
+CronNone= None
+CronDtStart=Start date
+CronDtEnd=End date
+CronDtNextLaunch=Next execution
+CronDtLastLaunch=Last execution
+CronFrequency=Frequancy
+CronClass=Classe
+CronMethod=Method
+CronModule=Module
+CronAction=Action
+CronStatus=Status
+CronStatusActive=Enabled
+CronStatusInactive=Disabled
+CronNoJobs=No jobs registered
+CronPriority=Priority
+CronLabel=Description
+CronNbRun=Nb. launch
+CronEach=Every
+JobFinished=Job launched and finished
#Page card
-#
-# CronAdd= Add jobs
-# CronHourStart= Start Hour and date of task
-# CronEvery= And execute task each
-# CronObject= Instance/Object to create
-# CronArgs=Parameters
-# CronSaveSucess=Save succesfully
-# CronNote=Comment
-# CronFieldMandatory=Fields %s is mandatory
-# CronErrEndDateStartDt=End date cannot be before start date
-# CronStatusActiveBtn=Enable
-# CronStatusInactiveBtn=Disable
-# CronTaskInactive=This job is disabled
-# CronDtLastResult=Last result date
-# CronId=Id
-# CronClassFile=Classes (filename.class.php)
-# CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-# CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-# CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-# CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is <i>fecth</i>
-# CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-# CronCommandHelp=The system command line to execute.
-
-#
+CronAdd= Add jobs
+CronHourStart= Start Hour and date of task
+CronEvery= And execute task each
+CronObject= Instance/Object to create
+CronArgs=Parameters
+CronSaveSucess=Save succesfully
+CronNote=Comment
+CronFieldMandatory=Fields %s is mandatory
+CronErrEndDateStartDt=End date cannot be before start date
+CronStatusActiveBtn=Enable
+CronStatusInactiveBtn=Disable
+CronTaskInactive=This job is disabled
+CronDtLastResult=Last result date
+CronId=Id
+CronClassFile=Classes (filename.class.php)
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
+CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronCommandHelp=The system command line to execute.
# Info
-#
-# CronInfoPage=Information
-
-
-#
+CronInfoPage=Information
# Common
-#
-# CronType=Task type
-# CronType_method=Call method of a Dolibarr Class
-# CronType_command=Shell command
-# CronMenu=Cron
-# CronCannotLoadClass=Cannot load class %s or object %s
-
-# UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+CronType=Task type
+CronType_method=Call method of a Dolibarr Class
+CronType_command=Shell command
+CronMenu=Cron
+CronCannotLoadClass=Cannot load class %s or object %s
+UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
diff --git a/htdocs/langs/id_ID/donations.lang b/htdocs/langs/id_ID/donations.lang
index 66ddea95a5c694d8044c40b7da05319d0b77a530..f7aed91cf81caf0e83e390519642ea1f199670c6 100644
--- a/htdocs/langs/id_ID/donations.lang
+++ b/htdocs/langs/id_ID/donations.lang
@@ -4,7 +4,7 @@ Donations=Donations
DonationRef=Donation ref.
Donor=Donor
Donors=Donors
-AddDonation=Add a donation
+AddDonation=Create a donation
NewDonation=New donation
ShowDonation=Show donation
DonationPromise=Gift promise
@@ -31,3 +31,8 @@ DonationRecipient=Donation recipient
ThankYou=Thank You
IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
MinimumAmount=Minimum amount is %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/id_ID/externalsite.lang b/htdocs/langs/id_ID/externalsite.lang
index b915c37a5ab8fe3beb5335f7f4ec501a12749c15..da4853df0df086e3040a294cec116c590f4c2e9e 100644
--- a/htdocs/langs/id_ID/externalsite.lang
+++ b/htdocs/langs/id_ID/externalsite.lang
@@ -1,4 +1,5 @@
# Dolibarr language file - Source file is en_US - externalsite
-# ExternalSiteSetup=Setup link to external website
-# ExternalSiteURL=External Site URL
-# ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExternalSiteSetup=Setup link to external website
+ExternalSiteURL=External Site URL
+ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/id_ID/holiday.lang b/htdocs/langs/id_ID/holiday.lang
index c25abf6449ca2cc97d5dba6340d1530b5ea9c675..f5b87fefb0878c40cc75768a1d1c4bcf4cb80c72 100644
--- a/htdocs/langs/id_ID/holiday.lang
+++ b/htdocs/langs/id_ID/holiday.lang
@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
CantCreateCP=You don't have the right to make leave requests.
InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=Update
CantUpdate=You cannot update this leave request.
NoDateDebut=You must select a start date.
NoDateFin=You must select an end date.
-ErrorDureeCP=Your request for holidays does not contain working day.
-TitleValidCP=Approve the request holidays
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
ConfirmValidCP=Are you sure you want to approve the leave request?
DateValidCP=Date approved
TitleToValidCP=Send leave request
ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the request holidays
+TitleRefuseCP=Refuse the leave request
ConfirmRefuseCP=Are you sure you want to refuse the leave request?
NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
+TitleCancelCP=Cancel the leave request
ConfirmCancelCP=Are you sure you want to cancel the leave request?
DetailRefusCP=Reason for refusal
DateRefusCP=Date of refusal
@@ -78,7 +77,7 @@ ActionByCP=Performed by
UserUpdateCP=For the user
PrevSoldeCP=Previous Balance
NewSoldeCP=New Balance
-alreadyCPexist=A request for holidays has already been done on this period.
+alreadyCPexist=A leave request has already been done on this period.
UserName=Name
Employee=Employee
FirstDayOfHoliday=First day of vacation
@@ -88,25 +87,25 @@ ManualUpdate=Manual update
HolidaysCancelation=Leave request cancelation
## Configuration du Module ##
-ConfCP=Configuration of holidays module
+ConfCP=Configuration of leave request module
DescOptionCP=Description of the option
ValueOptionCP=Value
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
UpdateConfCPOK=Updated successfully.
ErrorUpdateConfCP=An error occurred during the update, please try again.
-AddCPforUsers=Please add the balance of holidays of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
Module27130Name= Management of leave requests
Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
TitleOptionEventCP=Settings of leave requets for events
ValidEventCP=Validate
UpdateEventCP=Update events
diff --git a/htdocs/langs/id_ID/interventions.lang b/htdocs/langs/id_ID/interventions.lang
index 17641a0ab3e499b2f66a4b4ddd80c46d478ff702..c79da05364e615bb2b234ce4211a373fc94e9168 100644
--- a/htdocs/langs/id_ID/interventions.lang
+++ b/htdocs/langs/id_ID/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Intervention
Interventions=Interventions
InterventionCard=Intervention card
NewIntervention=New intervention
-AddIntervention=Add intervention
+AddIntervention=Create intervention
ListOfInterventions=List of interventions
EditIntervention=Edit intervention
ActionsOnFicheInter=Actions on intervention
@@ -30,6 +30,15 @@ StatusInterInvoiced=Billed
RelatedInterventions=Related interventions
ShowIntervention=Show intervention
SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention
TypeContact_fichinter_internal_INTERVENING=Intervening
diff --git a/htdocs/langs/id_ID/mails.lang b/htdocs/langs/id_ID/mails.lang
index 98e6dc335eeced95e230de5b5ca5b8f78fc59681..7a2111988228ab02739bad001958aa455eb9013c 100644
--- a/htdocs/langs/id_ID/mails.lang
+++ b/htdocs/langs/id_ID/mails.lang
@@ -115,7 +115,7 @@ SentBy=Sent by
MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=Clear list
ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
ToAddRecipientsChooseHere=Add recipients by choosing from the lists
@@ -133,6 +133,9 @@ Notifications=Notifications
NoNotificationsWillBeSent=No email notifications are planned for this event and company
ANotificationsWillBeSent=1 notification will be sent by email
SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification request
-ListOfActiveNotifications=List all active email notification requests
+AddNewNotification=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
ListOfNotificationsDone=List all email notifications sent
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/id_ID/main.lang b/htdocs/langs/id_ID/main.lang
index 82e609d8ae6397a9ca540002a546d575680e081e..0c3a3ca751c3a68fe11f5b4a6bf868946fb1eed6 100644
--- a/htdocs/langs/id_ID/main.lang
+++ b/htdocs/langs/id_ID/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr
ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'.
ErrorFailedToSaveFile=Error, failed to save file.
-ErrorOnlyPngJpgSupported=Error, only .png and .jpg image format file are supported.
-ErrorImageFormatNotSupported=Your PHP does not support functions to convert images of this format.
SetDate=Set date
SelectDate=Select a date
SeeAlso=See also %s
BackgroundColorByDefault=Default background color
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
NbOfEntries=Nb of entries
GoToWikiHelpPage=Read online help (need Internet access)
@@ -266,6 +266,7 @@ Afternoon=Afternoon
Quadri=Quadri
MonthOfDay=Month of the day
HourShort=H
+MinuteShort=mn
Rate=Rate
UseLocalTax=Include tax
Bytes=Bytes
@@ -340,6 +341,7 @@ FullList=Full list
Statistics=Statistics
OtherStatistics=Other statistics
Status=Status
+Favorite=Favorite
ShortInfo=Info.
Ref=Ref.
RefSupplier=Ref. supplier
@@ -365,6 +367,7 @@ ActionsOnCompany=Events about this third party
ActionsOnMember=Events about this member
NActions=%s events
NActionsLate=%s late
+RequestAlreadyDone=Request already recorded
Filter=Filter
RemoveFilter=Remove filter
ChartGenerated=Chart generated
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Extra attributes setup
URLPhoto=URL of photo/logo
SetLinkToThirdParty=Link to another third party
CreateDraft=Create draft
+SetToDraft=Back to draft
ClickToEdit=Click to edit
ObjectDeleted=Object %s deleted
ByCountry=By country
@@ -678,7 +682,7 @@ ViewPrivateNote=View notes
XMoreLines=%s line(s) hidden
PublicUrl=Public URL
AddBox=Add box
-
+SelectElementAndClickRefresh=Select an element and click Refresh
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/langs/id_ID/margins.lang b/htdocs/langs/id_ID/margins.lang
index e8d5fed1af9a379298973a5c33a511cf77ea3706..606d5e5053a25855631a7d6ee61b6c392c1fe32c 100644
--- a/htdocs/langs/id_ID/margins.lang
+++ b/htdocs/langs/id_ID/margins.lang
@@ -10,24 +10,18 @@ MarkRate=Mark rate
DisplayMarginRates=Display margin rates
DisplayMarkRates=Display mark rates
InputPrice=Input price
-
margin=Profit margins management
margesSetup=Profit margins management setup
-
MarginDetails=Margin details
-
ProductMargins=Product margins
CustomerMargins=Customer margins
SalesRepresentativeMargins=Sales representative margins
-
ProductService=Product or Service
AllProducts=All products and services
ChooseProduct/Service=Choose product or service
-
StartDate=Start date
EndDate=End date
Launch=Start
-
ForceBuyingPriceIfNull=Force buying price if null
ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0)
MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
@@ -35,16 +29,16 @@ UseDiscountAsProduct=As a product
UseDiscountAsService=As a service
UseDiscountOnTotal=On subtotal
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
-
MARGIN_TYPE=Margin type
MargeBrute=Raw margin
MargeNette=Net margin
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - Cost price
-
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
Charges=Charges
-
AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/id_ID/orders.lang b/htdocs/langs/id_ID/orders.lang
index 42444f0ec1c52173f7e7c94b58792d7b03f11de4..6ee9c19fa95f45044b7466cc0fdcbf21819ef13a 100644
--- a/htdocs/langs/id_ID/orders.lang
+++ b/htdocs/langs/id_ID/orders.lang
@@ -1,168 +1,162 @@
# Dolibarr language file - Source file is en_US - orders
-# OrdersArea=Customers orders area
-# SuppliersOrdersArea=Suppliers orders area
-# OrderCard=Order card
-# OrderId=Order Id
-# Order=Order
-# Orders=Orders
-# OrderLine=Order line
-# OrderFollow=Follow up
-# OrderDate=Order date
-# OrderToProcess=Order to process
-# NewOrder=New order
-# ToOrder=Make order
-# MakeOrder=Make order
-# SupplierOrder=Supplier order
-# SuppliersOrders=Suppliers orders
-# SuppliersOrdersRunning=Current suppliers orders
-# CustomerOrder=Customer order
-# CustomersOrders=Customer's orders
-# CustomersOrdersRunning=Current customer's orders
-# CustomersOrdersAndOrdersLines=Customer orders and order's lines
-# OrdersToValid=Customer's orders to validate
-# OrdersToBill=Customer's orders delivered
-# OrdersInProcess=Customer's orders in process
-# OrdersToProcess=Customer's orders to process
-# SuppliersOrdersToProcess=Supplier's orders to process
-# StatusOrderCanceledShort=Canceled
-# StatusOrderDraftShort=Draft
-# StatusOrderValidatedShort=Validated
-# StatusOrderSentShort=In process
-# StatusOrderSent=Shipment in process
-# StatusOrderOnProcessShort=Reception
-# StatusOrderProcessedShort=Processed
-# StatusOrderToBillShort=Delivered
-# StatusOrderToBill2Short=To bill
-# StatusOrderApprovedShort=Approved
-# StatusOrderRefusedShort=Refused
-# StatusOrderToProcessShort=To process
-# StatusOrderReceivedPartiallyShort=Partially received
-# StatusOrderReceivedAllShort=Everything received
-# StatusOrderCanceled=Canceled
-# StatusOrderDraft=Draft (needs to be validated)
-# StatusOrderValidated=Validated
-# StatusOrderOnProcess=Waiting to receive
-# StatusOrderProcessed=Processed
-# StatusOrderToBill=Delivered
-# StatusOrderToBill2=To bill
-# StatusOrderApproved=Approved
-# StatusOrderRefused=Refused
-# StatusOrderReceivedPartially=Partially received
-# StatusOrderReceivedAll=Everything received
-# ShippingExist=A shipment exists
-# DraftOrWaitingApproved=Draft or approved not yet ordered
-# DraftOrWaitingShipped=Draft or validated not yet shipped
-# MenuOrdersToBill=Orders delivered
-# MenuOrdersToBill2=Orders to bill
-# SearchOrder=Search order
-# SearchACustomerOrder=Search a customer order
-# ShipProduct=Ship product
-# Discount=Discount
-# CreateOrder=Create Order
-# RefuseOrder=Refuse order
-# ApproveOrder=Accept order
-# ValidateOrder=Validate order
-# UnvalidateOrder=Unvalidate order
-# DeleteOrder=Delete order
-# CancelOrder=Cancel order
-# AddOrder=Add order
-# AddToMyOrders=Add to my orders
-# AddToOtherOrders=Add to other orders
-# AddToDraftOrders=Add to draft order
-# ShowOrder=Show order
-# NoOpenedOrders=No opened orders
-# NoOtherOpenedOrders=No other opened orders
-# NoDraftOrders=No draft orders
-# OtherOrders=Other orders
-# LastOrders=Last %s orders
-# LastModifiedOrders=Last %s modified orders
-# LastClosedOrders=Last %s closed orders
-# AllOrders=All orders
-# NbOfOrders=Number of orders
-# OrdersStatistics=Order's statistics
-# OrdersStatisticsSuppliers=Supplier order's statistics
-# NumberOfOrdersByMonth=Number of orders by month
-# AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
-# ListOfOrders=List of orders
-# CloseOrder=Close order
-# ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed.
-# ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done.
-# ConfirmDeleteOrder=Are you sure you want to delete this order ?
-# ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b> ?
-# ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> to draft status ?
-# ConfirmCancelOrder=Are you sure you want to cancel this order ?
-# ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b> ?
-# GenerateBill=Generate invoice
-# ClassifyShipped=Classify delivered
-# ClassifyBilled=Classify billed
-# ComptaCard=Accountancy card
-# DraftOrders=Draft orders
-# RelatedOrders=Related orders
-# OnProcessOrders=In process orders
-# RefOrder=Ref. order
-# RefCustomerOrder=Ref. customer order
-# CustomerOrder=Customer order
-# RefCustomerOrderShort=Ref. cust. order
-# SendOrderByMail=Send order by mail
-# ActionsOnOrder=Events on order
-# NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
-# OrderMode=Order method
-# AuthorRequest=Request author
-# UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address
-# RunningOrders=Orders on process
-# UserWithApproveOrderGrant=Users granted with "approve orders" permission.
-# PaymentOrderRef=Payment of order %s
-# CloneOrder=Clone order
-# ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b> ?
-# DispatchSupplierOrder=Receiving supplier order %s
+OrdersArea=Customers orders area
+SuppliersOrdersArea=Suppliers orders area
+OrderCard=Order card
+OrderId=Order Id
+Order=Order
+Orders=Orders
+OrderLine=Order line
+OrderFollow=Follow up
+OrderDate=Order date
+OrderToProcess=Order to process
+NewOrder=New order
+ToOrder=Make order
+MakeOrder=Make order
+SupplierOrder=Supplier order
+SuppliersOrders=Suppliers orders
+SuppliersOrdersRunning=Current suppliers orders
+CustomerOrder=Customer order
+CustomersOrders=Customer's orders
+CustomersOrdersRunning=Current customer's orders
+CustomersOrdersAndOrdersLines=Customer orders and order's lines
+OrdersToValid=Customer's orders to validate
+OrdersToBill=Customer's orders delivered
+OrdersInProcess=Customer's orders in process
+OrdersToProcess=Customer's orders to process
+SuppliersOrdersToProcess=Supplier's orders to process
+StatusOrderCanceledShort=Canceled
+StatusOrderDraftShort=Draft
+StatusOrderValidatedShort=Validated
+StatusOrderSentShort=In process
+StatusOrderSent=Shipment in process
+StatusOrderOnProcessShort=Reception
+StatusOrderProcessedShort=Processed
+StatusOrderToBillShort=Delivered
+StatusOrderToBill2Short=To bill
+StatusOrderApprovedShort=Approved
+StatusOrderRefusedShort=Refused
+StatusOrderToProcessShort=To process
+StatusOrderReceivedPartiallyShort=Partially received
+StatusOrderReceivedAllShort=Everything received
+StatusOrderCanceled=Canceled
+StatusOrderDraft=Draft (needs to be validated)
+StatusOrderValidated=Validated
+StatusOrderOnProcess=Waiting to receive
+StatusOrderProcessed=Processed
+StatusOrderToBill=Delivered
+StatusOrderToBill2=To bill
+StatusOrderApproved=Approved
+StatusOrderRefused=Refused
+StatusOrderReceivedPartially=Partially received
+StatusOrderReceivedAll=Everything received
+ShippingExist=A shipment exists
+DraftOrWaitingApproved=Draft or approved not yet ordered
+DraftOrWaitingShipped=Draft or validated not yet shipped
+MenuOrdersToBill=Orders delivered
+MenuOrdersToBill2=Billable orders
+SearchOrder=Search order
+SearchACustomerOrder=Search a customer order
+ShipProduct=Ship product
+Discount=Discount
+CreateOrder=Create Order
+RefuseOrder=Refuse order
+ApproveOrder=Accept order
+ValidateOrder=Validate order
+UnvalidateOrder=Unvalidate order
+DeleteOrder=Delete order
+CancelOrder=Cancel order
+AddOrder=Create order
+AddToMyOrders=Add to my orders
+AddToOtherOrders=Add to other orders
+AddToDraftOrders=Add to draft order
+ShowOrder=Show order
+NoOpenedOrders=No opened orders
+NoOtherOpenedOrders=No other opened orders
+NoDraftOrders=No draft orders
+OtherOrders=Other orders
+LastOrders=Last %s orders
+LastModifiedOrders=Last %s modified orders
+LastClosedOrders=Last %s closed orders
+AllOrders=All orders
+NbOfOrders=Number of orders
+OrdersStatistics=Order's statistics
+OrdersStatisticsSuppliers=Supplier order's statistics
+NumberOfOrdersByMonth=Number of orders by month
+AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
+ListOfOrders=List of orders
+CloseOrder=Close order
+ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed.
+ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done.
+ConfirmDeleteOrder=Are you sure you want to delete this order ?
+ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b> ?
+ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> to draft status ?
+ConfirmCancelOrder=Are you sure you want to cancel this order ?
+ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b> ?
+GenerateBill=Generate invoice
+ClassifyShipped=Classify delivered
+ClassifyBilled=Classify billed
+ComptaCard=Accountancy card
+DraftOrders=Draft orders
+RelatedOrders=Related orders
+OnProcessOrders=In process orders
+RefOrder=Ref. order
+RefCustomerOrder=Ref. customer order
+RefCustomerOrderShort=Ref. cust. order
+SendOrderByMail=Send order by mail
+ActionsOnOrder=Events on order
+NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
+OrderMode=Order method
+AuthorRequest=Request author
+UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address
+RunningOrders=Orders on process
+UserWithApproveOrderGrant=Users granted with "approve orders" permission.
+PaymentOrderRef=Payment of order %s
+CloneOrder=Clone order
+ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b> ?
+DispatchSupplierOrder=Receiving supplier order %s
##### Types de contacts #####
-# TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
-# TypeContact_commande_internal_SHIPPING=Representative following-up shipping
-# TypeContact_commande_external_BILLING=Customer invoice contact
-# TypeContact_commande_external_SHIPPING=Customer shipping contact
-# TypeContact_commande_external_CUSTOMER=Customer contact following-up order
-# TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order
-# TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
-# TypeContact_order_supplier_external_BILLING=Supplier invoice contact
-# TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact
-# TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order
-
-# Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
-# Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
-# Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s'
-# Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s'
-# Error_OrderNotChecked=No orders to invoice selected
-
+TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
+TypeContact_commande_internal_SHIPPING=Representative following-up shipping
+TypeContact_commande_external_BILLING=Customer invoice contact
+TypeContact_commande_external_SHIPPING=Customer shipping contact
+TypeContact_commande_external_CUSTOMER=Customer contact following-up order
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order
+TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
+TypeContact_order_supplier_external_BILLING=Supplier invoice contact
+TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order
+Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
+Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
+Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s'
+Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s'
+Error_OrderNotChecked=No orders to invoice selected
# Sources
-# OrderSource0=Commercial proposal
-# OrderSource1=Internet
-# OrderSource2=Mail campaign
-# OrderSource3=Phone compaign
-# OrderSource4=Fax campaign
-# OrderSource5=Commercial
-# OrderSource6=Store
-# QtyOrdered=Qty ordered
-# AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order
-
+OrderSource0=Commercial proposal
+OrderSource1=Internet
+OrderSource2=Mail campaign
+OrderSource3=Phone compaign
+OrderSource4=Fax campaign
+OrderSource5=Commercial
+OrderSource6=Store
+QtyOrdered=Qty ordered
+AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order
# Documents models
-# PDFEinsteinDescription=A complete order model (logo...)
-# PDFEdisonDescription=A simple order model
-# PDFProformaDescription=A complete proforma invoice (logo…)
+PDFEinsteinDescription=A complete order model (logo...)
+PDFEdisonDescription=A simple order model
+PDFProformaDescription=A complete proforma invoice (logo…)
# Orders modes
-# OrderByMail=Mail
-# OrderByFax=Fax
-# OrderByEMail=EMail
-# OrderByWWW=Online
-# OrderByPhone=Phone
-
-# CreateInvoiceForThisCustomer=Bill orders
-# NoOrdersToInvoice=No orders billable
-# CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-# MenuOrdersToBill2=Orders to bill
-# OrderCreation=Order creation
-# Ordered=Ordered
-# OrderCreated=Your orders have been created
-# OrderFail=An error happened during your orders creation
-# CreateOrders=Create orders
-# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+OrderByMail=Mail
+OrderByFax=Fax
+OrderByEMail=EMail
+OrderByWWW=Online
+OrderByPhone=Phone
+CreateInvoiceForThisCustomer=Bill orders
+NoOrdersToInvoice=No orders billable
+CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
+OrderCreation=Order creation
+Ordered=Ordered
+OrderCreated=Your orders have been created
+OrderFail=An error happened during your orders creation
+CreateOrders=Create orders
+ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
diff --git a/htdocs/langs/id_ID/oscommerce.lang b/htdocs/langs/id_ID/oscommerce.lang
deleted file mode 100644
index 42a4a4551b6d42c92c114d1593dbc0f4f53ae4b3..0000000000000000000000000000000000000000
--- a/htdocs/langs/id_ID/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-# OSCommerce=OS Commerce
-# OSCommerceSetup=OS Commerce module setup
-# OSCommerceSetupSaved=OS Commerce setup saved
-# OSCommerceServer=OS Commerce server host/ip
-# OSCommerceDatabaseName=OS Commerce database name
-# OSCommercePrefix=OS Commerce tables prefix
-# OSCommerceUser=OS Commerce database login
diff --git a/htdocs/langs/id_ID/other.lang b/htdocs/langs/id_ID/other.lang
index 27bfb7041d010bfefed39d7328e746b5fc62b112..25d3aa806d032b3552d3f757216dfc5f71c7adc4 100644
--- a/htdocs/langs/id_ID/other.lang
+++ b/htdocs/langs/id_ID/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=Security code
Calendar=Calendar
-AddTrip=Add trip
Tools=Tools
ToolsDesc=This area is dedicated to group miscellaneous tools not available into other menu entries.<br><br>Those tools can be reached from menu on the side.
Birthday=Birthday
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation
Notify_TASK_CREATE=Task created
Notify_TASK_MODIFY=Task modified
Notify_TASK_DELETE=Task deleted
+SeeModuleSetup=See module setup
NbOfAttachedFiles=Number of attached files/documents
TotalSizeOfAttachedFiles=Total size of attached files/documents
MaxSize=Maximum size
@@ -80,6 +80,16 @@ ModifiedBy=Modified by %s
ValidatedBy=Validated by %s
CanceledBy=Canceled by %s
ClosedBy=Closed by %s
+CreatedById=User id who created
+ModifiedById=User id who made last change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made last change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
FileWasRemoved=File %s was removed
DirWasRemoved=Directory %s was removed
FeatureNotYetAvailableShort=Available in a next version
@@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your
##### Calendar common #####
AddCalendarEntry=Add entry in calendar %s
-NewCompanyToDolibarr=Company %s added into Dolibarr
-ContractValidatedInDolibarr=Contract %s validated in Dolibarr
-ContractCanceledInDolibarr=Contract %s canceled in Dolibarr
-ContractClosedInDolibarr=Contract %s closed in Dolibarr
-PropalClosedSignedInDolibarr=Proposal %s signed in Dolibarr
-PropalClosedRefusedInDolibarr=Proposal %s refused in Dolibarr
-PropalValidatedInDolibarr=Proposal %s validated in Dolibarr
-InvoiceValidatedInDolibarr=Invoice %s validated in Dolibarr
-InvoicePaidInDolibarr=Invoice %s changed to paid in Dolibarr
-InvoiceCanceledInDolibarr=Invoice %s canceled in Dolibarr
-PaymentDoneInDolibarr=Payment %s done in Dolibarr
-CustomerPaymentDoneInDolibarr=Customer payment %s done in Dolibarr
-SupplierPaymentDoneInDolibarr=Supplier payment %s done in Dolibarr
-MemberValidatedInDolibarr=Member %s validated in Dolibarr
-MemberResiliatedInDolibarr=Member %s resiliated in Dolibarr
-MemberDeletedInDolibarr=Member %s deleted from Dolibarr
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added in Dolibarr
-ShipmentValidatedInDolibarr=Shipment %s validated in Dolibarr
-ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
##### Export #####
Export=Export
ExportsArea=Exports area
diff --git a/htdocs/langs/id_ID/paybox.lang b/htdocs/langs/id_ID/paybox.lang
index b689bb6cebff21b067564cffd144aa4a6aaa2e98..aced32a49440a9ff7a1b1e0279522ff49cec7821 100644
--- a/htdocs/langs/id_ID/paybox.lang
+++ b/htdocs/langs/id_ID/paybox.lang
@@ -1,37 +1,40 @@
# Dolibarr language file - Source file is en_US - paybox
-# PayBoxSetup=PayBox module setup
-# PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
-# FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
-# PaymentForm=Payment form
-# WelcomeOnPaymentPage=Welcome on our online payment service
-# ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
-# ThisIsInformationOnPayment=This is information on payment to do
-# ToComplete=To complete
-# YourEMail=Email to receive payment confirmation
-# Creditor=Creditor
-# PaymentCode=Payment code
-# PayBoxDoPayment=Go on payment
-# YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
-# PleaseBePatient=Please, be patient
-# Continue=Next
-# ToOfferALinkForOnlinePayment=URL for %s payment
-# ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
-# ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
-# ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
-# ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
-# ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
-# YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
-# SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> to have payment created automatically when validated by paybox.
-# YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-# YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
-# AccountParameter=Account parameters
-# UsageParameter=Usage parameters
-# InformationToFindParameters=Help to find your %s account information
-# PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment
-# VendorName=Name of vendor
-# CSSUrlForPaymentForm=CSS style sheet url for payment form
-# MessageOK=Message on validated payment return page
-# MessageKO=Message on canceled payment return page
-# NewPayboxPaymentReceived=New Paybox payment received
-# NewPayboxPaymentFailed=New Paybox payment tried but failed
-# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PayBoxSetup=PayBox module setup
+PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
+FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
+PaymentForm=Payment form
+WelcomeOnPaymentPage=Welcome on our online payment service
+ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
+ThisIsInformationOnPayment=This is information on payment to do
+ToComplete=To complete
+YourEMail=Email to receive payment confirmation
+Creditor=Creditor
+PaymentCode=Payment code
+PayBoxDoPayment=Go on payment
+YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
+PleaseBePatient=Please, be patient
+Continue=Next
+ToOfferALinkForOnlinePayment=URL for %s payment
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
+ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
+YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> to have payment created automatically when validated by paybox.
+YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
+YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
+AccountParameter=Account parameters
+UsageParameter=Usage parameters
+InformationToFindParameters=Help to find your %s account information
+PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment
+VendorName=Name of vendor
+CSSUrlForPaymentForm=CSS style sheet url for payment form
+MessageOK=Message on validated payment return page
+MessageKO=Message on canceled payment return page
+NewPayboxPaymentReceived=New Paybox payment received
+NewPayboxPaymentFailed=New Paybox payment tried but failed
+PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/id_ID/resource.lang b/htdocs/langs/id_ID/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..d64075dfbf595897a63e3eebf19194d8f71030dd
--- /dev/null
+++ b/htdocs/langs/id_ID/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
diff --git a/htdocs/langs/id_ID/sendings.lang b/htdocs/langs/id_ID/sendings.lang
index 2ae43f3976607147c1e8fc3a41898f572cee9868..f6111bac6841189e50c3c7fb9028962b56e3997e 100644
--- a/htdocs/langs/id_ID/sendings.lang
+++ b/htdocs/langs/id_ID/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is do
RelatedShippings=Related shippings
ShipmentLine=Shipment line
CarrierList=List of transporters
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
# Sending methods
SendingMethodCATCH=Catch by customer
diff --git a/htdocs/langs/id_ID/stocks.lang b/htdocs/langs/id_ID/stocks.lang
index 5d11b0fd7a0992284856369a2d4b919e56a34453..06c502504e9f19219ba028be8d02fbb55e5f0697 100644
--- a/htdocs/langs/id_ID/stocks.lang
+++ b/htdocs/langs/id_ID/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Warehouse label is required
CorrectStock=Correct stock
ListOfWarehouses=List of warehouses
ListOfStockMovements=List of stock movements
-StocksArea=Stocks area
+StocksArea=Warehouses area
Location=Location
LocationSummary=Short name location
NumberOfDifferentProducts=Number of different products
diff --git a/htdocs/langs/id_ID/users.lang b/htdocs/langs/id_ID/users.lang
index 0afaab6ad7f7ca7de787d1bad2656917763a3f45..baf209f9d1c7ff7527f6f0237519cac6f683a9e3 100644
--- a/htdocs/langs/id_ID/users.lang
+++ b/htdocs/langs/id_ID/users.lang
@@ -63,7 +63,6 @@ ShowGroup=Show group
ShowUser=Show user
NonAffectedUsers=Non assigned users
UserModified=User modified successfully
-GroupModified=Group modified successfully
PhotoFile=Photo file
UserWithDolibarrAccess=User with Dolibarr access
ListOfUsersInGroup=List of users in this group
@@ -103,7 +102,7 @@ UserDisabled=User %s disabled
UserEnabled=User %s activated
UserDeleted=User %s removed
NewGroupCreated=Group %s created
-GroupModified=Group modified successfully
+GroupModified=Group %s modified
GroupDeleted=Group %s removed
ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact ?
ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member ?
@@ -114,8 +113,10 @@ YourRole=Your roles
YourQuotaOfUsersIsReached=Your quota of active users is reached !
NbOfUsers=Nb of users
DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
-HierarchicalResponsible=Hierarchical responsible
+HierarchicalResponsible=Supervisor
HierarchicView=Hierarchical view
UseTypeFieldToChange=Use field Type to change
OpenIDURL=OpenID URL
LoginUsingOpenID=Use OpenID to login
+WeeklyHours=Weekly hours
+ColorUser=Color of the user
diff --git a/htdocs/langs/id_ID/withdrawals.lang b/htdocs/langs/id_ID/withdrawals.lang
index 58ac3e252ec59d67ff8d71c394b4c44265bc3add..e433730908416bbfa32c181a580b9e2e7e34717c 100644
--- a/htdocs/langs/id_ID/withdrawals.lang
+++ b/htdocs/langs/id_ID/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=Receipt
LastWithdrawalReceipts=Last %s withdrawal receipts
WithdrawedBills=Withdrawn invoices
WithdrawalsLines=Withdrawal lines
-RequestStandingOrderToTreat=Request for standing orders to treat
-RequestStandingOrderTreated=Request for standing orders treated
+RequestStandingOrderToTreat=Request for standing orders to process
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=Customer standing orders
CustomerStandingOrder=Customer standing order
NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
@@ -40,14 +41,13 @@ TransMetod=Transmission method
Send=Send
Lines=Lines
StandingOrderReject=Issue a rejection
-InvoiceRefused=Invoice refused
WithdrawalRefused=Withdrawal refused
WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society
RefusedData=Date of rejection
RefusedReason=Reason for rejection
RefusedInvoicing=Billing the rejection
NoInvoiceRefused=Do not charge the rejection
-InvoiceRefused=Invoice refused
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=Status
StatusUnknown=Unknown
StatusWaiting=Waiting
@@ -76,7 +76,7 @@ WithBankUsingRIB=For bank accounts using RIB
WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
BankToReceiveWithdraw=Bank account to receive withdraws
CreditDate=Credit on
-WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
ShowWithdraw=Show Withdraw
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
diff --git a/htdocs/langs/is_IS/accountancy.lang b/htdocs/langs/is_IS/accountancy.lang
index 8cab9d2b651d75b0721d76fda619e2034e4509b4..39c2732ec29852cf93d41614ed1812c2a4c1ce4f 100644
--- a/htdocs/langs/is_IS/accountancy.lang
+++ b/htdocs/langs/is_IS/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts
Validate=Validate
Addanaccount=Add an accounting account
AccountAccounting=Accounting account
-Ventilation=Ventilation
+Ventilation=Breakdown
ToDispatch=To dispatch
Dispatched=Dispatched
-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
TradeMargin=Trade margin
Reports=Reports
ByCustomerInvoice=By invoices customers
@@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger
Bookkeeping=General ledger
AccountBalanceByMonth=Account balance by month
-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
Line=Line
CAHTF=Total purchase supplier HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice
IntoAccount=In the accounting account
Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
+VentilationAuto=Automatic breakdown
Processing=Processing
EndProcessing=The end of processing
@@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account
ACCOUNTING_SEPARATORCSV=Separator CSV
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
@@ -140,14 +140,14 @@ Active=Statement
NewFiscalYear=New fiscal year
-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
TotalVente=Total turnover HT
TotalMarge=Total sales margin
DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
ChangeAccount=Change the accounting account for lines selected by the account:
Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
@@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically
ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index 35d97475337c9f15a33f8e14e2701e8639f2094a..60edf794f82b673065c49bbe132a8f086722f8b2 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/admin.lang
@@ -437,8 +437,8 @@ Module52Name=Verðbréf
Module52Desc=Kauphöll er stjórnun afurða
Module53Name=Þjónusta
Module53Desc=Þjónusta's stjórnun
-Module54Name=Samningar
-Module54Desc=Samningur og stjórnun þjónustu í
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=Barcodes
Module55Desc=Strikamerki er stjórnun
Module56Name=Símtækni
@@ -475,8 +475,8 @@ Module320Name=RSS Feed
Module320Desc=Bæta við RSS straum inni Dolibarr skjár síður
Module330Name=Bókamerki
Module330Desc=Bókamerki í stjórnun
-Module400Name=Verkefni
-Module400Desc=Verkefnisins stjórnun innan annarra eininga
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=Webcalendar
Module410Desc=Webcalendar sameining
Module500Name=Special expenses (tax, social contributions, dividends)
@@ -484,7 +484,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di
Module510Name=Salaries
Module510Desc=Management of employees salaries and payments
Module600Name=Tilkynningar
-Module600Desc=tengiliðir Senda tilkynningar í tölvupósti um sum Dolibarr viðskipti viðburðir til þriðja aðila
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Fjárframlög
Module700Desc=Framlög í stjórnun
Module1200Name=Mantis
@@ -514,16 +514,16 @@ Module5000Name=Multi-fyrirtæki
Module5000Desc=Leyfir þér að stjórna mörgum fyrirtækjum
Module6000Name=Workflow
Module6000Desc=Workflow management
-Module20000Name=Holidays
-Module20000Desc=Declare and follow employees holidays
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
Module39000Name=Product batch
Module39000Desc=Batch number, eat-by and sell-by date management on products
Module50000Name=PayBox
Module50000Desc=Module til að bjóða upp á netinu greiðslu síðu með kreditkorti með PayBox
Module50100Name=Point of sölu
Module50100Desc=Point of velta mát
-Module50200Name= Paypal
-Module50200Desc= Module til að bjóða upp á netinu greiðslu síðu með kreditkorti með Paypal
+Module50200Name=Paypal
+Module50200Desc=Module til að bjóða upp á netinu greiðslu síðu með kreditkorti með Paypal
Module50400Name=Accounting (advanced)
Module50400Desc=Accounting management (double parties)
Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=Lesa standa pantanir
Permission152=Búa til / breyta standandi fyrirmæli ósk
Permission153=Lesa standandi fyrirmæli kvittunum
Permission154=Útlán / neita standa pantanir kvittanir
-Permission161=Lesa samninga
-Permission162=Búa til / breyta samningar
-Permission163=Virkja þjónustu samnings
-Permission164=Óvirka þjónustu samning
-Permission165=Eyða samninga
-Permission171=Lesa ferðir
-Permission172=Búa til / breyta ferðir
-Permission173=Eyða ferðir
-Permission178=Útflutningur ferðir
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Read trips and expenses (own and his subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
Permission180=Lesa birgja
Permission181=Lesa birgir pantanir
Permission182=Búa til / breyta birgi pantanir
@@ -671,7 +672,7 @@ Permission300=Lesa Bar númerin
Permission301=Búa til / breyta barnum kóðar
Permission302=Eyða númerin barnum
Permission311=Lesa þjónusta
-Permission312=Velja þjónustu við samning
+Permission312=Assign service/subscription to contract
Permission331=Lesa bókamerki
Permission332=Búa til / breyta bókamerki
Permission333=Eyða bókamerki
@@ -701,8 +702,8 @@ Permission701=Lesa Fjárframlög
Permission702=Búa til / breyta framlög
Permission703=Eyða Fjárframlög
Permission1001=Lesa fiskistofna
-Permission1002=Búa til / breyta birgðum
-Permission1003=Eyða fiskistofna
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=hreyfing Lesa lager's
Permission1005=Búa til / breyta hreyfingum lager's
Permission1101=Lesa afhendingu pantana
@@ -1038,7 +1039,6 @@ YesInSummer=Yes in summer
OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
SuhosinSessionEncrypt=Session storage encrypted by Suhosin
ConditionIsCurrently=Condition is currently %s
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
YouUseBestDriver=You use driver %s that is best driver available currently.
YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=Fara aftur á bókhalds kóða byggt af %s á eftir þ
ModuleCompanyCodePanicum=Return tómt bókhalds-númer.
ModuleCompanyCodeDigitaria=Bókhalds kóða ráðast á þriðja aðila kóða. Kóðinn er samsett af eðli "C" í efstu stöðu eftir fyrstu 5 stafina þriðja aðila kóðann.
UseNotifications=Notaðu tilkynningar
-NotificationsDesc=Tölvupóst tilkynningar leyfir þér að hljóður senda sjálfvirkar póstur, fyrir sumir Dolibarr viðburðir, til þriðja aðila (viðskiptavini eða birgja) sem er stillt á. Val á virkum tilkynningu og markmið tengiliði er einn þriðja aðila á sama tíma.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
ModelModules=Skjöl sniðmát
DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
WatermarkOnDraft=Vatnsmerki á drögum að skjali
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=Bæta við fæðingardag getu
UseOptionLineIfNoQuantity=A lína af vöru / þjónustu með núll upphæð er talin sem valkost
FreeLegalTextOnProposal=Frjáls texti um viðskiptabanka tillögur
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=Stjórn Order's skipulag
OrdersNumberingModules=Pantanir tala mát
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list
ValidOrderAfterPropalClosed=Til að sannreyna röð eftir tillögu nær, gerir það mögulegt að stíga við til bráðabirgða til
FreeLegalTextOnOrders=Frjáls texti á pantanir
WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
##### Clicktodial #####
ClickToDialSetup=Smelltu til að hringja mát skipulag
ClickToDialUrlDesc=Url kallað þegar smellur á picto síminn er lokið. Dans l'url, énumérés pouvez utiliser les balises <br> <b>%% 1 $ s</b> Qui Sera remplacé jöfnuður æ Sími de l'appelé <br> <b>%% 2 $ s</b> Qui Sera remplacé jöfnuður æ Sími de l'appelant (æ votre) <br> <b>%% 3 $ s</b> Qui Sera remplacé jöfnuður votre innskráningu clicktodial (skilgreining sur votre fiche utilisateur) <br> <b>%% 4 $ s</b> Qui Sera remplacé jöfnuður votre mot de passe clicktodial (skilgreining sur votre fiche utilisateur).
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=Intervention tala mát
TemplatePDFInterventions=Intervention kort skjöl módel
WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
##### Contracts #####
-ContractsSetup=Samningar mát skipulag
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=Samningar númera einingar
TemplatePDFContracts=Contracts documents models
FreeLegalTextOnContracts=Free text on contracts
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
CacheByServer=Cache by server
CacheByClient=Cache by browser
CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=Vörur mát skipulag
ServiceSetup=Þjónusta mát skipulag
@@ -1382,9 +1384,10 @@ MailingSetup=Emailing mát skipulag
MailingEMailFrom=Sendandi Email (From) fyrir tölvupóst sent póst mát
MailingEMailError=Return Email (Villa-til) fyrir tölvupóst með villa
##### Notification #####
-NotificationSetup=Tilkynning Bu email mát skipulag
+NotificationSetup=EMail notification module setup
NotificationEMailFrom=Sendandi Email (From) fyrir tölvupóst sendi tilkynningar
-ListOfAvailableNotifications=Listi yfir tiltækar tilkynningar (Þessi listi byggist á virkjuðum einingar)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
##### Sendings #####
SendingsSetup=Sendi mát skipulag
SendingsReceiptModel=Sending kvittun líkan
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=árangursrík Tenging við miðlara ' %s ' á gagnagrunni ' %s
OSCommerceTestKo1=Tenging við miðlara ' %s ' ná árangri en% gagnagrunni 's' ekki næst.
OSCommerceTestKo2=Tenging við miðlara ' %s ' sem notanda ' %s ' mistókst.
##### Stock #####
-StockSetup=Stillingareining lager
-UserWarehouse=Nota notanda persónulega hlutabréf
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=Valmynd eytt
TreeMenu=Tree valmyndir
@@ -1478,11 +1482,14 @@ ClickToDialDesc=Þessi eining leyfir þér að bæta við tákn eftir símanúme
##### Point Of Sales (CashDesk) #####
CashDesk=Point of sölu
CashDeskSetup=Point of velta mát skipulag
-CashDeskThirdPartyForSell=Generic þriðja aðila til að nota fyrir selur
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Reikning til að nota til að taka á móti peningum greiðslur
CashDeskBankAccountForCheque= Reikning til að nota til að taka á móti greiðslum með því að stöðva
CashDeskBankAccountForCB= Reikning til að nota til að taka á móti peningum greiðslur með kreditkortum
-CashDeskIdWareHouse=Lager til nota fyrir selur
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Bókamerki mát skipulag
BookmarkDesc=Þessi eining leyfir þér að stjórna bókamerki. Þú getur einnig bætt flýtileiðir einhverju Dolibarr síðum eða externale vefsíðum á vinstri valmyndinni.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Delete fiscal year
ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
Opened=Opened
Closed=Closed
-
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
diff --git a/htdocs/langs/is_IS/agenda.lang b/htdocs/langs/is_IS/agenda.lang
index f5e5d9c96f741ad200fdfcd897145a295a6bff8c..a5614eca50f89be500b3a9bc70db1e7560a190e2 100644
--- a/htdocs/langs/is_IS/agenda.lang
+++ b/htdocs/langs/is_IS/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= Sjálfvirk fyllingu dagskrá
AgendaAutoActionDesc= Veldu hér viðburðir sem þú vilt Dolibarr að búa sjálfvirkt til aðgerða á dagskrá. Ef ekkert er valið (sjálfgefið), verður eingöngu handvirk aðgerð að koma fram í dagskrá.
AgendaSetupOtherDesc= Þessi síða leyfir að stilla aðrar breytur græju dagskrá.
AgendaExtSitesDesc=Þessi síða leyfir þér að lýsa ytri uppsprettur dagatal til að sjá atburði í Dolibarr dagskrá.
-ActionsEvents= Viðburðir sem Dolibarr vilja búa til aðgerða á dagskrá sjálfkrafa
-PropalValidatedInDolibarr= Tillaga %s staðfestar
-InvoiceValidatedInDolibarr= Invoice %s staðfestar
+ActionsEvents=Viðburðir sem Dolibarr vilja búa til aðgerða á dagskrá sjálfkrafa
+PropalValidatedInDolibarr=Tillaga %s staðfestar
+InvoiceValidatedInDolibarr=Invoice %s staðfestar
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=Vörureikningi %s fara aftur til drög að stöðu
InvoiceDeleteDolibarr=Invoice %s deleted
OrderValidatedInDolibarr= Panta %s staðfestar
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Panta %s samþykkt
OrderRefusedInDolibarr=Order %s refused
OrderBackToDraftInDolibarr=Panta %s fara aftur til drög að stöðu
OrderCanceledInDolibarr=Panta %s niður
-InterventionValidatedInDolibarr=Intervention %s staðfestar
ProposalSentByEMail=Verslunarhúsnæði %s tillaga send með tölvupósti
OrderSentByEMail=Viðskiptavinur röð %s send með tölvupósti
InvoiceSentByEMail=Viðskiptavinur vörureikningi %s send með tölvupósti
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=Birgir röð %s send með tölvupósti
SupplierInvoiceSentByEMail=Birgir vörureikningi %s send með tölvupósti
ShippingSentByEMail=Sendingarmáti %s send með tölvupósti
ShippingValidated= Shipping %s validated
-InterventionSentByEMail=Inngrip %s send með tölvupósti
-InterventionClassifiedBilled=Intervention %s classified as Billed
NewCompanyToDolibarr= Í þriðja aðila til
DateActionPlannedStart= Fyrirhugaður upphafsdagur
DateActionPlannedEnd= Áætlaðir lokadagur
@@ -70,9 +68,9 @@ DateActionStart= Upphafsdagur
DateActionEnd= Lokadagur
AgendaUrlOptions1=Þú getur einnig bætt við eftirfarandi breytur til að sía framleiðsla:
AgendaUrlOptions2=<b>login = %s </b> til að takmarka framleiðsla til aðgerða stofnuðum af áhrifum eða gert með <b>notandann %s .</b>
-AgendaUrlOptions3=<b>logina = %s </b> til að takmarka framleiðsla til aðgerða skapa við <b>notandann %s .</b>
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
AgendaUrlOptions4=<b>logint = %s </b> til að takmarka framleiðsla til aðgerða áhrif til <b>notandi %s .</b>
-AgendaUrlOptions5=<b>logind = %s </b> til að takmarka framleiðsla til aðgerða gert með <b>notandann %s .</b>
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
AgendaShowBirthdayEvents=tengiliði Sýna afmæli's
AgendaHideBirthdayEvents=tengiliðir Fela afmæli's
Busy=Busy
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=Slóð til að opna. Kvæmd skrá
ExtSiteNoLabel=Engin lýsing
WorkingTimeRange=Working time range
WorkingDaysRange=Working days range
-AddEvent=Add event
+AddEvent=Create event
MyAvailability=My availability
diff --git a/htdocs/langs/is_IS/bills.lang b/htdocs/langs/is_IS/bills.lang
index bc6d602d10efca02b011ae3e9888c7acd66e3786..d286633e8c80449c4a6f372e1e9173860b0705d3 100644
--- a/htdocs/langs/is_IS/bills.lang
+++ b/htdocs/langs/is_IS/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Credit athugið
InvoiceAvoirAsk=Credit athugið að leiðrétta reikning
InvoiceAvoirDesc=<b>Kredit huga</b> er neikvæð Reikningar notuð til að leysa þá staðreynd að reikningur hefur sú upphæð sem er mismunandi en upphæð raunverulega greitt (vegna þess að viðskiptavinur greiða of mikið við villa, eða er ekki greidd að fullu síðan hann kom aftur sum vara til dæmis).
invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
-invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
ReplaceInvoice=Skipta um reikning %s
ReplacementInvoice=Skipti Reikningar
ReplacedByInvoice=Komi% Reikningar s
@@ -87,7 +87,7 @@ ClassifyCanceled=Flokka 'Yfirgefinn'
ClassifyClosed=Lokað Flokka '
ClassifyUnBilled=Classify 'Unbilled'
CreateBill=Búa til reikning
-AddBill=Bæta við reikning eða inneign athugið
+AddBill=Create invoice or credit note
AddToDraftInvoices=Add to draft invoice
DeleteBill=Eyða reikningi
SearchACustomerInvoice=Leita að viðskiptavinur reikning
@@ -99,7 +99,7 @@ DoPaymentBack=Ekki greiðslu baka
ConvertToReduc=Umbreyta inn í framtíðina afsláttur
EnterPaymentReceivedFromCustomer=Sláðu inn greiðslu frá viðskiptavini
EnterPaymentDueToCustomer=Greiða vegna viðskiptavina
-DisabledBecauseRemainderToPayIsZero=Fatlaðir því eftir að greiða er núll
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
Amount=Upphæð
PriceBase=Verð stöð
BillStatus=Invoice stöðu
@@ -137,8 +137,6 @@ BillFrom=Frá
BillTo=Senda á
ActionsOnBill=Actions reikning
NewBill=Nýr reikningur
-Prélèvements=Standandi pöntun
-Prélèvements=Standandi pöntun
LastBills=Last %s reikningum
LastCustomersBills=Last %s viðskiptavinum reikninga
LastSuppliersBills=Last %s birgjum reikninga
@@ -156,9 +154,9 @@ ConfirmCancelBill=Ertu viss um að þú viljir hætta við <b>Reikningar %s ?</b
ConfirmCancelBillQuestion=hvers vegna viltu að flokka þennan reikning 'yfirgefin?
ConfirmClassifyPaidPartially=Ertu viss um að þú viljir breyta <b>reikningi %s </b> stöðu borgað?
ConfirmClassifyPaidPartiallyQuestion=Þessi reikningur hefur ekki verið greiddur að fullu. Hverjar eru ástæðurnar fyrir þig að loka þessum reikningi?
-ConfirmClassifyPaidPartiallyReasonAvoir=Afganginn til að greiða <b>( %s %s )</b> er afsláttur veittur vegna greiðslu var áður litið. Ég regularize VSK með kredit nóta.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Afganginn til að greiða <b>( %s %s )</b> er afsláttur veittur vegna greiðslu var áður litið. Ég samþykki að missa VSK á þessum afslætti.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Afganginn til að greiða <b>( %s %s )</b> er afsláttur veittur vegna greiðslu var áður litið. Ég endurheimta virðisaukaskatt á þessum afslætti án þess að inneign Ath.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad viðskiptavina
ConfirmClassifyPaidPartiallyReasonProductReturned=Vörur aftur að hluta
ConfirmClassifyPaidPartiallyReasonOther=Upphæð yfirgefin fyrir annarri ástæðu
@@ -191,9 +189,9 @@ AlreadyPaid=Þegar greitt
AlreadyPaidBack=Already paid back
AlreadyPaidNoCreditNotesNoDeposits=Þegar greitt (án seðla lána og innstæðna)
Abandoned=Yfirgefin
-RemainderToPay=Afganginn til að greiða
-RemainderToTake=Afganginn til að taka
-RemainderToPayBack=Remainder to pay back
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
Rest=Pending
AmountExpected=Upphæð krafa
ExcessReceived=Umfram borist
@@ -219,19 +217,18 @@ NoInvoice=Nei Reikningar
ClassifyBill=Flokka Reikningar
SupplierBillsToPay=Birgjar reikninga til að greiða
CustomerBillsUnpaid=Ógreiddum viðskiptavinum reikninga
-DispenseMontantLettres=Frumvarpið samin af mechanographical eru undanþegin þeirri röð bréf
-DispenseMontantLettres=Frumvarpið samin af mechanographical eru undanþegin þeirri röð bréf
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=Non-endurheimtanlegur
SetConditions=Setja greiðslu skilyrði
SetMode=Setja greiðslu ham
Billed=Billed
-RepeatableInvoice=Pre-útskýra reikning
-RepeatableInvoices=Pre-útskýra reikningum
-Repeatable=Pre-skilgreint
-Repeatables=Pre-skilgreint
-ChangeIntoRepeatableInvoice=Umbreyta inn í fyrirfram skilgreind
-CreateRepeatableInvoice=Búa til fyrirfram skilgreind Reikningar
-CreateFromRepeatableInvoice=Create fyrirfram skilgreind Reikningar
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
CustomersInvoicesAndInvoiceLines=Viðskiptavinur reikninga og línur reiknings er
CustomersInvoicesAndPayments=Viðskiptavinur reikninga og greiðslur
ExportDataset_invoice_1=Viðskiptavinur reikningum lista og línur reiknings er
diff --git a/htdocs/langs/is_IS/categories.lang b/htdocs/langs/is_IS/categories.lang
index 7b94e5fa730822df6e3a7e068aa2e4d6eaf5b432..4308d85801f86926d0eef129de25ccad9cf3e944 100644
--- a/htdocs/langs/is_IS/categories.lang
+++ b/htdocs/langs/is_IS/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories
CatCusLinks=Links between customers/prospects and categories
CatProdLinks=Links between products/services and categories
CatMemberLinks=Links between members and categories
-CatProdLinks=Links between products/services and categories
-CatCusLinks=Links between customers/prospects and categories
-CatSupLinks=Links between suppliers and categories
DeleteFromCat=Remove from category
DeletePicture=Picture delete
ConfirmDeletePicture=Confirm picture deletion?
@@ -112,3 +109,4 @@ CategoriesSetup=Categories setup
CategorieRecursiv=Link with parent category automatically
CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category
diff --git a/htdocs/langs/is_IS/compta.lang b/htdocs/langs/is_IS/compta.lang
index d04635fb00fe68f791140a41c2b3552b3e645083..cf099f5789b35aea7892fc7f382165abb51f0e9c 100644
--- a/htdocs/langs/is_IS/compta.lang
+++ b/htdocs/langs/is_IS/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad viðskiptavina bókhalds kóðann fyrir
SuppliersProductsSellSalesTurnover=The mynda veltu af sölu á vörum birgis.
CheckReceipt=Athugaðu innborgun
CheckReceiptShort=Athugaðu innborgun
+LastCheckReceiptShort=Last %s check receipts
NewCheckReceipt=New afsláttur
NewCheckDeposit=New stöðva afhendingu
NewCheckDepositOn=Búa til kvittun fyrir innborgun á reikning: %s
diff --git a/htdocs/langs/is_IS/contracts.lang b/htdocs/langs/is_IS/contracts.lang
index ea2f0fb210821aa3f61ed7e46044c9f7606a38cb..e58b93f1b0325ef970091ca777d96dab4982ff6e 100644
--- a/htdocs/langs/is_IS/contracts.lang
+++ b/htdocs/langs/is_IS/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Samningar area
ListOfContracts=Listi yfir samninga
-LastContracts=Last %s breytt samninga
+LastModifiedContracts=Last %s modified contracts
AllContracts=Allir samningar
ContractCard=Samningur kort
ContractStatus=Samningur stöðu
@@ -27,7 +27,7 @@ MenuRunningServices=Running þjónusta
MenuExpiredServices=Útrunninn þjónusta
MenuClosedServices=Lokað þjónusta
NewContract=Nýr samningur
-AddContract=Bæta við samning
+AddContract=Create contract
SearchAContract=Leita samning
DeleteAContract=Eyða samning
CloseAContract=Loka samning
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Listi yfir gangi samningur línur
ListOfRunningServices=Listi af hlaupandi þjónusta
NotActivatedServices=Óvirkur þjónustu (meðal gildi samninga)
BoardNotActivatedServices=Þjónusta til virkja meðal gildi samninga
-LastContracts=Last %s breytt samninga
+LastContracts=Last % contracts
LastActivatedServices=Last %s virkt þjónusta
LastModifiedServices=Last %s breytt þjónusta
EditServiceLine=Breyta þjónustu línu
diff --git a/htdocs/langs/is_IS/cron.lang b/htdocs/langs/is_IS/cron.lang
index f0318c12f854beef0297588daf396f69ea426317..ebae6d67c083b66a0aab68fed1bd6d33a6c05d2d 100644
--- a/htdocs/langs/is_IS/cron.lang
+++ b/htdocs/langs/is_IS/cron.lang
@@ -1,114 +1,86 @@
# Dolibarr language file - Source file is en_US - cron
-#
# About page
-#
About = Um
-# CronAbout = About Cron
-# CronAboutPage = Cron about page
-
-#
+CronAbout = About Cron
+CronAboutPage = Cron about page
# Right
-#
-# Permission23101 = Read Scheduled task
-# Permission23102 = Create/update Scheduled task
-# Permission23103 = Delete Scheduled task
-# Permission23104 = Execute Scheduled task
-
-#
+Permission23101 = Read Scheduled task
+Permission23102 = Create/update Scheduled task
+Permission23103 = Delete Scheduled task
+Permission23104 = Execute Scheduled task
# Admin
-#
-# CronSetup= Scheduled job management setup
-# URLToLaunchCronJobs=URL to check and launch cron jobs if required
-# OrToLaunchASpecificJob=Or to check and launch a specific job
-# KeyForCronAccess=Security key for URL to launch cron jobs
-# FileToLaunchCronJobs=Command line to launch cron jobs
-# CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes
-# CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
-
-
-#
+CronSetup= Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch cron jobs if required
+OrToLaunchASpecificJob=Or to check and launch a specific job
+KeyForCronAccess=Security key for URL to launch cron jobs
+FileToLaunchCronJobs=Command line to launch cron jobs
+CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
# Menu
-#
-# CronJobs=Scheduled jobs
-# CronListActive= List of active jobs
-# CronListInactive= List of disabled jobs
-# CronListActive= List of active jobs
-
-
-#
+CronJobs=Scheduled jobs
+CronListActive=List of active/scheduled jobs
+CronListInactive=List of disabled jobs
# Page list
-#
-# CronDateLastRun=Last run
-# CronLastOutput=Last run output
-# CronLastResult=Last result code
-# CronListOfCronJobs=List of scheduled jobs
-# CronCommand=Command
-# CronList=Jobs list
-# CronDelete= Delete cron jobs
-# CronConfirmDelete= Are you sure you want to delete this cron job ?
-# CronExecute=Launch job
-# CronConfirmExecute= Are you sure to execute this job now
-# CronInfo= Jobs allow to execute task that have been planned
-# CronWaitingJobs=Wainting jobs
-# CronTask=Job
+CronDateLastRun=Last run
+CronLastOutput=Last run output
+CronLastResult=Last result code
+CronListOfCronJobs=List of scheduled jobs
+CronCommand=Command
+CronList=Jobs list
+CronDelete= Delete cron jobs
+CronConfirmDelete= Are you sure you want to delete this cron job ?
+CronExecute=Launch job
+CronConfirmExecute= Are you sure to execute this job now
+CronInfo= Jobs allow to execute task that have been planned
+CronWaitingJobs=Wainting jobs
+CronTask=Job
CronNone= None
CronDtStart=Upphafsdagur
CronDtEnd=Lokadagur
-# CronDtNextLaunch=Next execution
-# CronDtLastLaunch=Last execution
-# CronFrequency=Frequancy
-# CronClass=Classe
+CronDtNextLaunch=Next execution
+CronDtLastLaunch=Last execution
+CronFrequency=Frequancy
+CronClass=Classe
CronMethod=Aðferð
CronModule=Module
-# CronAction=Action
+CronAction=Action
CronStatus=Status
CronStatusActive=Virkt
CronStatusInactive=Fatlaðir
-# CronNoJobs=No jobs registered
+CronNoJobs=No jobs registered
CronPriority=Forgangur
CronLabel=Lýsing
-# CronNbRun=Nb. launch
-# CronEach=Every
-# JobFinished=Job launched and finished
-
-#
+CronNbRun=Nb. launch
+CronEach=Every
+JobFinished=Job launched and finished
#Page card
-#
-# CronAdd= Add jobs
-# CronHourStart= Start Hour and date of task
-# CronEvery= And execute task each
-# CronObject= Instance/Object to create
+CronAdd= Add jobs
+CronHourStart= Start Hour and date of task
+CronEvery= And execute task each
+CronObject= Instance/Object to create
CronArgs=Breytur
-# CronSaveSucess=Save succesfully
+CronSaveSucess=Save succesfully
CronNote=Athugasemd
-# CronFieldMandatory=Fields %s is mandatory
-# CronErrEndDateStartDt=End date cannot be before start date
-# CronStatusActiveBtn=Enable
+CronFieldMandatory=Fields %s is mandatory
+CronErrEndDateStartDt=End date cannot be before start date
+CronStatusActiveBtn=Enable
CronStatusInactiveBtn=Slökkva
-# CronTaskInactive=This job is disabled
-# CronDtLastResult=Last result date
-# CronId=Id
-# CronClassFile=Classes (filename.class.php)
-# CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-# CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-# CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-# CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is <i>fecth</i>
-# CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-# CronCommandHelp=The system command line to execute.
-
-#
+CronTaskInactive=This job is disabled
+CronDtLastResult=Last result date
+CronId=Id
+CronClassFile=Classes (filename.class.php)
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
+CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronCommandHelp=The system command line to execute.
# Info
-#
-# CronInfoPage=Information
-
-
-#
+CronInfoPage=Information
# Common
-#
-# CronType=Task type
-# CronType_method=Call method of a Dolibarr Class
-# CronType_command=Shell command
-# CronMenu=Cron
-# CronCannotLoadClass=Cannot load class %s or object %s
-
-# UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+CronType=Task type
+CronType_method=Call method of a Dolibarr Class
+CronType_command=Shell command
+CronMenu=Cron
+CronCannotLoadClass=Cannot load class %s or object %s
+UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
diff --git a/htdocs/langs/is_IS/donations.lang b/htdocs/langs/is_IS/donations.lang
index 0a14a8eb626bec1709b14570401498ff939eae78..12fc71b3b9ec93026a0cd56261b4d72ed70d53f4 100644
--- a/htdocs/langs/is_IS/donations.lang
+++ b/htdocs/langs/is_IS/donations.lang
@@ -4,7 +4,7 @@ Donations=Fjárframlög
DonationRef=Donation ref.
Donor=Gjafa
Donors=Styrktaraðila
-AddDonation=Bæta við framlag
+AddDonation=Create a donation
NewDonation=New málefnið
ShowDonation=Show donation
DonationPromise=Gjöf loforð
@@ -31,3 +31,8 @@ DonationRecipient=Donation recipient
ThankYou=Thank You
IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
MinimumAmount=Minimum amount is %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/is_IS/externalsite.lang b/htdocs/langs/is_IS/externalsite.lang
index 5ced010884cb177278514c984bfdcbb8a77098b6..117b42da288e07b665ba236fa42fa21bc83c3bb1 100644
--- a/htdocs/langs/is_IS/externalsite.lang
+++ b/htdocs/langs/is_IS/externalsite.lang
@@ -1,4 +1,5 @@
# Dolibarr language file - Source file is en_US - externalsite
ExternalSiteSetup=Skipulag tengjast ytri vef
ExternalSiteURL=Ytri Site URL
-# ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/is_IS/holiday.lang b/htdocs/langs/is_IS/holiday.lang
index 011397244f0ae0149bb3f3d182468d8d84789cf6..a29a400f47d968166f95827f61a40e7f0288892e 100644
--- a/htdocs/langs/is_IS/holiday.lang
+++ b/htdocs/langs/is_IS/holiday.lang
@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
CantCreateCP=You don't have the right to make leave requests.
InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=Uppfæra
CantUpdate=You cannot update this leave request.
NoDateDebut=You must select a start date.
NoDateFin=You must select an end date.
-ErrorDureeCP=Your request for holidays does not contain working day.
-TitleValidCP=Approve the request holidays
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
ConfirmValidCP=Are you sure you want to approve the leave request?
DateValidCP=Date approved
TitleToValidCP=Send leave request
ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the request holidays
+TitleRefuseCP=Refuse the leave request
ConfirmRefuseCP=Are you sure you want to refuse the leave request?
NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
+TitleCancelCP=Cancel the leave request
ConfirmCancelCP=Are you sure you want to cancel the leave request?
DetailRefusCP=Reason for refusal
DateRefusCP=Date of refusal
@@ -78,7 +77,7 @@ ActionByCP=Performed by
UserUpdateCP=For the user
PrevSoldeCP=Previous Balance
NewSoldeCP=New Balance
-alreadyCPexist=A request for holidays has already been done on this period.
+alreadyCPexist=A leave request has already been done on this period.
UserName=Nafn
Employee=Employee
FirstDayOfHoliday=First day of vacation
@@ -88,25 +87,25 @@ ManualUpdate=Manual update
HolidaysCancelation=Leave request cancelation
## Configuration du Module ##
-ConfCP=Configuration of holidays module
+ConfCP=Configuration of leave request module
DescOptionCP=Description of the option
ValueOptionCP=Gildi
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
UpdateConfCPOK=Updated successfully.
ErrorUpdateConfCP=An error occurred during the update, please try again.
-AddCPforUsers=Please add the balance of holidays of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
Module27130Name= Management of leave requests
Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
TitleOptionEventCP=Settings of leave requets for events
ValidEventCP=Staðfesta
UpdateEventCP=Update events
diff --git a/htdocs/langs/is_IS/interventions.lang b/htdocs/langs/is_IS/interventions.lang
index 12b2d4ee681e819d9305bd70e1090c82677cb4d1..35009d0e1e1828af7e5c27a1d256b145a146729b 100644
--- a/htdocs/langs/is_IS/interventions.lang
+++ b/htdocs/langs/is_IS/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Intervention
Interventions=Íhlutun
InterventionCard=Intervention kort
NewIntervention=Nýrri aðferð
-AddIntervention=Bæta við íhlutun
+AddIntervention=Create intervention
ListOfInterventions=Listi yfir inngrip
EditIntervention=Breyta afskipti
ActionsOnFicheInter=Aðgerðir á íhlutun
@@ -30,6 +30,15 @@ StatusInterInvoiced=Billed
RelatedInterventions=Tengdar inngrip
ShowIntervention=Sýna afskipti
SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Fulltrúi eftirfarandi upp afskipti
TypeContact_fichinter_internal_INTERVENING=Íhlutun
diff --git a/htdocs/langs/is_IS/mails.lang b/htdocs/langs/is_IS/mails.lang
index bb9e2f48beaa70c66c716233827c624dd2ad86c9..6f5f9108e3a03074dbb167a165d8d2fd77cb9d59 100644
--- a/htdocs/langs/is_IS/mails.lang
+++ b/htdocs/langs/is_IS/mails.lang
@@ -115,7 +115,7 @@ SentBy=Sendur
MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
MailingNeedCommand2=Þú getur hins vegar sent þær á netinu með því að bæta breytu MAILING_LIMIT_SENDBYWEB við gildi frá fjölda max tölvupóst þú vilt senda við setu.
ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=Hreinsa lista
ToClearAllRecipientsClickHere=Smelltu hér til að hreinsa viðtakanda lista fyrir þennan póst
ToAddRecipientsChooseHere=Bæta við viðtakendur með því að velja úr listanum
@@ -133,6 +133,9 @@ Notifications=Tilkynningar
NoNotificationsWillBeSent=Engar tilkynningar í tölvupósti er mjög spennandi fyrir þennan atburð og fyrirtæki
ANotificationsWillBeSent=1 tilkynning verður send með tölvupósti
SomeNotificationsWillBeSent=%s tilkynningar verða sendar í tölvupósti
-AddNewNotification=Virkja nýja tilkynningu í tölvupósti beiðni
-ListOfActiveNotifications=Listi alla virka tilkynningu í tölvupósti beiðnir
+AddNewNotification=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
ListOfNotificationsDone=Sýna allar tilkynningar í tölvupósti sendi
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang
index de07096f6b3a4630b5916df4925e28811bee260e..beba885d13d62738bb1eccd9229a4d401a4d16ad 100644
--- a/htdocs/langs/is_IS/main.lang
+++ b/htdocs/langs/is_IS/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Gat ekki fundið <b>notandann %s </b> í D
ErrorNoVATRateDefinedForSellerCountry=Villa, enginn VSK hlutfall er skilgreind fyrir% landsins.
ErrorNoSocialContributionForSellerCountry=Villa, engin félagsleg framlag tegund er skilgreind fyrir% landsins.
ErrorFailedToSaveFile=Villa tókst að vista skrána.
-ErrorOnlyPngJpgSupported=Villa, eini. PNG og. Jpg mynd snið skrá eru studd.
-ErrorImageFormatNotSupported=Your PHP styður ekki virka til að breyta myndum af þessu sniði.
SetDate=Set date
SelectDate=Select a date
SeeAlso=See also %s
BackgroundColorByDefault=Default bakgrunnslit
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
FileWasNotUploaded=A-skrá er valin fyrir viðhengi en var ekki enn upp. Smelltu á "Hengja skrá" fyrir þessu.
NbOfEntries=ATH færslna
GoToWikiHelpPage=Lesa hjálp á netinu (þörf Internet aðgangur)
@@ -266,6 +266,7 @@ Afternoon=Afternoon
Quadri=Quadri
MonthOfDay=Mánuður dagsins
HourShort=H
+MinuteShort=mn
Rate=Verð
UseLocalTax=Include tax
Bytes=Bytes
@@ -340,6 +341,7 @@ FullList=Sjá lista
Statistics=Tölfræði
OtherStatistics=Önnur tölfræði
Status=Status
+Favorite=Favorite
ShortInfo=Info.
Ref=Tilv.
RefSupplier=Tilv. birgir
@@ -365,6 +367,7 @@ ActionsOnCompany=Actions um þessa þriðja aðila
ActionsOnMember=Viðburðir um þennan notanda
NActions=%s aðgerðir
NActionsLate=%s seint
+RequestAlreadyDone=Request already recorded
Filter=Sía
RemoveFilter=Fjarlægja síu
ChartGenerated=Mynd mynda
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Auka eiginleikar skipulag
URLPhoto=Url á mynd / lógó
SetLinkToThirdParty=Tengill á öðrum þriðja aðila
CreateDraft=Búa til drög
+SetToDraft=Back to draft
ClickToEdit=Smelltu til að breyta
ObjectDeleted=Object %s eytt
ByCountry=Eftir löndum
@@ -678,7 +682,7 @@ ViewPrivateNote=View notes
XMoreLines=%s line(s) hidden
PublicUrl=Public URL
AddBox=Add box
-
+SelectElementAndClickRefresh=Select an element and click Refresh
# Week day
Monday=Mánudagur
Tuesday=Þriðjudagur
diff --git a/htdocs/langs/is_IS/margins.lang b/htdocs/langs/is_IS/margins.lang
index 7319585cfdb80436ed33a434c9a710f31209764d..5ab8b70e4725a420b6881cff6b70829656bef453 100644
--- a/htdocs/langs/is_IS/margins.lang
+++ b/htdocs/langs/is_IS/margins.lang
@@ -10,24 +10,18 @@ MarkRate=Mark rate
DisplayMarginRates=Display margin rates
DisplayMarkRates=Display mark rates
InputPrice=Input price
-
margin=Profit margins management
margesSetup=Profit margins management setup
-
MarginDetails=Margin details
-
ProductMargins=Product margins
CustomerMargins=Customer margins
SalesRepresentativeMargins=Sales representative margins
-
ProductService=Vara eða þjónusta
AllProducts=All products and services
ChooseProduct/Service=Choose product or service
-
StartDate=Upphafsdagur
EndDate=Lokadagur
Launch=Byrja
-
ForceBuyingPriceIfNull=Force buying price if null
ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0)
MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
@@ -35,16 +29,16 @@ UseDiscountAsProduct=As a product
UseDiscountAsService=As a service
UseDiscountOnTotal=On subtotal
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
-
MARGIN_TYPE=Margin type
MargeBrute=Raw margin
MargeNette=Net margin
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - Cost price
-
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
Charges=Charges
-
AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/is_IS/orders.lang b/htdocs/langs/is_IS/orders.lang
index 48c220c4d9bc5db4849c1a498f3bfc7a5ddbb3e6..f4106749b55d75f891cf42179a8ada6e657ed230 100644
--- a/htdocs/langs/is_IS/orders.lang
+++ b/htdocs/langs/is_IS/orders.lang
@@ -2,7 +2,7 @@
OrdersArea=Viðskiptavinir pantanir area
SuppliersOrdersArea=Birgjar pantanir area
OrderCard=Panta kort
-# OrderId=Order Id
+OrderId=Order Id
Order=Panta
Orders=Pantanir
OrderLine=Pöntunarlína
@@ -28,7 +28,7 @@ StatusOrderCanceledShort=Hætt við
StatusOrderDraftShort=Víxill
StatusOrderValidatedShort=Staðfestar
StatusOrderSentShort=Í ferli
-# StatusOrderSent=Shipment in process
+StatusOrderSent=Shipment in process
StatusOrderOnProcessShort=Á ferli
StatusOrderProcessedShort=Afgreitt
StatusOrderToBillShort=Við reikning
@@ -53,9 +53,9 @@ ShippingExist=A sendingunni til
DraftOrWaitingApproved=Víxill eða samþykkt ekki enn pantað
DraftOrWaitingShipped=Drög eða viðurkennd ekki enn flutt
MenuOrdersToBill=Pantanir við reikning
-# MenuOrdersToBill2=Orders to bill
+MenuOrdersToBill2=Billable orders
SearchOrder=Leita röð
-# SearchACustomerOrder=Search a customer order
+SearchACustomerOrder=Search a customer order
ShipProduct=Skip vöru
Discount=Afsláttur
CreateOrder=Búa Order
@@ -65,14 +65,14 @@ ValidateOrder=Staðfesta röð
UnvalidateOrder=Unvalidate röð
DeleteOrder=Eyða röð
CancelOrder=Hætta við röð
-AddOrder=Bæta við röð
+AddOrder=Create order
AddToMyOrders=Bæta við pöntunum minn
AddToOtherOrders=Bæta við aðrar skipanir
-# AddToDraftOrders=Add to draft order
+AddToDraftOrders=Add to draft order
ShowOrder=Sýna röð
NoOpenedOrders=Nei opnaði pantanir
NoOtherOpenedOrders=Engin önnur opnaði pantanir
-# NoDraftOrders=No draft orders
+NoDraftOrders=No draft orders
OtherOrders=Aðrar skipanir
LastOrders=Last %s pantanir
LastModifiedOrders=Last %s breytt pantanir
@@ -82,7 +82,7 @@ NbOfOrders=Fjöldi fyrirmæla
OrdersStatistics=tölfræði Order's
OrdersStatisticsSuppliers=tölfræði Birgir röð's
NumberOfOrdersByMonth=Fjöldi fyrirmæla eftir mánuði
-# AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
+AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
ListOfOrders=Listi yfir pantanir
CloseOrder=Loka röð
ConfirmCloseOrder=Ertu viss um að þú viljir loka þessari röð? Einu sinni í röð er lokað, það geta aðeins verið rukkaður.
@@ -93,7 +93,7 @@ ConfirmUnvalidateOrder=Ertu viss um að þú viljir endurheimta röð <b>%s</b>
ConfirmCancelOrder=Ertu viss um að þú viljir hætta í þessari röð?
ConfirmMakeOrder=Ertu viss um að þú viljir að staðfesta sem þú gerðir í þessari röð <b>á %s ?</b>
GenerateBill=Búa til reikning
-# ClassifyShipped=Classify delivered
+ClassifyShipped=Classify delivered
ClassifyBilled=Flokka "borgað"
ComptaCard=Bókhalds-kort
DraftOrders=Drög að fyrirmælum
@@ -101,7 +101,6 @@ RelatedOrders=Svipaðir pantanir
OnProcessOrders=Í pantanir ferli
RefOrder=Tilv. röð
RefCustomerOrder=Tilv. viðskiptavina þess
-CustomerOrder=Viðskiptavinur röð
RefCustomerOrderShort=Tilv. cust. röð
SendOrderByMail=Senda til með pósti
ActionsOnOrder=Aðgerðir á röð
@@ -131,9 +130,7 @@ Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON skilgr
Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON skilgreind ekki
Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Ekki tókst að hlaða module skrána ' %s '
Error_FailedToLoad_COMMANDE_ADDON_File=Ekki tókst að hlaða module skrána ' %s '
-# Error_OrderNotChecked=No orders to invoice selected
-
-
+Error_OrderNotChecked=No orders to invoice selected
# Sources
OrderSource0=Auglýsing tillögu
OrderSource1=Internet
@@ -144,25 +141,22 @@ OrderSource5=Auglýsing
OrderSource6=Store
QtyOrdered=Magn röð
AddDeliveryCostLine=Bæta við kostnað sending línu sem gefur til kynna að þyngd þess
-
# Documents models
PDFEinsteinDescription=A heill til líkan (logo. ..)
PDFEdisonDescription=Einföld röð líkan
-# PDFProformaDescription=A complete proforma invoice (logo…)
+PDFProformaDescription=A complete proforma invoice (logo…)
# Orders modes
OrderByMail=Póstur
OrderByFax=Fax
OrderByEMail=Tölvupóstur
OrderByWWW=Online
OrderByPhone=Sími
-
-# CreateInvoiceForThisCustomer=Bill orders
-# NoOrdersToInvoice=No orders billable
-# CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-# MenuOrdersToBill2=Orders to bill
-# OrderCreation=Order creation
-# Ordered=Ordered
-# OrderCreated=Your orders have been created
-# OrderFail=An error happened during your orders creation
-# CreateOrders=Create orders
-# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+CreateInvoiceForThisCustomer=Bill orders
+NoOrdersToInvoice=No orders billable
+CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
+OrderCreation=Order creation
+Ordered=Ordered
+OrderCreated=Your orders have been created
+OrderFail=An error happened during your orders creation
+CreateOrders=Create orders
+ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
diff --git a/htdocs/langs/is_IS/oscommerce.lang b/htdocs/langs/is_IS/oscommerce.lang
deleted file mode 100644
index f88df6b090ce83c172603428e0a56a5cdea6f156..0000000000000000000000000000000000000000
--- a/htdocs/langs/is_IS/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=OS Commerce mát skipulag
-OSCommerceSetupSaved=OS Commerce skipulag vistuð
-OSCommerceServer=OS Commerce miðlara gestgjafi / ip
-OSCommerceDatabaseName=OS Commerce gagnasafn nafn
-OSCommercePrefix=OS Commerce matskeið forskeyti
-OSCommerceUser=OS Commerce gagnasafn Innskráning
diff --git a/htdocs/langs/is_IS/other.lang b/htdocs/langs/is_IS/other.lang
index d321767dba586fd339d375766a0b34c4e1321ec9..b9f670340db76c2f53d3049a029bca8a4373b381 100644
--- a/htdocs/langs/is_IS/other.lang
+++ b/htdocs/langs/is_IS/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=Öryggisnúmer
Calendar=Calendar
-AddTrip=Bæta ferð
Tools=Verkfæri
ToolsDesc=Þetta svæði er tileinkað hópi ýmissa verkfærum er ekki í boði í öðrum færslum valmyndinni. <br><br> Þeir verkfæri geta verið náð úr valmyndinni til hliðar.
Birthday=Afmæli
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation
Notify_TASK_CREATE=Task created
Notify_TASK_MODIFY=Task modified
Notify_TASK_DELETE=Task deleted
+SeeModuleSetup=See module setup
NbOfAttachedFiles=Fjöldi meðfylgjandi skrá / gögn
TotalSizeOfAttachedFiles=Heildarstærð meðfylgjandi skrá / gögn
MaxSize=Hámarks stærð
@@ -80,6 +80,16 @@ ModifiedBy=Breytt af %s
ValidatedBy=Staðfestar af %s
CanceledBy=Hætt við %s
ClosedBy=Lokað eftir %s
+CreatedById=User id who created
+ModifiedById=User id who made last change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made last change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
FileWasRemoved=File %s var eytt
DirWasRemoved=Listinn %s hefur verið fjarlægt
FeatureNotYetAvailableShort=Laus í næsta útgáfa
@@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your
##### Calendar common #####
AddCalendarEntry=Bæta við færslu í dagbók %s
-NewCompanyToDolibarr=Fyrirtæki %s bætt inn Dolibarr
-ContractValidatedInDolibarr=Samningur %s staðfestar í Dolibarr
-ContractCanceledInDolibarr=Samningur %s niður í Dolibarr
-ContractClosedInDolibarr=Samningur %s lokað Dolibarr
-PropalClosedSignedInDolibarr=Tillaga %s undirritaður í Dolibarr
-PropalClosedRefusedInDolibarr=Tillaga %s neitaði í Dolibarr
-PropalValidatedInDolibarr=Tillaga %s staðfestar í Dolibarr
-InvoiceValidatedInDolibarr=Invoice %s staðfestar í Dolibarr
-InvoicePaidInDolibarr=Invoice %s breytt í greiddur í Dolibarr
-InvoiceCanceledInDolibarr=Invoice %s niður í Dolibarr
-PaymentDoneInDolibarr=Greiðsla %s búinn Dolibarr
-CustomerPaymentDoneInDolibarr=Viðskiptavinur greiðslu %s búinn Dolibarr
-SupplierPaymentDoneInDolibarr=Birgir greiðslu %s búinn Dolibarr
-MemberValidatedInDolibarr=Aðildarríkin %s staðfestar í Dolibarr
-MemberResiliatedInDolibarr=Aðildarríkin %s resiliated í Dolibarr
-MemberDeletedInDolibarr=Aðildarríkin %s eytt úr Dolibarr
-MemberSubscriptionAddedInDolibarr=Áskrift fyrir aðild %s bætt í Dolibarr
-ShipmentValidatedInDolibarr=Sendingu %s staðfest í Dolibarr
-ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
##### Export #####
Export=Útflutningur
ExportsArea=Útflutningur area
diff --git a/htdocs/langs/is_IS/paybox.lang b/htdocs/langs/is_IS/paybox.lang
index de2829f99db8f478e26a7f93a3f135be75aae88d..eafa8c0424dacb99b8388531c4d205dcc4205b5c 100644
--- a/htdocs/langs/is_IS/paybox.lang
+++ b/htdocs/langs/is_IS/paybox.lang
@@ -32,6 +32,9 @@ VendorName=Nafn seljanda
CSSUrlForPaymentForm=CSS stíll lak url fyrir formi greiðslu
MessageOK=Skilaboð á staðfest greiðslu aftur síðu
MessageKO=Skilaboð á niður greiðslu aftur síðu
-# NewPayboxPaymentReceived=New Paybox payment received
-# NewPayboxPaymentFailed=New Paybox payment tried but failed
-# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+NewPayboxPaymentReceived=New Paybox payment received
+NewPayboxPaymentFailed=New Paybox payment tried but failed
+PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/is_IS/resource.lang b/htdocs/langs/is_IS/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..d64075dfbf595897a63e3eebf19194d8f71030dd
--- /dev/null
+++ b/htdocs/langs/is_IS/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
diff --git a/htdocs/langs/is_IS/sendings.lang b/htdocs/langs/is_IS/sendings.lang
index e53d724a0fe2bc13245c325bcc03837e8640f7cf..cafdc4253af46831bb853a3a13b45f0a28035874 100644
--- a/htdocs/langs/is_IS/sendings.lang
+++ b/htdocs/langs/is_IS/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=Í augnablikinu er sköpun af a nýr sendingunni
RelatedShippings=Related shippings
ShipmentLine=Shipment line
CarrierList=List of transporters
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
# Sending methods
SendingMethodCATCH=Afli eftir viðskiptavina
diff --git a/htdocs/langs/is_IS/stocks.lang b/htdocs/langs/is_IS/stocks.lang
index c8c0ad0eec314053280819fa05ff6fa85db1228b..d90b9eb1d1fbb98dfc79b2fe7780136764a98a60 100644
--- a/htdocs/langs/is_IS/stocks.lang
+++ b/htdocs/langs/is_IS/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Lager merki er krafist
CorrectStock=Rétt lager
ListOfWarehouses=Listi yfir vöruhús
ListOfStockMovements=Listi yfir hreyfingar lager
-StocksArea=Stocks area
+StocksArea=Warehouses area
Location=Staðsetning
LocationSummary=Stutt nafn staðsetning
NumberOfDifferentProducts=Number of different products
diff --git a/htdocs/langs/is_IS/users.lang b/htdocs/langs/is_IS/users.lang
index 458a417ea3f47b21f32d21884d2055d32652a69e..a21dab91a6c0ee21f66897092b6104069dbb0dbd 100644
--- a/htdocs/langs/is_IS/users.lang
+++ b/htdocs/langs/is_IS/users.lang
@@ -63,7 +63,6 @@ ShowGroup=Sýna hópur
ShowUser=Sýna notanda
NonAffectedUsers=Non áhrif notendur
UserModified=Notandi breytt hefur verið
-GroupModified=Group breytt hefur verið
PhotoFile=Photo skrá
UserWithDolibarrAccess=Notandi með Dolibarr aðgang
ListOfUsersInGroup=Notendalisti í þessum hópi
@@ -103,7 +102,7 @@ UserDisabled=User %s fatlaðra
UserEnabled=User %s virkjaður
UserDeleted=User %s eytt
NewGroupCreated=Group %s búinn til
-GroupModified=Group breytt hefur verið
+GroupModified=Group %s modified
GroupDeleted=Group %s eytt
ConfirmCreateContact=Ertu viss um að þú viljir búa til Dolibarr reikning fyrir þennan tengilið?
ConfirmCreateLogin=Ertu viss um að þú viljir búa til Dolibarr reikning fyrir þennan notanda?
@@ -114,8 +113,10 @@ YourRole=hlutverk þín
YourQuotaOfUsersIsReached=kvóta þinn af virkum notendum er náð!
NbOfUsers=Nb notendur
DontDowngradeSuperAdmin=Aðeins superadmin getur lækkunar a superadmin
-HierarchicalResponsible=Hierarchical responsible
+HierarchicalResponsible=Supervisor
HierarchicView=Hierarchical view
UseTypeFieldToChange=Use field Type to change
OpenIDURL=OpenID URL
LoginUsingOpenID=Use OpenID to login
+WeeklyHours=Weekly hours
+ColorUser=Color of the user
diff --git a/htdocs/langs/is_IS/withdrawals.lang b/htdocs/langs/is_IS/withdrawals.lang
index 8e6200e525a75a1df13e3d66e170f44106de4341..0ef7747d4a1051a66b96b68cf3e686f87152b8a9 100644
--- a/htdocs/langs/is_IS/withdrawals.lang
+++ b/htdocs/langs/is_IS/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=Kvittun
LastWithdrawalReceipts=Last %s afturköllun kvittunum
WithdrawedBills=Afturkallað reikningum
WithdrawalsLines=Uppsögn línur
-RequestStandingOrderToTreat=Beiðni fyrir standandi fyrirmæli til meðferðar
-RequestStandingOrderTreated=Beiðni um stöðu pantana sem fengu
+RequestStandingOrderToTreat=Request for standing orders to process
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=Viðskiptavinur standa pantanir
CustomerStandingOrder=Viðskiptavinur standandi röð
NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
@@ -40,14 +41,13 @@ TransMetod=Aðferð Sending
Send=Senda
Lines=Línur
StandingOrderReject=Útgáfudagur a hafna
-InvoiceRefused=Hleðsla höfnun til viðskiptavina
WithdrawalRefused=Útborganir Refuseds
WithdrawalRefusedConfirm=Ertu viss um að þú viljir að slá inn uppsögn höfnun fyrir samfélagið
RefusedData=Dagsetning synjunar
RefusedReason=Ástæða fyrir höfnun
RefusedInvoicing=Innheimta höfnun
NoInvoiceRefused=Ekki hlaða höfnun
-InvoiceRefused=Hleðsla höfnun til viðskiptavina
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=Status
StatusUnknown=Óþekkt
StatusWaiting=Bíð
@@ -76,7 +76,7 @@ WithBankUsingRIB=Fyrir bankareikninga með RIB
WithBankUsingBANBIC=Fyrir bankareikninga með IBAN / BIC / Swift
BankToReceiveWithdraw=Bankareikning til að fá hættir
CreditDate=Útlán á
-WithdrawalFileNotCapable=Ekki er hægt að búa til fráhvarfs kvittunar skrá fyrir þínu landi
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
ShowWithdraw=Sýna Dragið
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Hins vegar, ef reikningur hefur að minnsta kosti einn hætt greiðslu ekki enn afgreidd, mun það ekki vera eins og borgað til að leyfa að stjórna afturköllun áður.
DoStandingOrdersBeforePayments=Þetta tabs leyfa þér að biðja fyrir standandi röð. Þegar það verður lokið, getur þú slegið greiðslu til loka reikning.
diff --git a/htdocs/langs/it_IT/accountancy.lang b/htdocs/langs/it_IT/accountancy.lang
index a28f87e334322742a3a6b9dcc74d299c32e5b254..c581fbcf534672748ada28617fd9a25d99eac103 100644
--- a/htdocs/langs/it_IT/accountancy.lang
+++ b/htdocs/langs/it_IT/accountancy.lang
@@ -25,13 +25,13 @@ Selectchartofaccounts=Seleziona una lista degli account
Validate=Convalida
Addanaccount=Aggiungi un account di contabilità
AccountAccounting=Account di contabilità
-Ventilation=Ventilation
+Ventilation=Breakdown
ToDispatch=To dispatch
Dispatched=Dispatched
-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
-TradeMargin=Trade margin
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+TradeMargin=Margine commerciale
Reports=Report
ByCustomerInvoice=Per fatture clienti
ByMonth=Per mese
@@ -42,13 +42,13 @@ Create=Crea
UpdateAccount=Modifica di un account di contabilità
UpdateMvts=Modifica di un movimento
WriteBookKeeping=Record accounts in general ledger
-Bookkeeping=General ledger
+Bookkeeping=Contabilità generale
AccountBalanceByMonth=Account balance by month
-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
-Line=Line
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
+Line=Riga
CAHTF=Total purchase supplier HT
InvoiceLines=Lines of invoice to be ventilated
@@ -56,21 +56,21 @@ InvoiceLinesDone=Ventilated lines of invoice
IntoAccount=In the accounting account
Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
+VentilationAuto=Automatic breakdown
Processing=Processing
EndProcessing=The end of processing
AnyLineVentilate=Any lines to ventilate
-SelectedLines=Selected lines
-Lineofinvoice=Line of invoice
+SelectedLines=Righe selezionate
+Lineofinvoice=Riga fattura
VentilatedinAccount=Ventilated successfully in the accounting account
NotVentilatedinAccount=Not ventilated in the accounting account
-ACCOUNTING_SEPARATORCSV=Separator CSV
+ACCOUNTING_SEPARATORCSV=Separatore CSV
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
@@ -92,7 +92,7 @@ ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold produ
ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
-Doctype=Type of document
+Doctype=Tipo documento
Docdate=Data
Docref=Riferimento
Numerocompte=Account
@@ -122,10 +122,10 @@ CustomerInvoicePayment=Payment of invoice customer
ThirdPartyAccount=Thirdparty account
-NewAccountingMvt=New movement
-NumMvts=Number of movement
-ListeMvts=List of the movement
-ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+NewAccountingMvt=Nuovo movimento
+NumMvts=Numero movimento
+ListeMvts=Elenco movimenti
+ErrorDebitCredit=Debito e Credito non possono avere un valore contemporaneamente
ReportThirdParty=List thirdparty account
DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
@@ -138,21 +138,21 @@ Pcgsubtype=Under class of account
Accountparent=Root of the account
Active=Statement
-NewFiscalYear=New fiscal year
+NewFiscalYear=Nuovo anno fiscale
-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
TotalVente=Total turnover HT
-TotalMarge=Total sales margin
+TotalMarge=Margine totale sulle vendite
DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
ChangeAccount=Change the accounting account for lines selected by the account:
Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
-ValidateHistory=Validate Automatically
+ValidateHistory=Convalida automaticamente
ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index ec85bedbf4c3c46ebb815767aaf0ac3904a2ed25..3efcd058a7fb5b2c5daab76b857b4f42071143f2 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -437,8 +437,8 @@ Module52Name=Magazzino
Module52Desc=Gestione magazzino prodotti
Module53Name=Servizi
Module53Desc=Gestione servizi
-Module54Name=Contratti
-Module54Desc=Gestione contratti e servizi
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=Codici a barre
Module55Desc=Gestione codici a barre
Module56Name=Telefonia
@@ -475,8 +475,8 @@ Module320Name=Feed RSS
Module320Desc=Aggiungi feed RSS alle pagine di Dolibarr
Module330Name=Segnalibri
Module330Desc=Gestione segnalibri
-Module400Name=Progetti
-Module400Desc=Gestione progetti all'interno di altri moduli
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=Calendario web
Module410Desc=Integrazione calendario web
Module500Name=Spese speciali (tasse, contributi sociali, dividendi)
@@ -484,7 +484,7 @@ Module500Desc=Amministrazione delle spese speciali quali tasse, contributi socia
Module510Name=Stipendi
Module510Desc=Management of employees salaries and payments
Module600Name=Notifiche
-Module600Desc=Inviare notifiche (via email), per eventi aziendali Dolibarr
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Donazioni
Module700Desc=Gestione donazioni
Module1200Name=Mantis
@@ -514,16 +514,16 @@ Module5000Name=Multiazienda
Module5000Desc=Permette la gestione di diverse aziende
Module6000Name=Flusso di lavoro
Module6000Desc=Gestione flussi di lavoro
-Module20000Name=Ferie
-Module20000Desc=Dichiara e segui le ferie dei dipendenti
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
Module39000Name=Product batch
Module39000Desc=Batch number, eat-by and sell-by date management on products
Module50000Name=PayBox
Module50000Desc=Modulo per offrire il pagamento online con PayBox
Module50100Name=Punti vendita
Module50100Desc=Modulo per i punti vendita
-Module50200Name= Paypal
-Module50200Desc= Modulo per offrire il pagamento online con Paypal
+Module50200Name=Paypal
+Module50200Desc=Modulo per offrire il pagamento online con Paypal
Module50400Name=Accounting (advanced)
Module50400Desc=Accounting management (double parties)
Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=Vedere ordini permanenti
Permission152=Creare/modificare richieste di ordini permanenti
Permission153=Trasmettere fatture ordini permanenti
Permission154=Pagare/rifiutare fatture ordini permanenti
-Permission161=Vedere contratti
-Permission162=Creare/modificare contratti
-Permission163=Attivare un servizio di un contratto
-Permission164=Disattivare un servizio di un contratto
-Permission165=Eliminare i contratti
-Permission171=Vedere viaggi
-Permission172=Creare/modificare viaggi
-Permission173=Eliminare viaggi
-Permission178=Esportare viaggi
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Read trips and expenses (own and his subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
Permission180=Vedere fornitori
Permission181=Vedere ordini fornitore
Permission182=Creare / modificare ordini fornitore
@@ -671,7 +672,7 @@ Permission300=Vedere codici a barre
Permission301=Creare/modificare codici a barre
Permission302=Eliminare codici a barre
Permission311=Vedere servizi
-Permission312=Assegnare servizio a contratto
+Permission312=Assign service/subscription to contract
Permission331=Vedere segnalibri
Permission332=Creare/modificare segnalibri
Permission333=Eliminare segnalibri
@@ -701,8 +702,8 @@ Permission701=Vedere donazioni
Permission702=Creare/modificare donazioni
Permission703=Eliminare donazioni
Permission1001=Vedere magazzino
-Permission1002=Creare/modificare magazzino
-Permission1003=Eliminare scorte a magazzino
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=Vedere movimenti magazzino
Permission1005=Creare/modificare movimenti magazzino
Permission1101=Vedere documenti di consegna
@@ -1038,7 +1039,6 @@ YesInSummer=Si in estate
OnlyFollowingModulesAreOpenedToExternalUsers=Nota, solo i seguenti moduli sono aperti agli utenti esterni (qualunque siano i permessi per questi utenti)
SuhosinSessionEncrypt=Sessioni salvate con criptazione tramite Suhosin
ConditionIsCurrently=La condizione corrente è %s
-TestNotPossibleWithCurrentBrowsers=Rilevamento automatico non è possibile
YouUseBestDriver=You use driver %s that is best driver available currently.
YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=Restituisce una stringa composta da %s seguito dal cod
ModuleCompanyCodePanicum=Restituisce un codice contabile vuoto.
ModuleCompanyCodeDigitaria=Codice contabile dipendente dal codice di terze parti. Il codice è composto dal carattere "C" nella prima posizione seguito da i primi 5 caratteri del codice cliente/fornitore.
UseNotifications=Attiva le notifiche
-NotificationsDesc=La funzione di notifica consente di inviare email automaticamente alle imprese che sono configurati per riceverle quando si verificano eventi predefiniti.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
ModelModules=Modelli per i documenti
DocumentModelOdt=Generare documenti da modelli OpenDocuments (file .ODT o .ODS per OpenOffice, KOffice, TextEdit, ecc...)
WatermarkOnDraft=Filigrana sulle bozze
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=Aggiungi la possibilità di inserire la data di conseg
UseOptionLineIfNoQuantity=Una linea di prodotto/servizio con un importo pari a 0 è considerata come opzione
FreeLegalTextOnProposal=Testo libero sulle proposte commerciali
WatermarkOnDraftProposal=Bozze dei preventivi filigranate (nessuna filigrana se vuoto)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=Configurazione della gestione ordini
OrdersNumberingModules=Modelli di numerazione degli ordini
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Nascondi ordini trattati o annullati nella lista
ValidOrderAfterPropalClosed=Rendi possibile non passare per l'ordine provvisorio per la convalida dopo la chiusura della proposta commerciale
FreeLegalTextOnOrders=Testo libero sugli ordini
WatermarkOnDraftOrders=Bozze degli ordini filigranate (nessuna filigrana se vuoto)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
##### Clicktodial #####
ClickToDialSetup=Impostazioni modulo ClickToDial (telefonate con un clic)
ClickToDialUrlDesc=Indirizzo da raggiungere quando si clicca sull'icona del telefono. L'indirizzo può contenere i codici <br/><b>__PHONETO__</b> che verrà sostituito con il numero telefonico a cui collegarsi, <br/><b>__PHONEFROM__</b> che verrà sostituito con il numero chiamante (il vostro), <br/><b>__LOGIN__</b> che verrà sostituito con il nome utente usato per il servizio e <br/><b>__PASS__</b> che verrà sostituito con la password del servizio ClickToDial.
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=Numerazione dei moduli di intervento
TemplatePDFInterventions=Modelli per moduli di intervento in pdf
WatermarkOnDraftInterventionCards=Bozze delle schede di intervento filigranate (nessuna filigrana se vuoto)
##### Contracts #####
-ContractsSetup=Configurazione modulo contratti
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=Moduli per la numerazione dei contratti
TemplatePDFContracts=Modelli per documenti e contratti
FreeLegalTextOnContracts=Testo libero sui contratti
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=I file di tipo %s non vengono compressi dal server HTTP
CacheByServer=Cache per server
CacheByClient=Cache per browser
CompressionOfResources=Compressione delle risposte HTTP
-TestNotPossibleWithCurrentBrowsers=Rilevamento automatico non è possibile
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=Impostazioni modulo prodotti
ServiceSetup=Impostazioni modulo servizi
@@ -1382,9 +1384,10 @@ MailingSetup=Impostazioni modulo mailing
MailingEMailFrom=Mittente email (Da) per le email inviate dal modulo mailing
MailingEMailError=Indirizzo email per le mail di errore (Errors-to)
##### Notification #####
-NotificationSetup=Impostazioni modulo notifiche email
+NotificationSetup=EMail notification module setup
NotificationEMailFrom=Mittente email (Da) per le email di notifica inviate
-ListOfAvailableNotifications=Elenco delle notifiche disponibili (La lista dipende dai moduli attivati)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
##### Sendings #####
SendingsSetup=Impostazione del modulo di consegna
SendingsReceiptModel=Modello di ricevuta consegna (D.D.T.)
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=Connessione al server ' %s' sul database' %s' con l'utente ' %s
OSCommerceTestKo1=Connessione al server ' %s' riuscita, ma il database' %s' non è raggiungibile.
OSCommerceTestKo2=Connessione al server ' %s' con l'utente' %s' fallita.
##### Stock #####
-StockSetup=Impostazioni del modulo magazzino
-UserWarehouse=Attiva magazzino personale per utente
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=Menu soppresso
TreeMenu=Albero dei menu
@@ -1478,11 +1482,14 @@ ClickToDialDesc=Questo modulo aggiunge una icona accanto ai numeri telefonici de
##### Point Of Sales (CashDesk) #####
CashDesk=Punto vendita
CashDeskSetup=Impostazioni modulo punto vendita
-CashDeskThirdPartyForSell=Terzo generico da utilizzare per le vendite
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Conto bancario da utilizzare per pagamenti in contanti
CashDeskBankAccountForCheque= Conto bancario da utilizzare per pagamenti con assegno
CashDeskBankAccountForCB= Conto bancario da utilizzare per pagamenti con carta di credito
-CashDeskIdWareHouse=Magazzino da utilizzare per le vendite
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Impostazioni modulo segnalibri
BookmarkDesc=Questo modulo consente di gestire i segnalibri web. È possibile aggiungere collegamenti a pagine Dolibarr o a qualsiasi altro sito web esterno al menu di sinistra.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Elimina anno fiscale
ConfirmDeleteFiscalYear=Vuoi davvero cancellare questo anno fiscale?
Opened=Aperto
Closed=Chiuso
-
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
Format=Formato
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
diff --git a/htdocs/langs/it_IT/agenda.lang b/htdocs/langs/it_IT/agenda.lang
index 02d38701175795b6c3d5b804df687d31c9234875..8e0c4d9f732292bfb4c7201e0fdc863f921ca678 100644
--- a/htdocs/langs/it_IT/agenda.lang
+++ b/htdocs/langs/it_IT/agenda.lang
@@ -7,7 +7,7 @@ Agendas=Ordini del giorno
Calendar=Calendario
Calendars=Calendari
LocalAgenda=Calendario interno
-ActionsOwnedBy=Event owned by
+ActionsOwnedBy=Evento amministrato da
AffectedTo=Azione assegnata a
DoneBy=Fatto da
Event=Evento
@@ -41,9 +41,10 @@ AutoActions= Riempimento automatico
AgendaAutoActionDesc= Definire qui gli eventi che devono essere creati automaticamente da Dolibarr. Se non è selezionato nulla (impostazione predefinita), nel calendario saranno visualizzate solo azioni inserite manualmente.
AgendaSetupOtherDesc= Questa pagina consente di configurare gli altri parametri del modulo ordine del giorno.
AgendaExtSitesDesc=Questa pagina consente di configurare i calendari esterni.
-ActionsEvents= Eventi per i quali creare un'azione
-PropalValidatedInDolibarr= Proposta convalidata
-InvoiceValidatedInDolibarr= Fattura convalidata
+ActionsEvents=Eventi per i quali creare un'azione
+PropalValidatedInDolibarr=Proposta convalidata
+InvoiceValidatedInDolibarr=Fattura convalidata
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=Fattura %s riportata allo stato di bozza
InvoiceDeleteDolibarr=La fattura %s è stata cancellata
OrderValidatedInDolibarr= Ordine convalidato
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Ordine %s approvato
OrderRefusedInDolibarr=Ordine %s rifiutato
OrderBackToDraftInDolibarr=Ordine %s riportato allo stato di bozza
OrderCanceledInDolibarr=ordine %s annullato
-InterventionValidatedInDolibarr=Intervento %s convalidato
ProposalSentByEMail=Proposta commerciale %s inviata per email
OrderSentByEMail=Ordine cliente %s inviato per email
InvoiceSentByEMail=Fattura attiva %s inviata per email
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=Ordine fornitore %s inviato per email
SupplierInvoiceSentByEMail=Fornitore %s fattura inviata per email
ShippingSentByEMail=%s spedizione inviata per email
ShippingValidated= Spedizione %s confermata
-InterventionSentByEMail=Intervento %s inviato via email
-InterventionClassifiedBilled=Interventi %s classificati come Fatturati
NewCompanyToDolibarr= Soggetto terzo creato
DateActionPlannedStart= Data di inizio prevista
DateActionPlannedEnd= Data di fine prevista
@@ -70,9 +68,9 @@ DateActionStart= Data di inizio
DateActionEnd= Data di fine
AgendaUrlOptions1=È inoltre possibile aggiungere i seguenti parametri ai filtri di output:
AgendaUrlOptions2=<b>login = %s</b> per visualizzare solo le azioni create da, o che coinvolgono l'utente <b>%s</b>.
-AgendaUrlOptions3=<b>logina = %s</b> per limitare l'output alle azioni create dall'<b>utente %s</b>.
+AgendaUrlOptions3=<b>logina = %s</b> per limitare l'output alle azioni amministrate dall'utente<b>%s</b>
AgendaUrlOptions4=<b>logint = %s</b> per limitare l'output alle azioni modificate dall'<b>utente %s</b>.
-AgendaUrlOptions5=<b>logind = %s</b> per limitare l'output alle azioni fatte dall'<b>utente %s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> per limitare l'output alle azioni associate al progetto <b>PROJECT_ID</b>.
AgendaShowBirthdayEvents=Visualizza i compleanni dei contatti
AgendaHideBirthdayEvents=Nascondi i compleanni dei contatti
Busy=Occupato
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=URL per accedere al file ICal
ExtSiteNoLabel=Nessuna descrizione
WorkingTimeRange=Intervallo di tempo di lavoro
WorkingDaysRange=Intervallo di giorni di lavoro
-AddEvent=Add event
-MyAvailability=My availability
+AddEvent=Crea evento
+MyAvailability=Mie disponibilità
diff --git a/htdocs/langs/it_IT/bills.lang b/htdocs/langs/it_IT/bills.lang
index 2627bdafb5251968b7c5cded8347e4935b433c7b..197311e45c07b1be90370e7bd4f6aff2c243edfa 100644
--- a/htdocs/langs/it_IT/bills.lang
+++ b/htdocs/langs/it_IT/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Nota di credito a correzione
InvoiceAvoirAsk=Nota di credito per correggere fattura
InvoiceAvoirDesc=La <b>nota di credito a correzione</b> è una fattura con importo negativo utilizzata per risolvere il problema di una fattura emessa con importo diverso da quello realmente pagato (perché il cliente ha pagato troppo per errore, o non ha pagato completamente perché ad esempio ha restituito alcuni prodotti).<br/><br/>Nota: la fattura originale deve essere già chiusa ( "pagata" o "parzialmente pagata") per consentire la creazione di una nota di credito a correzione.
invoiceAvoirWithLines=Crea una Nota Credito con le righe della fattura di origine.
-invoiceAvoirWithPaymentRestAmount=Crea una Nota Credito con l'importo rimanente del pagamento della fattura di origine.
-invoiceAvoirLineWithPaymentRestAmount=Importo Nota Credito della differenza del pagamento della fattura
+invoiceAvoirWithPaymentRestAmount=Crea nota di credito con il restante da pagare della fattura originale
+invoiceAvoirLineWithPaymentRestAmount=Crea nota di credito con il restante da pagare
ReplaceInvoice=Sostituire fattura %s
ReplacementInvoice=Sostituzione fattura
ReplacedByInvoice=Sostituita dalla fattura %s
@@ -85,9 +85,9 @@ ClassifyPaid=Classifica come "pagata"
ClassifyPaidPartially=Classifica come "parzialmente pagata"
ClassifyCanceled=Classifica come "abbandonata"
ClassifyClosed=Classifica come "chiusa"
-ClassifyUnBilled=Classify 'Unbilled'
+ClassifyUnBilled=Classifica come 'Non fatturato'
CreateBill=Crea fattura
-AddBill=Aggiungi fattura o nota di credito
+AddBill=Crea fattura o nota di credito
AddToDraftInvoices=Aggiungi alle fattture in bozza
DeleteBill=Elimina fattura
SearchACustomerInvoice=Cerca una fattura attiva
@@ -99,7 +99,7 @@ DoPaymentBack=Emetti rimborso
ConvertToReduc=Converti in futuro sconto
EnterPaymentReceivedFromCustomer=Inserisci il pagamento ricevuto dal cliente
EnterPaymentDueToCustomer=Emettere il pagamento dovuto al cliente
-DisabledBecauseRemainderToPayIsZero=Disabilitata perché il restante da pagare è zero
+DisabledBecauseRemainderToPayIsZero=Disabilitato perché il restante da pagare vale zero
Amount=Importo
PriceBase=Prezzo base
BillStatus=Stato fattura
@@ -137,8 +137,6 @@ BillFrom=Da
BillTo=Fattura a
ActionsOnBill=Azioni su fattura
NewBill=Nuova fattura
-Prélèvements=Ordine permanente
-Prélèvements=Ordine permanente
LastBills=Ultime %s fatture
LastCustomersBills=Ultime %s fatture attive
LastSuppliersBills=Ultime %s fatture fornitori
@@ -156,9 +154,9 @@ ConfirmCancelBill=Vuoi davvero annullare la fattura <b>%s</b>?
ConfirmCancelBillQuestion=Perché si desidera classificare questa fattura come "abbandonata" ?
ConfirmClassifyPaidPartially=Vuoi davvero cambiare lo stato della fattura <b>%s</b> in "parzialmente pagata"?
ConfirmClassifyPaidPartiallyQuestion=La fattura non è stata pagata completamente. Quali sono i motivi per chiudere questa fattura?
-ConfirmClassifyPaidPartiallyReasonAvoir=La rimanenza da pagare <b>( %s %s)</b> viene concessa come sconto perché il pagamento è stato effettuato prima del termine. L'IVA verrà recuperata con una nota di credito.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=La rimanenza da pagare <b>( %s %s)</b> viene concessa come sconto perché il pagamento è stato effettuato prima del termine. Accetto di perdere l'IVA su questo sconto.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=La rimanenza da pagare <b>( %s %s)</b> viene concessa come sconto perché il pagamento è stato effettuato prima del termine. L'IVA verrà recuperata senza una nota di credito.
+ConfirmClassifyPaidPartiallyReasonAvoir=Il restante da pagare <b>(%s %s)</b> viene scontato perché il pagamento è stato eseguito entro il termine. L'IVA sarà regolarizzata mediante nota di credito.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Il restante da pagare <b>(%s %s)</b> viene scontato perché il pagamento è stato eseguito entro il termine. Accetto di perdere l'IVA sullo sconto.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Il restante da pagare <b>(%s %s)</b> viene scontato perché il pagamento è stato eseguito entro il termine. L'IVA sullo sconto sarà recuperata senza nota di credito.
ConfirmClassifyPaidPartiallyReasonBadCustomer=Cliente moroso
ConfirmClassifyPaidPartiallyReasonProductReturned=Parziale restituzione di prodotti
ConfirmClassifyPaidPartiallyReasonOther=Altri motivi
@@ -191,15 +189,15 @@ AlreadyPaid=Già pagato
AlreadyPaidBack=Già rimborsato
AlreadyPaidNoCreditNotesNoDeposits=Già pagato (senza note di credito o depositi)
Abandoned=Abbandonata
-RemainderToPay=Resto da pagare
+RemainderToPay=Restante da pagare
RemainderToTake=Restante da incassare
-RemainderToPayBack=Resto (rimanenza*) da rimborsare
+RemainderToPayBack=Restante da rimborsare
Rest=In attesa
AmountExpected=Importo atteso
ExcessReceived=Ricevuto in eccesso
EscompteOffered=Sconto offerto (pagamento prima del termine)
-SendBillRef=Submission of invoice %s
-SendReminderBillRef=Submission of invoice %s (reminder)
+SendBillRef=Invio della fattura %s
+SendReminderBillRef=Invio della fattura %s (promemoria)
StandingOrders=Mandati di pagamento
StandingOrder=Mandato di pagamento
NoDraftBills=Nessuna bozza di fatture
@@ -219,19 +217,18 @@ NoInvoice=Nessuna fattura
ClassifyBill=Classificazione fattura
SupplierBillsToPay=Fatture fornitori da pagare
CustomerBillsUnpaid=Fatture attive non pagate
-DispenseMontantLettres=Le fatture redatte attraverso un processo meccanografico sono escluse dall'ordine per lettera
-DispenseMontantLettres=Le fatture redatte attraverso un processo meccanografico sono escluse dall'ordine per lettera
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=Non recuperabile
SetConditions=Imposta le condizioni di pagamento
SetMode=Imposta la modalità di pagamento
Billed=Fatturati
-RepeatableInvoice=Fattura ripetibile
-RepeatableInvoices=Fatture ripetibili
-Repeatable=Ripetibile
-Repeatables=Ripetibili
-ChangeIntoRepeatableInvoice=Cambia in ripetibile
-CreateRepeatableInvoice=Crea fattura ripetibile
-CreateFromRepeatableInvoice=Crea da fattura ripetibile
+RepeatableInvoice=Modello fattura
+RepeatableInvoices=Modello fatture
+Repeatable=Modello
+Repeatables=Modelli
+ChangeIntoRepeatableInvoice=Converti in modello di fattura
+CreateRepeatableInvoice=Crea modello di fattura
+CreateFromRepeatableInvoice=Crea da modello di fattura
CustomersInvoicesAndInvoiceLines=Fatture attive e righe di fattura
CustomersInvoicesAndPayments=Fatture attive e pagamenti
ExportDataset_invoice_1=Elenco delle fatture attive e righe di fattura
@@ -296,8 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Il totale di due nuovi sconti deve essere p
ConfirmRemoveDiscount=Vuoi davvero eliminare questo sconto?
RelatedBill=Fattura correlata
RelatedBills=Fatture correlate
-LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoice already exist
+LatestRelatedBill=Ultima fattura correlata
+WarningBillExist=Attenzione, una o più fatture già esistenti
# PaymentConditions
PaymentConditionShortRECEP=Immediato
diff --git a/htdocs/langs/it_IT/categories.lang b/htdocs/langs/it_IT/categories.lang
index 64247e0aa7328cb508c2d9da4aac14b8c67bbcf1..0514f048fa67433c91842f5e2a8a84deaa979576 100644
--- a/htdocs/langs/it_IT/categories.lang
+++ b/htdocs/langs/it_IT/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Collegamenti tra fornitori e categorie
CatCusLinks=Collegamenti tra clienti/clienti potenziali e categorie
CatProdLinks=Collegamenti tra prodotti/servizi e categorie
CatMemberLinks=Collegamenti tra membri e categorie
-CatProdLinks=Collegamenti tra prodotti/servizi e categorie
-CatCusLinks=Collegamenti tra clienti/clienti potenziali e categorie
-CatSupLinks=Collegamenti tra fornitori e categorie
DeleteFromCat=Elimina dalla categoria
DeletePicture=Foto cancellata
ConfirmDeletePicture=Confermi l'eliminazione della foto?
@@ -111,4 +108,5 @@ ExtraFieldsCategories=Campi extra
CategoriesSetup=Impostazioni categorie
CategorieRecursiv=Collega automaticamente con la categoria padre
CategorieRecursivHelp=Se attivata, il prodotto sarà inserito anche nella categoria padre quando lo aggiungi ad una sottocategoria
-AddProductServiceIntoCategory=Add the following product/service
+AddProductServiceIntoCategory=Aggiungi il seguente prodotto/servizio
+ShowCategory=Show category
diff --git a/htdocs/langs/it_IT/compta.lang b/htdocs/langs/it_IT/compta.lang
index bfb2dcd2152eb706d944872b025ec6b5febbffd6..c0b713303facc2828dfb697042af91cb280ea5bf 100644
--- a/htdocs/langs/it_IT/compta.lang
+++ b/htdocs/langs/it_IT/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Codice contabile errato per %s
SuppliersProductsSellSalesTurnover=Fatturato generato dalle vendite di prodotti dei fornitori.
CheckReceipt=Ricevuta di versamento assegno
CheckReceiptShort=Ricevuta assegno
+LastCheckReceiptShort=Last %s check receipts
NewCheckReceipt=Nuovo assegno
NewCheckDeposit=Nuovo deposito
NewCheckDepositOn=Nuovo deposito sul conto: %s
@@ -187,7 +188,7 @@ AccountancyDashboard=Riassunto contabilità
ByProductsAndServices=Per prodotti e servizi
RefExt=Referente esterno
ToCreateAPredefinedInvoice=Per creare una fattura predefinita, creare una fattura standard e poi, senza convalidarla, cliccare sul pulsante "Trasforma in fattura predefinita".
-LinkedOrder=Link to order
+LinkedOrder=Collega a ordine
ReCalculate=Ricalcola
Mode1=Metodo 1
Mode2=Metodo 2
@@ -204,6 +205,6 @@ ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
-CloneTaxForNextMonth=Clone it for next month
+CloneTax=Clona contributo sociale
+ConfirmCloneTax=Conferma la clonazione del contributo sociale
+CloneTaxForNextMonth=Clona nel mese successivo
diff --git a/htdocs/langs/it_IT/contracts.lang b/htdocs/langs/it_IT/contracts.lang
index 53cfa41e133d180c0810426b793c017b13587d6c..31a3df9e3769687584cbb03c3c9df7c3d5182d07 100644
--- a/htdocs/langs/it_IT/contracts.lang
+++ b/htdocs/langs/it_IT/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Area contratti
ListOfContracts=Elenco dei contratti
-LastContracts=Ultimi % contratti
+LastModifiedContracts=Last %s modified contracts
AllContracts=Tutti i contratti
ContractCard=Scheda contratto
ContractStatus=Stato contratto
@@ -27,7 +27,7 @@ MenuRunningServices=Servizi in esecuzione
MenuExpiredServices=Servizi scaduti
MenuClosedServices=Servizi chiusi
NewContract=Nuovo contratto
-AddContract=Aggiungi contratto
+AddContract=Crea contratto
SearchAContract=Ricerca di un contratto
DeleteAContract=Eliminazione di un contratto
CloseAContract=Chiudere un contratto
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Elenco delle righe di contratto in esecuzione
ListOfRunningServices=Elenco dei servizi in esecuzione
NotActivatedServices=Servizi non attivati (con contratti convalidati)
BoardNotActivatedServices=Servizi da attivare con contratti convalidati
-LastContracts=Ultimi % contratti
+LastContracts=Last % contracts
LastActivatedServices=Ultimi %s servizi attivati
LastModifiedServices=Ultimi %s servizi modificati
EditServiceLine=Modifica riga del servizio
diff --git a/htdocs/langs/it_IT/cron.lang b/htdocs/langs/it_IT/cron.lang
index 23216ac85259bde190f1b77ab791ae4e85f1b4dd..ec7f4e2cba5d7d5ae49043167566845590993ddc 100644
--- a/htdocs/langs/it_IT/cron.lang
+++ b/htdocs/langs/it_IT/cron.lang
@@ -1,22 +1,14 @@
# Dolibarr language file - Source file is en_US - cron
-#
# About page
-#
About = Info
CronAbout = Info su Cron
CronAboutPage = Pagina informativa su Cron
-
-#
# Right
-#
Permission23101 = Leggi compito programmato
Permission23102 = Crea/aggiorna compito programmato
Permission23103 = Cancella compito programmato
Permission23104 = Esegui compito programmato
-
-#
# Admin
-#
CronSetup= Impostazione delle azioni pianificate
URLToLaunchCronJobs=URL che lancia i job di cron
OrToLaunchASpecificJob=O per lanciare un job specifico
@@ -24,20 +16,11 @@ KeyForCronAccess=Chiave di sicurezza per l'URL che lancia i job di cron
FileToLaunchCronJobs=Comando per lanciare i job di cron
CronExplainHowToRunUnix=In ambienti Unix dovresti usare crontab per lanciare il comando ogni minuto
CronExplainHowToRunWin=In ambienti Microsoft(tm) Windows dovresti usare Operazioni Pianificate per lanciare il comando ogni minuto
-
-
-#
# Menu
-#
CronJobs=Azioni pianificate
-CronListActive= Lista dei job attivi
-CronListInactive= Lista dei job disabilitati
-CronListActive= Lista dei job attivi
-
-
-#
+CronListActive=List of active/scheduled jobs
+CronListInactive=Lista dei job disabilitati
# Page list
-#
CronDateLastRun=Ultimo avvio
CronLastOutput=Output dell'ultimo avvio
CronLastResult=Codice del risultato dell'ultima esecuzione
@@ -70,10 +53,7 @@ CronLabel=Descrizione
CronNbRun=Num. lancio
CronEach=Ogni
JobFinished=Azione eseguita e completata
-
-#
#Page card
-#
CronAdd= Aggiungi job
CronHourStart= Ora e data di inizio del compito
CronEvery= Ed esegui il compito ogni
@@ -95,20 +75,12 @@ CronObjectHelp=Nome dell'oggetto da caricare. <BR>Per esempio per ottenere il me
CronMethodHelp=Nome del metodo dell'oggetto da eseguire. <BR>Per esempio per ottenere il metodo dell'oggetto /htdocs/product/class/product.class.php, il valore da inserire è <i>fetch</i>
CronArgsHelp=Argomenti del metodo.<br/> Per esempio per ottenere il metodo corretto dell'oggetto /htdocs/product/class/<u>product.class.php</u>, il valore dei parametri può essere <i>0, ProductRef</i>
CronCommandHelp=Il comando da eseguire sul sistema
-
-#
# Info
-#
CronInfoPage=Informazioni
-
-
-#
# Common
-#
CronType=Tipo di compito
CronType_method=Metodo di chiamata di una classe Dolibarr
CronType_command=Comando da shell
CronMenu=Cron
CronCannotLoadClass=Non posso caricare la classe %s o l'oggetto %s
-
UseMenuModuleToolsToAddCronJobs=Andare nel menu "Home - Modules tools - Job list" per vedere e modificare le azioni pianificate.
diff --git a/htdocs/langs/it_IT/donations.lang b/htdocs/langs/it_IT/donations.lang
index ded531e8257574077e0949782c1272df8a11300f..6ee8837eeebfab2bbf89e7df854c288b3e740893 100644
--- a/htdocs/langs/it_IT/donations.lang
+++ b/htdocs/langs/it_IT/donations.lang
@@ -4,7 +4,7 @@ Donations=Donazioni
DonationRef=Riferimento donazione
Donor=Donatore
Donors=Donatori
-AddDonation=Aggiungi una donazione
+AddDonation=Crea donazione
NewDonation=Nuova donazione
ShowDonation=Visualizza donazione
DonationPromise=Donazione promessa
@@ -30,4 +30,9 @@ SearchADonation=Cerca una donazione
DonationRecipient=Ricevente della donazione
ThankYou=Grazie
IConfirmDonationReception=Si dichiara di aver ricevuto la seguente cifra a titolo di donazione
-MinimumAmount=Minimum amount is %s
+MinimumAmount=L'importo minimo è %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/it_IT/externalsite.lang b/htdocs/langs/it_IT/externalsite.lang
index 97b50d4d88f40efc47050134e85e4202477f4ff2..415726fc9d151a26fceb8d1ffc2e8aac8b693e60 100644
--- a/htdocs/langs/it_IT/externalsite.lang
+++ b/htdocs/langs/it_IT/externalsite.lang
@@ -2,3 +2,4 @@
ExternalSiteSetup=Imposta collegamento a sito esterno
ExternalSiteURL=Indirizzo del sito esterno
ExternalSiteModuleNotComplete=Il modulo ExternalSite non è configurato correttamente.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/it_IT/holiday.lang b/htdocs/langs/it_IT/holiday.lang
index 4b9e159118acea2baae0fa6c299054efb4a3ebd2..b1ffbd72fb48cfcd0589d1333ece82b8e6e56759 100644
--- a/htdocs/langs/it_IT/holiday.lang
+++ b/htdocs/langs/it_IT/holiday.lang
@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
CantCreateCP=You don't have the right to make leave requests.
InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=Aggiorna
CantUpdate=You cannot update this leave request.
NoDateDebut=Bisogna selezionare una data di inizio.
NoDateFin=Bisogna selezionare una data di fine.
-ErrorDureeCP=La tua richiesta di ferie non comprende giorni lavorativi.
-TitleValidCP=Approva la richiesta di ferie
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
ConfirmValidCP=Are you sure you want to approve the leave request?
DateValidCP=Data approvazione
TitleToValidCP=Send leave request
ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Rifiuta la richiesta
+TitleRefuseCP=Refuse the leave request
ConfirmRefuseCP=Are you sure you want to refuse the leave request?
NoMotifRefuseCP=Devi indicare un motivo per il rifiuto.
-TitleCancelCP=Annulla la richiesta
+TitleCancelCP=Cancel the leave request
ConfirmCancelCP=Are you sure you want to cancel the leave request?
DetailRefusCP=Motivo del rifiuto
DateRefusCP=Data del rifiuto
@@ -78,7 +77,7 @@ ActionByCP=Eseguito da
UserUpdateCP=Per l'utente
PrevSoldeCP=Saldo precedente
NewSoldeCP=Nuovo saldo
-alreadyCPexist=C'è già una richiesta per lo stesso periodo.
+alreadyCPexist=A leave request has already been done on this period.
UserName=Nome
Employee=Dipendente
FirstDayOfHoliday=First day of vacation
@@ -88,25 +87,25 @@ ManualUpdate=Aggiornamento manuale
HolidaysCancelation=Leave request cancelation
## Configuration du Module ##
-ConfCP=Configurazione del modulo ferie
+ConfCP=Configuration of leave request module
DescOptionCP=Descrizione dell'opzione
ValueOptionCP=Valore
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
ConfirmConfigCP=Convalida la configurazione
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
UpdateConfCPOK=Aggiornato con successo
ErrorUpdateConfCP=Si è verificato un errore nell'aggiornamento, riprovare.
-AddCPforUsers=Aggiornare le ferie residue dell'utente <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">facendo click qui</a>.
-DelayForSubmitCP=Scadenza per l'inoltro di richieste ferie
-AlertapprobatortorDelayCP=Impedisci l'approvazione delle ferie se la richiesta non corrisponde alla deadline
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
Module27130Name= Management of leave requests
Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
TitleOptionEventCP=Settings of leave requets for events
ValidEventCP=Convalida
UpdateEventCP=Aggiorna eventi
diff --git a/htdocs/langs/it_IT/interventions.lang b/htdocs/langs/it_IT/interventions.lang
index 0ac023215ce967ca006ead6fe09319aab589ba78..3257a4c01cd04b3da3adbeb3fb9c1b52b87c26bd 100644
--- a/htdocs/langs/it_IT/interventions.lang
+++ b/htdocs/langs/it_IT/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Intervento
Interventions=Interventi
InterventionCard=Scheda intervento
NewIntervention=Nuovo intervento
-AddIntervention=Aggiungi intervento
+AddIntervention=Crea intervento
ListOfInterventions=Elenco degli interventi
EditIntervention=Modifica intervento
ActionsOnFicheInter=Azioni di intervento
@@ -24,12 +24,21 @@ NameAndSignatureOfInternalContact=Nome e firma del partecipante:
NameAndSignatureOfExternalContact=Nome e firma del cliente:
DocumentModelStandard=Modello documento standard per gli interventi
InterventionCardsAndInterventionLines=Interventi e righe degli interventi
-InterventionClassifyBilled=Classify "Billed"
-InterventionClassifyUnBilled=Classify "Unbilled"
+InterventionClassifyBilled=Classifica come "Fatturato"
+InterventionClassifyUnBilled=Classifica come "Non fatturato"
StatusInterInvoiced=Fatturato
RelatedInterventions=Interventi correlati
ShowIntervention=Mostra intervento
SendInterventionRef=Invio di intervento %s
+SendInterventionByMail=Invia intervento via email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Responsabile follow-up per l'intervento
TypeContact_fichinter_internal_INTERVENING=Intervento effettuato da
diff --git a/htdocs/langs/it_IT/mails.lang b/htdocs/langs/it_IT/mails.lang
index 2d67e314cbbb7b81f5e3767bc14dd2f09d6c8cc6..9e5b6c2148085a593a2e9c997f462a1277b14481 100644
--- a/htdocs/langs/it_IT/mails.lang
+++ b/htdocs/langs/it_IT/mails.lang
@@ -115,7 +115,7 @@ SentBy=Inviato da
MailingNeedCommand=Per motivi di sicurezza è preveribile inviare mail di massa da linea di comando. Se possibile chiedi all amministratore del server di eseguire il seguente comando per inivare le mail a tutti i destinatari:
MailingNeedCommand2=Puoi inviare comunque online aggiungendo il parametro MAILING_LIMIT_SENDBYWEB impostato al valore massimo corrispondente al numero di email che si desidera inviare durante una sessione.
ConfirmSendingEmailing=Se non puoi o preferisci inviarle dal tuo browser web, perfavore confermi che sei sicuro che vuoi inviare adesso le mail dal tuo browser?
-LimitSendingEmailing=Nota: L'invio di email è soggetto a limitazioni per ragioni di sicurezza e di timeout a <b>%s</b> destinatari per ogni sessione di invio
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=Cancella elenco
ToClearAllRecipientsClickHere=Per cancellare l'elenco destinatari per questa email, cliccare sul pulsante
ToAddRecipientsChooseHere=Per aggiungere i destinatari, scegliere da questi elenchi
@@ -133,6 +133,9 @@ Notifications=Notifiche
NoNotificationsWillBeSent=Non sono previste notifiche per questo evento o società
ANotificationsWillBeSent=Verrà inviata una notifica via email
SomeNotificationsWillBeSent=%s notifiche saranno inviate via email
-AddNewNotification=Attivare una nuova richiesta di notifica
-ListOfActiveNotifications=Elenco delle notifiche attive
+AddNewNotification=Attiva una nuova richiesta di notifica via email
+ListOfActiveNotifications=Mostra tutte le richieste di notifica via email attive
ListOfNotificationsDone=Elenco delle notifiche spedite per email
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang
index 2ec03c3a1e38011a062bb6dda6f72d2df6eae7ff..233e071224984485aa7019485c96f701dae2510a 100644
--- a/htdocs/langs/it_IT/main.lang
+++ b/htdocs/langs/it_IT/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Impossibile trovare l'utente <b>%s</b> nel
ErrorNoVATRateDefinedForSellerCountry=Errore, non sono state definite le aliquote IVA per: <b>%s</b>.
ErrorNoSocialContributionForSellerCountry=Errore, non sono stati definiti i tipi di contributi per: <b>%s</b>.
ErrorFailedToSaveFile=Errore, file non salvato.
-ErrorOnlyPngJpgSupported=Errore, sono supportati solo i formati png e jpg.
-ErrorImageFormatNotSupported=PHP non supporta funzioni per convertire immagini in questo formato.
SetDate=Imposta data
SelectDate=Seleziona una data
SeeAlso=Vedi anche %s
BackgroundColorByDefault=Colore di sfondo predefinito
+FileNotUploaded=Il file non è stato caricato
+FileUploaded=Il file è stato caricato con successo
FileWasNotUploaded=Il file selezionato per l'upload non è stato ancora caricato. Clicca su <b>Allega file</b> per farlo
NbOfEntries=Numero di voci
GoToWikiHelpPage=Leggi la guida in linea (Su internet)
@@ -188,8 +188,8 @@ MultiLanguage=Multilingua
Note=Nota
CurrentNote=Nota corrente
Title=Titolo
-Label=Etichetta
-RefOrLabel=Rif. o etichetta
+Label=Titolo
+RefOrLabel=Rif. o titolo
Info=Info
Family=Famiglia
Description=Descrizione
@@ -266,6 +266,7 @@ Afternoon=Pomeriggio
Quadri=Trimestre
MonthOfDay=Mese del giorno
HourShort=Ora
+MinuteShort=min
Rate=Tariffa
UseLocalTax=Tasse incluse
Bytes=Byte
@@ -340,6 +341,7 @@ FullList=Elenco completo
Statistics=Statistiche
OtherStatistics=Altre statistiche
Status=Stato
+Favorite=Preferito
ShortInfo=Info.
Ref=Rif.
RefSupplier=Rif. fornitore
@@ -365,6 +367,7 @@ ActionsOnCompany=Azioni sul soggetto terzo
ActionsOnMember=Azioni su questo membro
NActions=%s azioni
NActionsLate=%s azioni in ritardo
+RequestAlreadyDone=Request already recorded
Filter=Filtro
RemoveFilter=Rimuovi filtro
ChartGenerated=Grafico generato
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Impostazione attributi extra
URLPhoto=URL foto/logo
SetLinkToThirdParty=Collega ad altro soggetto terzo
CreateDraft=Crea bozza
+SetToDraft=Ritorna a bozza
ClickToEdit=Clicca per modificare
ObjectDeleted=Oggetto %s eliminato
ByCountry=Per paese
@@ -678,7 +682,7 @@ ViewPrivateNote=Vedi note
XMoreLines=%s linea(e) nascoste
PublicUrl=URL pubblico
AddBox=Aggiungi box
-
+SelectElementAndClickRefresh=Seleziona un elemento e clicca Aggiorna
# Week day
Monday=Lunedì
Tuesday=Martedì
diff --git a/htdocs/langs/it_IT/margins.lang b/htdocs/langs/it_IT/margins.lang
index 34437cd4d58c2f6f11a309ed3166a4f7eab33662..aa4a9f6ab557cba89535c5b7430406eb19ad6829 100644
--- a/htdocs/langs/it_IT/margins.lang
+++ b/htdocs/langs/it_IT/margins.lang
@@ -38,4 +38,7 @@ BuyingCost=Prezzo di costo
UnitCharges=Carico unitario
Charges=Carichi
AgentContactType=Tipo di contatto per i mandati di vendita
-AgentContactTypeDetails=Definisci che tipo di contatto (connesso alle fatture) associare agli agenti commerciali
+AgentContactTypeDetails=Definisci quali tipi di contatto (collegati alle fatture) saranno utilizzati per i report per ciascun rappresentante di vendita
+rateMustBeNumeric=Il rapporto deve essere un numero
+markRateShouldBeLesserThan100=Il rapporto deve essere inferiore a 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/it_IT/orders.lang b/htdocs/langs/it_IT/orders.lang
index 449d6c6d0701b3f12d003c52f0be8e6b5fcb8524..0e4bfada2ce96ec07c26dec72340ae98ddf585ec 100644
--- a/htdocs/langs/it_IT/orders.lang
+++ b/htdocs/langs/it_IT/orders.lang
@@ -53,7 +53,7 @@ ShippingExist=Esiste una spedizione
DraftOrWaitingApproved=In bozza o approvato, ma non ancora ordinato
DraftOrWaitingShipped=In bozza o convalidato, ma non ancora spedito
MenuOrdersToBill=Ordini spediti
-MenuOrdersToBill2=Ordini da fatturare
+MenuOrdersToBill2=Billable orders
SearchOrder=Ricerca ordine
SearchACustomerOrder=Cerca un ordine cliente
ShipProduct=Spedisci prodotto
@@ -65,7 +65,7 @@ ValidateOrder=Convalida ordine
UnvalidateOrder=Invalida ordine
DeleteOrder=Elimina ordine
CancelOrder=Annulla ordine
-AddOrder=Aggiungi ordine
+AddOrder=Crea ordine
AddToMyOrders=Aggiungi ai miei ordini
AddToOtherOrders=Aggiungi ad altri ordini
AddToDraftOrders=Aggiungi ad una bozza d'ordine
@@ -154,7 +154,6 @@ OrderByPhone=Telefono
CreateInvoiceForThisCustomer=Ordini da fatturare
NoOrdersToInvoice=Nessun ordine fatturabile
CloseProcessedOrdersAutomatically=Classifica come "Lavorati" tutti gli ordini selezionati
-MenuOrdersToBill2=Ordini da fatturare
OrderCreation=Creazione di ordine
Ordered=Ordinato
OrderCreated=I tuoi ordini sono stati creati
diff --git a/htdocs/langs/it_IT/oscommerce.lang b/htdocs/langs/it_IT/oscommerce.lang
deleted file mode 100644
index 7d95f16abd9033bca3bc7852cbc20cb55527f6a4..0000000000000000000000000000000000000000
--- a/htdocs/langs/it_IT/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=Impostazioni modulo OS Commerce
-OSCommerceSetupSaved=Impostazioni OS Commerce salvate
-OSCommerceServer=Host/IP del server OS Commerce
-OSCommerceDatabaseName=Nome database OS Commerce
-OSCommercePrefix=Prefisso tabelle database OS Commerce
-OSCommerceUser=Nome utente per il database di OS Commerce
diff --git a/htdocs/langs/it_IT/other.lang b/htdocs/langs/it_IT/other.lang
index fa0495ebc9cf30b31613fac418b12a142a6b8e07..156441b3cd868868207f16e667329b2a4cf6ed3e 100644
--- a/htdocs/langs/it_IT/other.lang
+++ b/htdocs/langs/it_IT/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=Codice di sicurezza
Calendar=Calendario
-AddTrip=Aggiungi viaggio
Tools=Strumenti
ToolsDesc=Quest'area è dedicata agli strumenti di gruppo non disponibili in varie voci di menu.<br/><br/>Questi strumenti sono raggiungibili dal menu laterale.
Birthday=Compleanno
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Creazione del progetto
Notify_TASK_CREATE=Attività creata
Notify_TASK_MODIFY=Attività modificata
Notify_TASK_DELETE=Attività cancellata
+SeeModuleSetup=See module setup
NbOfAttachedFiles=Numero di file/documenti allegati
TotalSizeOfAttachedFiles=Dimensione totale dei file/documenti allegati
MaxSize=La dimensione massima è
@@ -57,12 +57,12 @@ Miscellaneous=Varie
NbOfActiveNotifications=Numero di notifiche attive
PredefinedMailTest=Questa è una mail di prova. \\NLe due linee sono separate da un a capo.
PredefinedMailTestHtml=Questa è una mail <b>di test</b> (la parola test deve risultare in grassetto).<br/> Le due linee sono separate da un a capo.
-PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nAlleghiamo la fattura __FACREF__\n\n__PERSONALIZED__Cordiali saluti\n\n__SIGNATURE__
+PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nGentile Cliente,\nin allegato trova la nostra fattura numero __FACREF__\n\n__PERSONALIZED__Cordiali saluti\n\nIl presente invio SOSTITUISCE INTEGRALMENTE quello effettuato in modo tradizionale a mezzo servizio postale.\n\nTale operazione è ammessa dalla normativa fiscale in essere, relativa alla "Trasmissione delle Fatture" per via Telematica:\nR.M. n. 571134 del 19/07/88 - (posta elettronica);\nR.M. n. 450217 del 30/07/90 - (procedure informatizzate);R.M. n. 107 del 04/07/01 - (trasmissione atture);\nR.M. n. 202/E del 04/12/01 - (archiviazione fatture).\nRisoluzioni che forniscono chiarimenti in ordine alle condizioni necessarie per l'ammissibilità ai sensi dell'art. 21 D.P.R. 26/10/72, n.633, della procedura di trasmissione e memorizzazione delle fatture mediante sistemi combinati fondati sull'impiego congiunto di supporti informatici, telefax\ne posta elettronica.\n\n È necessario GENERARNE UNA STAMPA e procedere alla relativa archiviazione come da prassi a norma di legge.\n\nRimaniamo a completa disposizione per qualsiasi informazione.\n\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ \nVorremmo portare alla Vostra attenzione che la fattura __FACREF__ sembra non essere stata saldata. La fattura è allegata alla presente, come promemoria.\n\n__PERSONALIZED__Cordiali Saluti\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nAlleghiamo la proposta commerciale __PROPREF__ \n\n__PERSONALIZED__ Cordiali Saluti\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nAlleghiamo l'ordine __ORDERREF__\n\n__PERSONALIZED__ Cordiali Saluti\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nAlleghiamo il nostro ordine __ORDERREF__\n\n__PERSONALIZED__Cordiali Saluti\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nAlleghiamo la fattura __FACREF__\n\n__PERSONALIZED__Cordiali Saluti\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nGentile Cliente,\nin allegato trova la nostra fattura __FACREF__\n\n__PERSONALIZED__Cordiali Saluti\n\nIl presente invio SOSTITUISCE INTEGRALMENTE quello effettuato in modo tradizionale a mezzo servizio postale.\n\nTale operazione è ammessa dalla normativa fiscale in essere, relativa alla "Trasmissione delle Fatture" per via Telematica:\nR.M. n. 571134 del 19/07/88 - (posta elettronica);\nR.M. n. 450217 del 30/07/90 - (procedure informatizzate);R.M. n. 107 del 04/07/01 - (trasmissione atture);\nR.M. n. 202/E del 04/12/01 - (archiviazione fatture).\nRisoluzioni che forniscono chiarimenti in ordine alle condizioni necessarie per l'ammissibilità ai sensi dell'art. 21 D.P.R. 26/10/72, n.633, della procedura di trasmissione e memorizzazione delle fatture mediante sistemi combinati fondati sull'impiego congiunto di supporti informatici, telefax\ne posta elettronica.\n\n È necessario GENERARNE UNA STAMPA e procedere alla relativa archiviazione come da prassi a norma di legge.\n\nRimaniamo a completa disposizione per qualsiasi informazione.\n\n__SIGNATURE__
PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nAlleghiamo il documento di trasporto __SHIPPINGREF__\n\n__PERSONALIZED__Cordiali Saluti\n\n__SIGNATURE__
PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nAlleghiamo l'intervento __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
@@ -80,6 +80,16 @@ ModifiedBy=Modificato da %s
ValidatedBy=Convalidato da %s
CanceledBy=Annullato da %s
ClosedBy=Chiuso da %s
+CreatedById=Id utente che ha creato
+ModifiedById=Id utente che ha effettuato l'ultima modifica
+ValidatedById=Id utente che ha validato
+CanceledById=Id utente che ha cancellato
+ClosedById=Id utente che ha chiuso
+CreatedByLogin=Id utente che ha creato
+ModifiedByLogin=Login utente che ha effettuato l'ultima modifica
+ValidatedByLogin=Login utente che ha validato
+CanceledByLogin=Login utente che ha cancellato
+ClosedByLogin=Login utente che ha chiuso
FileWasRemoved=Il file è stato eliminato
DirWasRemoved=La directory è stata rimossa
FeatureNotYetAvailableShort=Disponibile in una versione successiva
@@ -193,25 +203,26 @@ ForgetIfNothing=Se non hai richiesto questo cambio, lascia perdere questa mail.
##### Calendar common #####
AddCalendarEntry=Aggiungi evento al calendario %s
-NewCompanyToDolibarr=Azienda %s aggiunta su Dolibarr
-ContractValidatedInDolibarr=Contratto %s convalidato su Dolibarr
-ContractCanceledInDolibarr=Contratto %s annullato su Dolibarr
-ContractClosedInDolibarr=Contratto %s chiuso su Dolibarr
-PropalClosedSignedInDolibarr=%s proposte firmate in Dolibarr
-PropalClosedRefusedInDolibarr=%s proposte rifiutate in Dolibarr
-PropalValidatedInDolibarr=%s proposte convalidate in Dolibarr
-InvoiceValidatedInDolibarr=Fattura %s convalidata su Dolibarr
-InvoicePaidInDolibarr=Fattura %s pagata su Dolibarr
-InvoiceCanceledInDolibarr=Fattura %s annullata su Dolibarr
-PaymentDoneInDolibarr=Pagamenti %s fatto su Dolibarr
-CustomerPaymentDoneInDolibarr=Pagamento cliente %s fatto su Dolibarr
-SupplierPaymentDoneInDolibarr=%s pagamenti ai fornitori in Dolibarr
-MemberValidatedInDolibarr=Membro %s convalidato su Dolibarr
-MemberResiliatedInDolibarr=Membro %s revocato su Dolibarr
-MemberDeletedInDolibarr=Membro eliminato da Dolibarr
-MemberSubscriptionAddedInDolibarr=Adesione membro %s aggiunta a Dolibarr
-ShipmentValidatedInDolibarr=%s spedizioni convalidate in Dolibarr
-ShipmentDeletedInDolibarr=Spedizione %s cancellate
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
##### Export #####
Export=Esportazione
ExportsArea=Area esportazioni
diff --git a/htdocs/langs/it_IT/paybox.lang b/htdocs/langs/it_IT/paybox.lang
index d52755de1200e99b76840daa238593171d855505..29db612c9bea0a9e4e68187cf5481f7350342b46 100644
--- a/htdocs/langs/it_IT/paybox.lang
+++ b/htdocs/langs/it_IT/paybox.lang
@@ -35,3 +35,6 @@ MessageKO=Messaggio sulla pagina di pagamento annullato
NewPayboxPaymentReceived=Nuovo pagamento Paybox ricevuto
NewPayboxPaymentFailed=Nuovo tentativo di pagamento Paybox ma fallito
PAYBOX_PAYONLINE_SENDEMAIL=Email di avviso dopo il pagamento (a buon fine o no)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/it_IT/resource.lang b/htdocs/langs/it_IT/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..d64075dfbf595897a63e3eebf19194d8f71030dd
--- /dev/null
+++ b/htdocs/langs/it_IT/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
diff --git a/htdocs/langs/it_IT/sendings.lang b/htdocs/langs/it_IT/sendings.lang
index cb2335390d6d6e1287fb95dfea26cde6dca79082..96c7036a771b0b27cb9d076f9df82322c2eb14f1 100644
--- a/htdocs/langs/it_IT/sendings.lang
+++ b/htdocs/langs/it_IT/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=Per il momento, la creazione di una nuova spediz
RelatedShippings=Spedizioni collegate
ShipmentLine=Filiera di spedizione
CarrierList=Elenco dei trasportatori
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
# Sending methods
SendingMethodCATCH=Ritiro da parte del Cliente
@@ -74,5 +76,5 @@ SumOfProductVolumes=Totale volume prodotti
SumOfProductWeights=Totale peso prodotti
# warehouse details
-DetailWarehouseNumber= Warehouse details
-DetailWarehouseFormat= W:%s (Qty : %d)
+DetailWarehouseNumber= Dettagli magazzino
+DetailWarehouseFormat= Peso:%s (Qtà : %d)
diff --git a/htdocs/langs/it_IT/stocks.lang b/htdocs/langs/it_IT/stocks.lang
index d5dab356e1270942e807d669f63936f8c70329cc..0b5b610b2b643d8cfab247908c76387ae5f78d9b 100644
--- a/htdocs/langs/it_IT/stocks.lang
+++ b/htdocs/langs/it_IT/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Etichetta del magazzino mancante
CorrectStock=Scorte di magazzino corrette
ListOfWarehouses=Elenco magazzini
ListOfStockMovements=Elenco movimenti delle scorte
-StocksArea=Area scorte di magazzino
+StocksArea=Warehouses area
Location=Ubicazione
LocationSummary=Ubicazione abbreviata
NumberOfDifferentProducts=Numero di differenti prodotti
diff --git a/htdocs/langs/it_IT/users.lang b/htdocs/langs/it_IT/users.lang
index 9a4c183cfca5ad183e11e3989f61ea92fad3da6f..2f75b5f6094b1c52cdb9423b7673ac50a89c4149 100644
--- a/htdocs/langs/it_IT/users.lang
+++ b/htdocs/langs/it_IT/users.lang
@@ -63,7 +63,6 @@ ShowGroup=Visualizza gruppo
ShowUser=Visualizza utente
NonAffectedUsers=Utenti non interessati
UserModified=Utente modificato con successo
-GroupModified=Gruppo modificato con successo
PhotoFile=File Immagine
UserWithDolibarrAccess=Utente con accesso Dolibarr
ListOfUsersInGroup=Elenco utenti in questo gruppo
@@ -103,7 +102,7 @@ UserDisabled=Utente %s disattivato
UserEnabled=Utente %s attivato
UserDeleted=Utente %s rimosso
NewGroupCreated=Gruppo %s creato
-GroupModified=Gruppo modificato con successo
+GroupModified=Group %s modified
GroupDeleted=Gruppo %s rimosso
ConfirmCreateContact=Vuoi davvero creare un account Dolibarr per questo contatto?
ConfirmCreateLogin=Vuoi davvero creare l'account?
@@ -114,8 +113,10 @@ YourRole=Il tuo ruolo
YourQuotaOfUsersIsReached=Hai raggiunto la tua quota di utenti attivi!
NbOfUsers=Numero di utenti
DontDowngradeSuperAdmin=Solo un superadmin può declassare un superadmin
-HierarchicalResponsible=Responsabile gerarchico
+HierarchicalResponsible=Supervisore
HierarchicView=Vista gerarchica
UseTypeFieldToChange=cambia usando il campo Tipo
OpenIDURL=URL OpenID
LoginUsingOpenID=URL OpenID per il login
+WeeklyHours=Ore settimanali
+ColorUser=Colore dell'utente
diff --git a/htdocs/langs/it_IT/withdrawals.lang b/htdocs/langs/it_IT/withdrawals.lang
index fd19170c5f402d394c34e6c7b5dff8b6aad8da6f..9158af3aed861bdd5c196cd2cba479093dc6ca47 100644
--- a/htdocs/langs/it_IT/withdrawals.lang
+++ b/htdocs/langs/it_IT/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=Ricevuta
LastWithdrawalReceipts=Ultime %s ricevute di domiciliazione
WithdrawedBills=Fatture delle domiciliazioni
WithdrawalsLines=Righe dei domiciliazioni
-RequestStandingOrderToTreat=Richiesta ordini permanenti da trattare
-RequestStandingOrderTreated=Richiesta ordini permanenti trattati
+RequestStandingOrderToTreat=Request for standing orders to process
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=Ordini permanenti clienti
CustomerStandingOrder=Ordine permanente cliente
NbOfInvoiceToWithdraw=Numero di fattura con richiesta di prelievo
@@ -40,14 +41,13 @@ TransMetod=Metodo di trasmissione
Send=Invia
Lines=Righe
StandingOrderReject=Invia rifiuto
-InvoiceRefused=Fattura rifiutata
WithdrawalRefused=Bonifici rifiutati
WithdrawalRefusedConfirm=Vuoi davvero inserire un rifiuto per la società?
RefusedData=Data del rifiuto
RefusedReason=Motivo del rifiuto
RefusedInvoicing=Fatturazione rifiutata
NoInvoiceRefused=Non ricaricare il rifiuto
-InvoiceRefused=Fattura rifiutata
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=Stato
StatusUnknown=Sconosciuto
StatusWaiting=In attesa
@@ -76,7 +76,7 @@ WithBankUsingRIB=Per i conti correnti bancari che utilizzano RIB
WithBankUsingBANBIC=Per conti bancari che utilizzano IBAN/BIC/SWIFT
BankToReceiveWithdraw=Conto corrente bancario per il domiciliazione
CreditDate=Data di accredito
-WithdrawalFileNotCapable=Impossibile generare file di ricevuta per il vostro paese
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
ShowWithdraw=Mostra domiciliazione
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Tuttavia, se per la fattura ci sono ancora pagamenti da elaborare, non sarà impostata come pagata per consentire prima la gestione dei domiciliazioni.
DoStandingOrdersBeforePayments=Questa scheda consente di richiedere un ordine permanente. Una volta finito, è possibile inserire il pagamento per chiudere la fattura.
diff --git a/htdocs/langs/ja_JP/accountancy.lang b/htdocs/langs/ja_JP/accountancy.lang
index 8cab9d2b651d75b0721d76fda619e2034e4509b4..39c2732ec29852cf93d41614ed1812c2a4c1ce4f 100644
--- a/htdocs/langs/ja_JP/accountancy.lang
+++ b/htdocs/langs/ja_JP/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts
Validate=Validate
Addanaccount=Add an accounting account
AccountAccounting=Accounting account
-Ventilation=Ventilation
+Ventilation=Breakdown
ToDispatch=To dispatch
Dispatched=Dispatched
-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
TradeMargin=Trade margin
Reports=Reports
ByCustomerInvoice=By invoices customers
@@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger
Bookkeeping=General ledger
AccountBalanceByMonth=Account balance by month
-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
Line=Line
CAHTF=Total purchase supplier HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice
IntoAccount=In the accounting account
Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
+VentilationAuto=Automatic breakdown
Processing=Processing
EndProcessing=The end of processing
@@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account
ACCOUNTING_SEPARATORCSV=Separator CSV
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
@@ -140,14 +140,14 @@ Active=Statement
NewFiscalYear=New fiscal year
-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
TotalVente=Total turnover HT
TotalMarge=Total sales margin
DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
ChangeAccount=Change the accounting account for lines selected by the account:
Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
@@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically
ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index afa19d9eb9cc967e6e28c26a81f7e6d080593260..8244aa168a4cf0020e1dc35d78d07ade7ee41703 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -437,8 +437,8 @@ Module52Name=ストック
Module52Desc=製品の在庫の管理
Module53Name=サービス
Module53Desc=サービスの管理
-Module54Name=契約
-Module54Desc=契約のサービスの管理
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=バーコード
Module55Desc=バーコードの管理
Module56Name=テレフォニー
@@ -475,8 +475,8 @@ Module320Name=RSSフィード
Module320Desc=Dolibarr画面のページ内でRSSフィードを追加
Module330Name=ブックマーク
Module330Desc=ブックマークの管理
-Module400Name=プロジェクト
-Module400Desc=他のモジュール内のプロジェクトの管理
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=のwebcalendar
Module410Desc=のwebcalendar統合
Module500Name=Special expenses (tax, social contributions, dividends)
@@ -484,7 +484,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di
Module510Name=Salaries
Module510Desc=Management of employees salaries and payments
Module600Name=通知
-Module600Desc=サードパーティの連絡先にいくつかのDolibarrのビジネスイベントを電子メールで通知を送信
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=寄付
Module700Desc=寄付金の管理
Module1200Name=カマキリ
@@ -514,16 +514,16 @@ Module5000Name=マルチ会社
Module5000Desc=あなたが複数の企業を管理することができます
Module6000Name=Workflow
Module6000Desc=Workflow management
-Module20000Name=Holidays
-Module20000Desc=Declare and follow employees holidays
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
Module39000Name=Product batch
Module39000Desc=Batch number, eat-by and sell-by date management on products
Module50000Name=切符売り場
Module50000Desc=切符売り場でクレジットカードによるオンライン決済のページを提供するモジュール
Module50100Name=売上高のポイント
Module50100Desc=販売モジュールのポイント
-Module50200Name= ペイパル
-Module50200Desc= Paypalとクレジットカードによるオンライン決済のページを提供するモジュール
+Module50200Name=ペイパル
+Module50200Desc=Paypalとクレジットカードによるオンライン決済のページを提供するモジュール
Module50400Name=Accounting (advanced)
Module50400Desc=Accounting management (double parties)
Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=立って注文を読み取る
Permission152=立っている注文要求を作成する/変更
Permission153=伝送に立って注文の領収書
Permission154=クレジット/拒否立って注文の領収書
-Permission161=契約をお読みください
-Permission162=契約書を作成/変更
-Permission163=契約のサービスをアクティブにする
-Permission164=契約のサービスを無効にします。
-Permission165=契約を削除する
-Permission171=出張を読む
-Permission172=ツアーを作成/変更
-Permission173=ツアーを削除します。
-Permission178=輸出旅行
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Read trips and expenses (own and his subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
Permission180=仕入先を読む
Permission181=サプライヤーの受注を読む
Permission182=作成/変更サプライヤーの受注
@@ -671,7 +672,7 @@ Permission300=バーコードを読み取る
Permission301=バーコードを作成/変更
Permission302=バーコードを削除します。
Permission311=サービスを読む
-Permission312=契約にサービスを割り当てる
+Permission312=Assign service/subscription to contract
Permission331=ブックマークを読み込む
Permission332=ブックマークを作成/変更
Permission333=ブックマークを削除
@@ -701,8 +702,8 @@ Permission701=寄付を読む
Permission702=寄付を作成/変更
Permission703=寄付を削除します。
Permission1001=株式を読む
-Permission1002=株を作成/変更
-Permission1003=銘柄を削除します。
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=株式の動きを読む
Permission1005=株式の動きを作成/変更
Permission1101=配信の注文をお読みください
@@ -1038,7 +1039,6 @@ YesInSummer=Yes in summer
OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
SuhosinSessionEncrypt=Session storage encrypted by Suhosin
ConditionIsCurrently=Condition is currently %s
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
YouUseBestDriver=You use driver %s that is best driver available currently.
YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=によって建てられた会計コードを返しま
ModuleCompanyCodePanicum=空の会計コードを返します。
ModuleCompanyCodeDigitaria=会計コードがサードパーティのコードに依存しています。コードは、文字サードパーティのコードの最初の5文字が続く最初の位置に "C"で構成されています。
UseNotifications=通知を使用する
-NotificationsDesc=電子メール通知機能を使用すると、静かにするように構成されている第三者（顧客またはサプライヤー）に、いくつかのDolibarrイベントを、自動メールを送信することができます。アクティブな通知とターゲットの連絡先の選択は、一度に1つのサードパーティ製されています。
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
ModelModules=ドキュメントテンプレート
DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
WatermarkOnDraft=ドラフト文書に透かし
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=配達日の能力を追加します。
UseOptionLineIfNoQuantity=ゼロ量と製品/サービスのラインは、オプションとして考えられている
FreeLegalTextOnProposal=商業的な提案でフリーテキスト
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=注文の管理セットアップ
OrdersNumberingModules=モジュールの番号受注
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list
ValidOrderAfterPropalClosed=、近くに提案した後に順序を検証するために、それは暫定的な順序でステップ実行しないように可能になります
FreeLegalTextOnOrders=受注上のフリーテキスト
WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
##### Clicktodial #####
ClickToDialSetup=モジュールのセットアップをダイヤルする]をクリックします
ClickToDialUrlDesc=電話ピクトをクリックしが行われるときに、URLと呼ばれる。 URLでは、タグを使用することができます<br>呼び出すために人の電話番号に置き換えられます<b>__PHONETO__</b> <br>呼び出し人の電話番号（あなた）に置き換えられます<b>__PHONEFROM__</b> <br>あなたのclicktodialログイン（ユーザーカードに定義されています）に置き換えられます<b>__LOGIN__</b> <br>あなたのclicktodialパスワード（ユーザーカードに定義されています）に置き換えられます<b>__PASS__。</b>
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=介入番号モジュール
TemplatePDFInterventions=介入カードのドキュメントモデル
WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
##### Contracts #####
-ContractsSetup=契約のモジュールのセットアップ
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=モジュールの番号付けの契約
TemplatePDFContracts=Contracts documents models
FreeLegalTextOnContracts=Free text on contracts
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
CacheByServer=Cache by server
CacheByClient=Cache by browser
CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=製品モジュールのセットアップ
ServiceSetup=サービスモジュールのセットアップ
@@ -1382,9 +1384,10 @@ MailingSetup=モジュールのセットアップをメールで送信
MailingEMailFrom=モジュールをメールで送信された電子メールの送信者メールアドレス（から）
MailingEMailError=エラーが発生した電子メールの電子メールを（エラー·ツー）を返します。
##### Notification #####
-NotificationSetup=通知BUメールモジュールのセットアップ
+NotificationSetup=EMail notification module setup
NotificationEMailFrom=通知の送信メールの送信者の電子メール（から）
-ListOfAvailableNotifications=利用可能な通知のリスト（このリストには、アクティブモジュールに依存します）
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
##### Sendings #####
SendingsSetup=送信モジュールのセットアップ
SendingsReceiptModel=領収書のモデルを送信する
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=ユーザー '%s'成功したデータベース "%s"
OSCommerceTestKo1=サーバー '%s'への接続が成功しますが、データベース '%s'は到達できませんでした。
OSCommerceTestKo2=ユーザー '%s'でサーバー '%s'への接続に失敗しました。
##### Stock #####
-StockSetup=コンフィギュレーションモジュールの株式
-UserWarehouse=ユーザー個人の株式を使用
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=メニューを削除
TreeMenu=ツリーメニュー
@@ -1478,11 +1482,14 @@ ClickToDialDesc=このモジュールは、電話番号の後にアイコンを
##### Point Of Sales (CashDesk) #####
CashDesk=売上高のポイント
CashDeskSetup=販売モジュールのセットアップのポイント
-CashDeskThirdPartyForSell=販売して使用する一般的なサードパーティ
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=現金支払いを受け取るために使用するデフォルトのアカウント
CashDeskBankAccountForCheque= 小切手による支払いを受け取るために使用するデフォルトのアカウント
CashDeskBankAccountForCB= クレジットカードでの現金支払いを受け取るために使用するデフォルトのアカウント
-CashDeskIdWareHouse=販売して使用する倉庫
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=モジュールのセットアップをブックマーク
BookmarkDesc=このモジュールは、ブックマークを管理することができます。また、あなたの左のメニュー上の任意のDolibarrページまたはexternale Webサイトへのショートカットを追加することができます。
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Delete fiscal year
ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
Opened=Opened
Closed=Closed
-
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
diff --git a/htdocs/langs/ja_JP/agenda.lang b/htdocs/langs/ja_JP/agenda.lang
index 22464bdc31a31fbeceb81babbc051a325aaf3d87..8492595eac6af2dcc5bede71ab3d8d592fac7879 100644
--- a/htdocs/langs/ja_JP/agenda.lang
+++ b/htdocs/langs/ja_JP/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= 議題の自動充填
AgendaAutoActionDesc= ここではDolibarrが自動的に議題でイベントを作成するイベントを定義します。何も（デフォルトで）チェックされていない場合のみ、手動アクションが議題に含まれています。
AgendaSetupOtherDesc= このページでは、外部のカレンダーにあなたのDolibarrイベントのエクスポートを許可するオプションが用意されています（サンダーバード、Googleカレンダー、...）
AgendaExtSitesDesc=このページでは、Dolibarrの議題にそれらのイベントを表示するにはカレンダーの外部ソースを宣言することができます。
-ActionsEvents= Dolibarrが自動的に議題でアクションを作成する対象のイベント
-PropalValidatedInDolibarr= 提案%sは、検証
-InvoiceValidatedInDolibarr= 請求書%sは、検証
+ActionsEvents=Dolibarrが自動的に議題でアクションを作成する対象のイベント
+PropalValidatedInDolibarr=提案%sは、検証
+InvoiceValidatedInDolibarr=請求書%sは、検証
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=請求書%sはドラフトの状態に戻って
InvoiceDeleteDolibarr=Invoice %s deleted
OrderValidatedInDolibarr= 注文%sは、検証
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=注文%sは、承認された
OrderRefusedInDolibarr=Order %s refused
OrderBackToDraftInDolibarr=注文%sは、ドラフトの状態に戻って
OrderCanceledInDolibarr=ご注文はキャンセル%s
-InterventionValidatedInDolibarr=介入%sは、検証
ProposalSentByEMail=電子メールで送信商業提案%s
OrderSentByEMail=電子メールで送信、顧客の注文%s
InvoiceSentByEMail=電子メールで送信顧客の請求書%s
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=電子メールで送信サプライヤの注文%s
SupplierInvoiceSentByEMail=電子メールで送信サプライヤの請求書%s
ShippingSentByEMail=電子メールで送信出荷%s
ShippingValidated= Shipping %s validated
-InterventionSentByEMail=電子メールで送信介入%s
-InterventionClassifiedBilled=Intervention %s classified as Billed
NewCompanyToDolibarr= 第三者が作成した
DateActionPlannedStart= 計画開始日
DateActionPlannedEnd= 計画終了日
@@ -70,9 +68,9 @@ DateActionStart= 開始日
DateActionEnd= 終了日
AgendaUrlOptions1=また、出力をフィルタリングするには、次のパラメータを追加することができます。
AgendaUrlOptions2=<b>ログインは= %s</b>に影響を受けた、またはユーザー<b>%s</b>によって行われ、作成されたアクションに出力を制限する。
-AgendaUrlOptions3=ユーザー<b>%s</b>によって作成されたアクションに出力を制限loginA <b>に= %s。</b>
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
AgendaUrlOptions4=ユーザー<b>%s</b>に影響を受けたアクションに出力を制限する<b>logint = %s。</b>
-AgendaUrlOptions5=ユーザー<b>%s</b>によって行われたアクションへの出力を制限する<b>logind = %s。</b>
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
AgendaShowBirthdayEvents=誕生日の連絡先を表示する
AgendaHideBirthdayEvents=誕生日の接点を隠す
Busy=Busy
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=。iCalファイルにアクセスするためのURL
ExtSiteNoLabel=全く説明がありません
WorkingTimeRange=Working time range
WorkingDaysRange=Working days range
-AddEvent=Add event
+AddEvent=Create event
MyAvailability=My availability
diff --git a/htdocs/langs/ja_JP/bills.lang b/htdocs/langs/ja_JP/bills.lang
index d73b54103b952d4a9bd33e33fbf87759a27d21ec..cf608e4a380fd8abfd0c6928f7c39af66bb7ac27 100644
--- a/htdocs/langs/ja_JP/bills.lang
+++ b/htdocs/langs/ja_JP/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=クレジットメモ
InvoiceAvoirAsk=請求書を訂正するためにクレジットノート
InvoiceAvoirDesc=<b>クレジット·ノートでは、</b>請求書が実際に支払った量よりも異なります（顧客がエラーによってあまりにも多くを支払った、または彼が例えば、いくつかの製品が返されましたので、完全に支払われないため）量を持っているという事実を解決するために使用される負の請求書です。
invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
-invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
ReplaceInvoice=請求書%sを交換してください
ReplacementInvoice=交換用の請求書
ReplacedByInvoice=請求書%sによって置き換えられ
@@ -87,7 +87,7 @@ ClassifyCanceled="放棄"を分類する
ClassifyClosed="クローズ"を分類する
ClassifyUnBilled=Classify 'Unbilled'
CreateBill=請求書を作成します。
-AddBill=請求書やクレジットメモを追加
+AddBill=Create invoice or credit note
AddToDraftInvoices=Add to draft invoice
DeleteBill=請求書を削除します。
SearchACustomerInvoice=顧客の請求書の検索
@@ -99,7 +99,7 @@ DoPaymentBack=戻って支払いを行う
ConvertToReduc=将来の割引に変換
EnterPaymentReceivedFromCustomer=顧客から受け取った支払を入力します。
EnterPaymentDueToCustomer=顧客のために支払いをする
-DisabledBecauseRemainderToPayIsZero=支払うために剰余がゼロになるので、無効に
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
Amount=量
PriceBase=価格ベース
BillStatus=請求書の状況
@@ -137,8 +137,6 @@ BillFrom=から
BillTo=請求する
ActionsOnBill=請求書上のアクション
NewBill=新しい請求書
-Prélèvements=立っているため、
-Prélèvements=立っているため、
LastBills=最後%sの請求書
LastCustomersBills=最後%sのお客様の請求書
LastSuppliersBills=最後%sサプライヤーの請求書
@@ -156,9 +154,9 @@ ConfirmCancelBill=あなたが請求書<b>%sを</b>キャンセルしてもよ
ConfirmCancelBillQuestion=なぜあなたは、この請求書 "放棄"を分類したいですか？
ConfirmClassifyPaidPartially=あなたが支払った状態に送り状<b>%sを</b>変更してもよろしいですか？
ConfirmClassifyPaidPartiallyQuestion=この請求書は完全に支払われていません。この請求書を閉じるには、あなたのための理由は何ですか？
-ConfirmClassifyPaidPartiallyReasonAvoir=支払うために残りの<b>（%s %s）は、</b>支払いが期間前になされたために付与された割引です。私はクレジットノートとVATを定例化する。
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=支払うために残りの<b>（%s %s）は、</b>支払いが期間前になされたために付与された割引です。私は、この割引に付加価値を失うことを受け入れる。
-ConfirmClassifyPaidPartiallyReasonDiscountVat=支払うために残りの<b>（%s %s）は、</b>支払いが期間前になされたために付与された割引です。 Iは、信用メモせずに、この割引にVATを回復します。
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
ConfirmClassifyPaidPartiallyReasonBadCustomer=悪い顧客
ConfirmClassifyPaidPartiallyReasonProductReturned=製品は、部分的に返される
ConfirmClassifyPaidPartiallyReasonOther=その他の理由で放棄された金額
@@ -191,9 +189,9 @@ AlreadyPaid=既に支払わ
AlreadyPaidBack=Already paid back
AlreadyPaidNoCreditNotesNoDeposits=すでに支払った（クレジットメモ、預金なし）
Abandoned=放棄された
-RemainderToPay=支払うために、残り
-RemainderToTake=取るために、残り
-RemainderToPayBack=Remainder to pay back
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
Rest=Pending
AmountExpected=量が主張
ExcessReceived=過剰は、受信した
@@ -219,19 +217,18 @@ NoInvoice=送り状なし
ClassifyBill=請求書の分類
SupplierBillsToPay=支払うために仕入先の請求書
CustomerBillsUnpaid=未払いの顧客の請求書
-DispenseMontantLettres=mechanographicalによって起草案は、文字の順序から除外されます
-DispenseMontantLettres=mechanographicalによって起草案は、文字の順序から除外されます
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=回復不可能
SetConditions=支払条件を設定します。
SetMode=支払いモードを設定する
Billed=請求
-RepeatableInvoice=事前に定義された請求書
-RepeatableInvoices=事前に定義された請求書
-Repeatable=事前に定義され
-Repeatables=事前に定義され
-ChangeIntoRepeatableInvoice=事前に定義されたに変換
-CreateRepeatableInvoice=事前定義された請求書を作成します。
-CreateFromRepeatableInvoice=事前に定義された請求書から作成
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
CustomersInvoicesAndInvoiceLines=顧客の請求書と請求書の行
CustomersInvoicesAndPayments=顧客の請求書と支払い
ExportDataset_invoice_1=顧客の請求書のリストと請求書の行
diff --git a/htdocs/langs/ja_JP/categories.lang b/htdocs/langs/ja_JP/categories.lang
index 901fa5f5068c837d48c697e2a804e3bebfd519be..697c8c985dc8230d39d65ac4dc939cb966444b3c 100644
--- a/htdocs/langs/ja_JP/categories.lang
+++ b/htdocs/langs/ja_JP/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories
CatCusLinks=Links between customers/prospects and categories
CatProdLinks=Links between products/services and categories
CatMemberLinks=Links between members and categories
-CatProdLinks=Links between products/services and categories
-CatCusLinks=Links between customers/prospects and categories
-CatSupLinks=Links between suppliers and categories
DeleteFromCat=Remove from category
DeletePicture=Picture delete
ConfirmDeletePicture=Confirm picture deletion?
@@ -112,3 +109,4 @@ CategoriesSetup=Categories setup
CategorieRecursiv=Link with parent category automatically
CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category
diff --git a/htdocs/langs/ja_JP/compta.lang b/htdocs/langs/ja_JP/compta.lang
index 156864f7bebcf0dbdd66135ea0c35998a98ee46b..4b385d678cd07bed203e3340dd9887af30fc9518 100644
--- a/htdocs/langs/ja_JP/compta.lang
+++ b/htdocs/langs/ja_JP/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=%sの悪い顧客の会計コード
SuppliersProductsSellSalesTurnover=サプライヤーの製品の販売によって生成された売上高。
CheckReceipt=入金を確認してください
CheckReceiptShort=入金を確認してください
+LastCheckReceiptShort=Last %s check receipts
NewCheckReceipt=新しい割引
NewCheckDeposit=新しいチェック預金
NewCheckDepositOn=%s：アカウント上で預金の領収書を作成する
diff --git a/htdocs/langs/ja_JP/contracts.lang b/htdocs/langs/ja_JP/contracts.lang
index f056617c84f9bf2f356a2ce2ca918dbf295c1403..b4e2e7ca76dc6e868c4f7c75b261880f5e8292bf 100644
--- a/htdocs/langs/ja_JP/contracts.lang
+++ b/htdocs/langs/ja_JP/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=契約面積
ListOfContracts=契約のリスト
-LastContracts=最後%sは、契約を変更
+LastModifiedContracts=Last %s modified contracts
AllContracts=すべての契約
ContractCard=契約のカード
ContractStatus=契約の状況
@@ -27,7 +27,7 @@ MenuRunningServices=実行中のサービス
MenuExpiredServices=期限切れのサービス
MenuClosedServices=閉じたサービス
NewContract=新規契約
-AddContract=契約を追加します。
+AddContract=Create contract
SearchAContract=契約を検索
DeleteAContract=契約を削除する
CloseAContract=契約を閉じます
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=実行中の契約品目のリスト
ListOfRunningServices=実行中のサービスのリスト
NotActivatedServices=非アクティブなサービス（検証済みの契約の中で）
BoardNotActivatedServices=検証済みの契約の中でアクティブにするサービス
-LastContracts=最後%sは、契約を変更
+LastContracts=Last % contracts
LastActivatedServices=最後%s活性化サービス
LastModifiedServices=最後%sは、サービスを変更
EditServiceLine=編集サービスライン
diff --git a/htdocs/langs/ja_JP/cron.lang b/htdocs/langs/ja_JP/cron.lang
index b3dd334e16a7a0dde643a3c3b79a4729a6638f09..98455e018ccbb9876261ec61f540fab47446be38 100644
--- a/htdocs/langs/ja_JP/cron.lang
+++ b/htdocs/langs/ja_JP/cron.lang
@@ -1,114 +1,86 @@
# Dolibarr language file - Source file is en_US - cron
-#
# About page
-#
About = 約
-# CronAbout = About Cron
-# CronAboutPage = Cron about page
-
-#
+CronAbout = About Cron
+CronAboutPage = Cron about page
# Right
-#
-# Permission23101 = Read Scheduled task
-# Permission23102 = Create/update Scheduled task
-# Permission23103 = Delete Scheduled task
-# Permission23104 = Execute Scheduled task
-
-#
+Permission23101 = Read Scheduled task
+Permission23102 = Create/update Scheduled task
+Permission23103 = Delete Scheduled task
+Permission23104 = Execute Scheduled task
# Admin
-#
-# CronSetup= Scheduled job management setup
-# URLToLaunchCronJobs=URL to check and launch cron jobs if required
-# OrToLaunchASpecificJob=Or to check and launch a specific job
-# KeyForCronAccess=Security key for URL to launch cron jobs
-# FileToLaunchCronJobs=Command line to launch cron jobs
-# CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes
-# CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
-
-
-#
+CronSetup= Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch cron jobs if required
+OrToLaunchASpecificJob=Or to check and launch a specific job
+KeyForCronAccess=Security key for URL to launch cron jobs
+FileToLaunchCronJobs=Command line to launch cron jobs
+CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
# Menu
-#
-# CronJobs=Scheduled jobs
-# CronListActive= List of active jobs
-# CronListInactive= List of disabled jobs
-# CronListActive= List of active jobs
-
-
-#
+CronJobs=Scheduled jobs
+CronListActive=List of active/scheduled jobs
+CronListInactive=List of disabled jobs
# Page list
-#
-# CronDateLastRun=Last run
-# CronLastOutput=Last run output
-# CronLastResult=Last result code
-# CronListOfCronJobs=List of scheduled jobs
-# CronCommand=Command
-# CronList=Jobs list
-# CronDelete= Delete cron jobs
-# CronConfirmDelete= Are you sure you want to delete this cron job ?
-# CronExecute=Launch job
-# CronConfirmExecute= Are you sure to execute this job now
-# CronInfo= Jobs allow to execute task that have been planned
-# CronWaitingJobs=Wainting jobs
-# CronTask=Job
+CronDateLastRun=Last run
+CronLastOutput=Last run output
+CronLastResult=Last result code
+CronListOfCronJobs=List of scheduled jobs
+CronCommand=Command
+CronList=Jobs list
+CronDelete= Delete cron jobs
+CronConfirmDelete= Are you sure you want to delete this cron job ?
+CronExecute=Launch job
+CronConfirmExecute= Are you sure to execute this job now
+CronInfo= Jobs allow to execute task that have been planned
+CronWaitingJobs=Wainting jobs
+CronTask=Job
CronNone= なし
CronDtStart=開始日
CronDtEnd=終了日
-# CronDtNextLaunch=Next execution
-# CronDtLastLaunch=Last execution
-# CronFrequency=Frequancy
-# CronClass=Classe
+CronDtNextLaunch=Next execution
+CronDtLastLaunch=Last execution
+CronFrequency=Frequancy
+CronClass=Classe
CronMethod=方法
CronModule=モジュール
-# CronAction=Action
+CronAction=Action
CronStatus=ステータス
CronStatusActive=使用可能
CronStatusInactive=無効にする
-# CronNoJobs=No jobs registered
+CronNoJobs=No jobs registered
CronPriority=優先順位
CronLabel=説明
-# CronNbRun=Nb. launch
-# CronEach=Every
-# JobFinished=Job launched and finished
-
-#
+CronNbRun=Nb. launch
+CronEach=Every
+JobFinished=Job launched and finished
#Page card
-#
-# CronAdd= Add jobs
-# CronHourStart= Start Hour and date of task
-# CronEvery= And execute task each
-# CronObject= Instance/Object to create
+CronAdd= Add jobs
+CronHourStart= Start Hour and date of task
+CronEvery= And execute task each
+CronObject= Instance/Object to create
CronArgs=パラメータ
-# CronSaveSucess=Save succesfully
+CronSaveSucess=Save succesfully
CronNote=コメント
-# CronFieldMandatory=Fields %s is mandatory
-# CronErrEndDateStartDt=End date cannot be before start date
-# CronStatusActiveBtn=Enable
+CronFieldMandatory=Fields %s is mandatory
+CronErrEndDateStartDt=End date cannot be before start date
+CronStatusActiveBtn=Enable
CronStatusInactiveBtn=無効にする
-# CronTaskInactive=This job is disabled
-# CronDtLastResult=Last result date
-# CronId=Id
-# CronClassFile=Classes (filename.class.php)
-# CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-# CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-# CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-# CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is <i>fecth</i>
-# CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-# CronCommandHelp=The system command line to execute.
-
-#
+CronTaskInactive=This job is disabled
+CronDtLastResult=Last result date
+CronId=Id
+CronClassFile=Classes (filename.class.php)
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
+CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronCommandHelp=The system command line to execute.
# Info
-#
-# CronInfoPage=Information
-
-
-#
+CronInfoPage=Information
# Common
-#
-# CronType=Task type
-# CronType_method=Call method of a Dolibarr Class
-# CronType_command=Shell command
-# CronMenu=Cron
-# CronCannotLoadClass=Cannot load class %s or object %s
-
-# UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+CronType=Task type
+CronType_method=Call method of a Dolibarr Class
+CronType_command=Shell command
+CronMenu=Cron
+CronCannotLoadClass=Cannot load class %s or object %s
+UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
diff --git a/htdocs/langs/ja_JP/donations.lang b/htdocs/langs/ja_JP/donations.lang
index 73c5868c8e6153b0a9791fd157e08c750c60ba5d..10ce21a04c4c1a8c0fddd12f32e880c840569328 100644
--- a/htdocs/langs/ja_JP/donations.lang
+++ b/htdocs/langs/ja_JP/donations.lang
@@ -4,7 +4,7 @@ Donations=寄付
DonationRef=Donation ref.
Donor=ドナー
Donors=ドナー
-AddDonation=寄付を追加します。
+AddDonation=Create a donation
NewDonation=新しい寄付
ShowDonation=Show donation
DonationPromise=ギフト約束
@@ -31,3 +31,8 @@ DonationRecipient=Donation recipient
ThankYou=Thank You
IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
MinimumAmount=Minimum amount is %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/ja_JP/externalsite.lang b/htdocs/langs/ja_JP/externalsite.lang
index 97f6eeda98e49ba2de99989753551fd1a981425d..55413c5e2566d726cd027e5bd7a11c75038aacce 100644
--- a/htdocs/langs/ja_JP/externalsite.lang
+++ b/htdocs/langs/ja_JP/externalsite.lang
@@ -1,4 +1,5 @@
# Dolibarr language file - Source file is en_US - externalsite
ExternalSiteSetup=外部ウェブサイトへのリンクを設定
ExternalSiteURL=外部サイトのURL
-# ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/ja_JP/holiday.lang b/htdocs/langs/ja_JP/holiday.lang
index 6012a6b963164b0d7013568e72cd23c9fbc91a35..53fdbe451e8c86caa5bf9bb666d1dcd7c4de5fe5 100644
--- a/htdocs/langs/ja_JP/holiday.lang
+++ b/htdocs/langs/ja_JP/holiday.lang
@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
CantCreateCP=You don't have the right to make leave requests.
InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=更新
CantUpdate=You cannot update this leave request.
NoDateDebut=You must select a start date.
NoDateFin=You must select an end date.
-ErrorDureeCP=Your request for holidays does not contain working day.
-TitleValidCP=Approve the request holidays
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
ConfirmValidCP=Are you sure you want to approve the leave request?
DateValidCP=Date approved
TitleToValidCP=Send leave request
ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the request holidays
+TitleRefuseCP=Refuse the leave request
ConfirmRefuseCP=Are you sure you want to refuse the leave request?
NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
+TitleCancelCP=Cancel the leave request
ConfirmCancelCP=Are you sure you want to cancel the leave request?
DetailRefusCP=Reason for refusal
DateRefusCP=Date of refusal
@@ -78,7 +77,7 @@ ActionByCP=Performed by
UserUpdateCP=For the user
PrevSoldeCP=Previous Balance
NewSoldeCP=New Balance
-alreadyCPexist=A request for holidays has already been done on this period.
+alreadyCPexist=A leave request has already been done on this period.
UserName=の名前
Employee=Employee
FirstDayOfHoliday=First day of vacation
@@ -88,25 +87,25 @@ ManualUpdate=Manual update
HolidaysCancelation=Leave request cancelation
## Configuration du Module ##
-ConfCP=Configuration of holidays module
+ConfCP=Configuration of leave request module
DescOptionCP=Description of the option
ValueOptionCP=値
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
UpdateConfCPOK=Updated successfully.
ErrorUpdateConfCP=An error occurred during the update, please try again.
-AddCPforUsers=Please add the balance of holidays of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
Module27130Name= Management of leave requests
Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
TitleOptionEventCP=Settings of leave requets for events
ValidEventCP=検証
UpdateEventCP=Update events
diff --git a/htdocs/langs/ja_JP/interventions.lang b/htdocs/langs/ja_JP/interventions.lang
index df13f2bf3b66736b06eba5e137c0cbe5df4e712e..2f5656a644a1950bdae0f36b80b39244ba89c782 100644
--- a/htdocs/langs/ja_JP/interventions.lang
+++ b/htdocs/langs/ja_JP/interventions.lang
@@ -3,7 +3,7 @@ Intervention=介入
Interventions=介入
InterventionCard=介入のカード
NewIntervention=新しい介入
-AddIntervention=介入を追加
+AddIntervention=Create intervention
ListOfInterventions=介入のリスト
EditIntervention=介入を編集します。
ActionsOnFicheInter=介入のアクション
@@ -30,6 +30,15 @@ StatusInterInvoiced=請求
RelatedInterventions=関連する介入
ShowIntervention=介入を示す
SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=代表的なフォローアップ介入
TypeContact_fichinter_internal_INTERVENING=間にある
diff --git a/htdocs/langs/ja_JP/mails.lang b/htdocs/langs/ja_JP/mails.lang
index 9df270c9d72834a8d379c25065d455f40b4a7bfb..f5138fd4a12080f9478e72f8ae50af12b8437313 100644
--- a/htdocs/langs/ja_JP/mails.lang
+++ b/htdocs/langs/ja_JP/mails.lang
@@ -115,7 +115,7 @@ SentBy=によって送信され、
MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
MailingNeedCommand2=ただし、セッションで送信するメールの最大数の値を持つパラメータのMAILING_LIMIT_SENDBYWEBを追加することによってそれらをオンラインで送信することができます。このため、ホームに行く - セットアップ - その他を。
ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=一覧をクリアする
ToClearAllRecipientsClickHere=このメール送信の受信者リストをクリアするにはここをクリック
ToAddRecipientsChooseHere=リストから選択して受信者を追加する
@@ -133,6 +133,9 @@ Notifications=通知
NoNotificationsWillBeSent=いいえ電子メール通知は、このイベントや会社のために計画されていません
ANotificationsWillBeSent=1通知は電子メールで送信されます。
SomeNotificationsWillBeSent=%s通知は電子メールで送信されます。
-AddNewNotification=新しい電子メール通知の要求をアクティブにする
-ListOfActiveNotifications=すべてのアクティブな電子メール通知の要求を一覧表示します。
+AddNewNotification=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
ListOfNotificationsDone=送信されたすべての電子メール通知を一覧表示します。
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang
index 80f8b5e44347b2158c24aa5697c15c6f0395be74..f9ec777cbd1896fc2b1c0af8080c13fdf5b6445c 100644
--- a/htdocs/langs/ja_JP/main.lang
+++ b/htdocs/langs/ja_JP/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Dolibarrデータベース内のユーザ
ErrorNoVATRateDefinedForSellerCountry=エラー、国%s 'に対して定義されていないのVAT率。
ErrorNoSocialContributionForSellerCountry=エラー、国%s 'に対して定義されていない社会貢献型。
ErrorFailedToSaveFile=エラーは、ファイルを保存に失敗しました。
-ErrorOnlyPngJpgSupported=エラーのみ。pngおよび。jpgイメージ形式のファイルがサポートされています。
-ErrorImageFormatNotSupported=あなたのPHPは、この形式の画像を変換する関数をサポートしていません。
SetDate=Set date
SelectDate=Select a date
SeeAlso=See also %s
BackgroundColorByDefault=デフォルトの背景色
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
FileWasNotUploaded=ファイルが添付ファイルが選択されているが、まだアップロードされませんでした。このために "添付ファイル"をクリックしてください。
NbOfEntries=エントリのNb
GoToWikiHelpPage=（インターネットアクセスが必要です）オンラインヘルプを参照してください
@@ -266,6 +266,7 @@ Afternoon=Afternoon
Quadri=までに4
MonthOfDay=その日の月
HourShort=H
+MinuteShort=mn
Rate=率
UseLocalTax=Include tax
Bytes=バイト
@@ -340,6 +341,7 @@ FullList=全リスト
Statistics=統計
OtherStatistics=他の統計
Status=ステータス
+Favorite=Favorite
ShortInfo=Info.
Ref=REF。
RefSupplier=REF。サプライヤー
@@ -365,6 +367,7 @@ ActionsOnCompany=このサードパーティに関するイベント
ActionsOnMember=このメンバーに関するイベント
NActions=%sイベント
NActionsLate=%s後半
+RequestAlreadyDone=Request already recorded
Filter=フィルタ
RemoveFilter=フィルタを削除
ChartGenerated=チャート生成された
@@ -645,6 +648,7 @@ OptionalFieldsSetup=余分な属性の設定
URLPhoto=写真/ロゴのURL
SetLinkToThirdParty=別の第三者へのリンク
CreateDraft=ドラフトを作成します。
+SetToDraft=Back to draft
ClickToEdit=クリックして編集
ObjectDeleted=オブジェクト%sは、削除された
ByCountry=国別
@@ -678,7 +682,7 @@ ViewPrivateNote=View notes
XMoreLines=%s line(s) hidden
PublicUrl=Public URL
AddBox=Add box
-
+SelectElementAndClickRefresh=Select an element and click Refresh
# Week day
Monday=月曜日
Tuesday=火曜日
diff --git a/htdocs/langs/ja_JP/margins.lang b/htdocs/langs/ja_JP/margins.lang
index 89f1c46ee2ef720c02e6c3ea81e2d0d26bda6044..03050a30577c474e0b75a91ad7f2e3f9a9901aa3 100644
--- a/htdocs/langs/ja_JP/margins.lang
+++ b/htdocs/langs/ja_JP/margins.lang
@@ -10,24 +10,18 @@ MarkRate=Mark rate
DisplayMarginRates=Display margin rates
DisplayMarkRates=Display mark rates
InputPrice=Input price
-
margin=Profit margins management
margesSetup=Profit margins management setup
-
MarginDetails=Margin details
-
ProductMargins=Product margins
CustomerMargins=Customer margins
SalesRepresentativeMargins=Sales representative margins
-
ProductService=製品やサービス
AllProducts=All products and services
ChooseProduct/Service=Choose product or service
-
StartDate=開始日
EndDate=終了日
Launch=開始
-
ForceBuyingPriceIfNull=Force buying price if null
ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0)
MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
@@ -35,16 +29,16 @@ UseDiscountAsProduct=As a product
UseDiscountAsService=As a service
UseDiscountOnTotal=On subtotal
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
-
MARGIN_TYPE=Margin type
MargeBrute=Raw margin
MargeNette=Net margin
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - Cost price
-
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
Charges=Charges
-
AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/ja_JP/orders.lang b/htdocs/langs/ja_JP/orders.lang
index ab1a62198ed4030634fd76bf359e405f944c6f7a..925337c661d8e79259ba383abc25071d5ad42347 100644
--- a/htdocs/langs/ja_JP/orders.lang
+++ b/htdocs/langs/ja_JP/orders.lang
@@ -2,7 +2,7 @@
OrdersArea=お客様の注文エリア
SuppliersOrdersArea=仕入先の受注エリア
OrderCard=注文カード
-# OrderId=Order Id
+OrderId=Order Id
Order=オーダー
Orders=受注
OrderLine=注文明細行
@@ -28,7 +28,7 @@ StatusOrderCanceledShort=キャンセル
StatusOrderDraftShort=ドラフト
StatusOrderValidatedShort=検証
StatusOrderSentShort=プロセスの
-# StatusOrderSent=Shipment in process
+StatusOrderSent=Shipment in process
StatusOrderOnProcessShort=レセプション
StatusOrderProcessedShort=処理
StatusOrderToBillShort=請求する
@@ -53,9 +53,9 @@ ShippingExist=出荷が存在する
DraftOrWaitingApproved=下書きまたは承認まだ順序付けられていません
DraftOrWaitingShipped=ドラフトまたは検証まだ出荷されていない
MenuOrdersToBill=法案に注文
-# MenuOrdersToBill2=Orders to bill
+MenuOrdersToBill2=Billable orders
SearchOrder=検索順序
-# SearchACustomerOrder=Search a customer order
+SearchACustomerOrder=Search a customer order
ShipProduct=船積
Discount=割引
CreateOrder=順序を作成します。
@@ -65,14 +65,14 @@ ValidateOrder=順序を検証する
UnvalidateOrder=順序をUnvalidate
DeleteOrder=順序を削除する
CancelOrder=注文を取り消す
-AddOrder=注文を追加
+AddOrder=Create order
AddToMyOrders=私の注文に追加
AddToOtherOrders=他の注文に追加
-# AddToDraftOrders=Add to draft order
+AddToDraftOrders=Add to draft order
ShowOrder=順序を示す
NoOpenedOrders=いいえ開かれたオーダーがない
NoOtherOpenedOrders=他の注文を開かれていません
-# NoDraftOrders=No draft orders
+NoDraftOrders=No draft orders
OtherOrders=他の注文
LastOrders=最後%s受注
LastModifiedOrders=最後%s注文を変更
@@ -82,7 +82,7 @@ NbOfOrders=注文数
OrdersStatistics=注文の統計
OrdersStatisticsSuppliers=サプライヤーのための統計情報
NumberOfOrdersByMonth=月別受注数
-# AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
+AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
ListOfOrders=注文の一覧
CloseOrder=密集隊形
ConfirmCloseOrder=あなたはこの順序を閉じてもよろしいですか？注文がクローズされると、それだけ請求することができます。
@@ -93,7 +93,7 @@ ConfirmUnvalidateOrder=下書きのステータスに注文<b>%sを</b>復元し
ConfirmCancelOrder=あなたがこの注文をキャンセルしてもよろしいですか？
ConfirmMakeOrder=あなたは<b>%s</b>にこの順序を作ったことを確認してもよろしいですか？
GenerateBill=請求書を生成します。
-# ClassifyShipped=Classify delivered
+ClassifyShipped=Classify delivered
ClassifyBilled="銘打たれた"分類
ComptaCard=会計カード
DraftOrders=ドラフト注文
@@ -101,7 +101,6 @@ RelatedOrders=関連受注
OnProcessOrders=プロセス受注
RefOrder=REF。オーダー
RefCustomerOrder=REF。顧客注文
-CustomerOrder=顧客注文
RefCustomerOrderShort=REF。カスト。オーダー
SendOrderByMail=メールで注文を送る
ActionsOnOrder=ためのイベント
@@ -131,9 +130,7 @@ Error_COMMANDE_SUPPLIER_ADDON_NotDefined=定数COMMANDE_SUPPLIER_ADDONが定義
Error_COMMANDE_ADDON_NotDefined=定数COMMANDE_ADDONが定義されていません
Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=モジュールファイル '%s'の読み込みに失敗しました
Error_FailedToLoad_COMMANDE_ADDON_File=モジュールファイル '%s'の読み込みに失敗しました
-# Error_OrderNotChecked=No orders to invoice selected
-
-
+Error_OrderNotChecked=No orders to invoice selected
# Sources
OrderSource0=商業的提案
OrderSource1=インターネット
@@ -144,25 +141,22 @@ OrderSource5=コマーシャル
OrderSource6=店舗
QtyOrdered=数量は、注文された
AddDeliveryCostLine=注文の重量を示す配信コストの行を追加します。
-
# Documents models
PDFEinsteinDescription=完全受注モデル（logo. ..）
PDFEdisonDescription=単純な次のモデル
-# PDFProformaDescription=A complete proforma invoice (logo…)
+PDFProformaDescription=A complete proforma invoice (logo…)
# Orders modes
OrderByMail=電子メール
OrderByFax=ファックス
OrderByEMail=メールしてください
OrderByWWW=オンライン
OrderByPhone=電話
-
-# CreateInvoiceForThisCustomer=Bill orders
-# NoOrdersToInvoice=No orders billable
-# CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-# MenuOrdersToBill2=Orders to bill
-# OrderCreation=Order creation
-# Ordered=Ordered
-# OrderCreated=Your orders have been created
-# OrderFail=An error happened during your orders creation
-# CreateOrders=Create orders
-# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+CreateInvoiceForThisCustomer=Bill orders
+NoOrdersToInvoice=No orders billable
+CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
+OrderCreation=Order creation
+Ordered=Ordered
+OrderCreated=Your orders have been created
+OrderFail=An error happened during your orders creation
+CreateOrders=Create orders
+ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
diff --git a/htdocs/langs/ja_JP/oscommerce.lang b/htdocs/langs/ja_JP/oscommerce.lang
deleted file mode 100644
index ea408d55f3970b3f1ff60144f2f6db4c943460d5..0000000000000000000000000000000000000000
--- a/htdocs/langs/ja_JP/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OSコマース
-OSCommerceSetup=OSコマースモジュールのセットアップ
-OSCommerceSetupSaved=保存されたOSコマースのセットアップ
-OSCommerceServer=OS Commerce Serverのホスト名/ IPアドレス
-OSCommerceDatabaseName=OS Commerceデータベース名
-OSCommercePrefix=OSコマースのテーブルの接頭辞
-OSCommerceUser=OS Commerceデータベースへのログイン
diff --git a/htdocs/langs/ja_JP/other.lang b/htdocs/langs/ja_JP/other.lang
index d182a87577abcf67302289144c04110770329918..9461761ac71f7f8e799dd75fdf2d04c563fbb5db 100644
--- a/htdocs/langs/ja_JP/other.lang
+++ b/htdocs/langs/ja_JP/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=セキュリティコード
Calendar=カレンダー
-AddTrip=旅行を追加します。
Tools=ツール
ToolsDesc=この領域は他のメニューエントリに利用できないグループ雑多なツールに捧げられています。 <br><br>これらのツールは、メニューから側に到達することができます。
Birthday=誕生日
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation
Notify_TASK_CREATE=Task created
Notify_TASK_MODIFY=Task modified
Notify_TASK_DELETE=Task deleted
+SeeModuleSetup=See module setup
NbOfAttachedFiles=添付ファイル/文書の数
TotalSizeOfAttachedFiles=添付ファイル/文書の合計サイズ
MaxSize=最大サイズ
@@ -80,6 +80,16 @@ ModifiedBy=%sによって変更された
ValidatedBy=%sによって検証
CanceledBy=%sにより取り消さ
ClosedBy=%sによって閉じ
+CreatedById=User id who created
+ModifiedById=User id who made last change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made last change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
FileWasRemoved=ファイルの%sは削除されました
DirWasRemoved=ディレクトリの%sは削除されました
FeatureNotYetAvailableShort=次のバージョンで利用可能
@@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your
##### Calendar common #####
AddCalendarEntry=カレンダー%sにエントリを追加します。
-NewCompanyToDolibarr=会社%sはDolibarrに追加
-ContractValidatedInDolibarr=Dolibarrで検証済みの契約%s
-ContractCanceledInDolibarr=Dolibarrでキャンセル契約%s
-ContractClosedInDolibarr=Dolibarrに閉鎖契約%s
-PropalClosedSignedInDolibarr=提案%sはDolibarrに署名
-PropalClosedRefusedInDolibarr=Dolibarrで拒否提案%s
-PropalValidatedInDolibarr=Dolibarrで検証提案%s
-InvoiceValidatedInDolibarr=Dolibarrで検証送り状%s
-InvoicePaidInDolibarr=請求書%sはDolibarrに支払われたように変更
-InvoiceCanceledInDolibarr=Dolibarrでキャンセル請求書%s
-PaymentDoneInDolibarr=支払い%sはDolibarrで行わ
-CustomerPaymentDoneInDolibarr=Dolibarrで行われた顧客の支払%s
-SupplierPaymentDoneInDolibarr=Dolibarrで行わサプライヤーの支払い%s
-MemberValidatedInDolibarr=Dolibarrで検証済みメンバー%s
-MemberResiliatedInDolibarr=Dolibarrでresiliatedメンバー%s
-MemberDeletedInDolibarr=Dolibarrから削除されたメンバーの%s
-MemberSubscriptionAddedInDolibarr=Dolibarrで追加されたメンバーの%sのためのサブスクリプション
-ShipmentValidatedInDolibarr=出荷%sはDolibarrで検証
-ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
##### Export #####
Export=輸出
ExportsArea=輸出地域
diff --git a/htdocs/langs/ja_JP/paybox.lang b/htdocs/langs/ja_JP/paybox.lang
index 4a92d442a4afc5930c90a6a2a73a4403c2947d16..5f50dd57f04766413f1db859d471307ce8e08c2c 100644
--- a/htdocs/langs/ja_JP/paybox.lang
+++ b/htdocs/langs/ja_JP/paybox.lang
@@ -32,6 +32,9 @@ VendorName=ベンダーの名前
CSSUrlForPaymentForm=支払いフォームのCSSスタイルシートのURL
MessageOK=検証済みペイメントの戻りページでメッセージ
MessageKO=キャンセル支払い戻りページでメッセージ
-# NewPayboxPaymentReceived=New Paybox payment received
-# NewPayboxPaymentFailed=New Paybox payment tried but failed
-# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+NewPayboxPaymentReceived=New Paybox payment received
+NewPayboxPaymentFailed=New Paybox payment tried but failed
+PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/ja_JP/resource.lang b/htdocs/langs/ja_JP/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..d64075dfbf595897a63e3eebf19194d8f71030dd
--- /dev/null
+++ b/htdocs/langs/ja_JP/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
diff --git a/htdocs/langs/ja_JP/sendings.lang b/htdocs/langs/ja_JP/sendings.lang
index 29247f90aa6c4154f74b0f9a7bd056be135f3535..9a886c508f4871b0f082f830dd7048ad44cb6820 100644
--- a/htdocs/langs/ja_JP/sendings.lang
+++ b/htdocs/langs/ja_JP/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=現時点では、新たな出荷の作成は、
RelatedShippings=Related shippings
ShipmentLine=Shipment line
CarrierList=List of transporters
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
# Sending methods
SendingMethodCATCH=顧客がキャッチ
diff --git a/htdocs/langs/ja_JP/stocks.lang b/htdocs/langs/ja_JP/stocks.lang
index 7c408e77115aa855f4aef667d9bee2e5eff9ef5f..e910ee7637c5d25d0d81a5db1e92532b30c92ae3 100644
--- a/htdocs/langs/ja_JP/stocks.lang
+++ b/htdocs/langs/ja_JP/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=倉庫のラベルが必要です
CorrectStock=正しい株式
ListOfWarehouses=倉庫のリスト
ListOfStockMovements=在庫変動のリスト
-StocksArea=株式エリア
+StocksArea=Warehouses area
Location=場所
LocationSummary=短い名前の場所
NumberOfDifferentProducts=Number of different products
diff --git a/htdocs/langs/ja_JP/users.lang b/htdocs/langs/ja_JP/users.lang
index d374d8740af07f8bafe7ea37da0091247f38348b..879183074fc265350460aff155c2f8710dcd0913 100644
--- a/htdocs/langs/ja_JP/users.lang
+++ b/htdocs/langs/ja_JP/users.lang
@@ -63,7 +63,6 @@ ShowGroup=グループを表示
ShowUser=ユーザーを表示する
NonAffectedUsers=非影響を受けるユーザー
UserModified=ユーザーが正常に変更
-GroupModified=グループが正常に変更
PhotoFile=写真ファイル
UserWithDolibarrAccess=Dolibarrアクセス権を持つユーザー
ListOfUsersInGroup=このグループのユーザのリスト
@@ -103,7 +102,7 @@ UserDisabled=ユーザーの%sが無効になって
UserEnabled=ユーザー%sは、アクティブ
UserDeleted=ユーザー%sは削除され
NewGroupCreated=グループ%sが作成
-GroupModified=グループが正常に変更
+GroupModified=Group %s modified
GroupDeleted=グループ%sは削除され
ConfirmCreateContact=あなたは、この連絡先のDolibarrアカウントを作成してもよろしいですか？
ConfirmCreateLogin=このメンバーのDolibarrアカウントを作成してもよろしいですか？
@@ -114,8 +113,10 @@ YourRole=あなたの役割
YourQuotaOfUsersIsReached=アクティブなユーザーのあなたのクォータに達している！
NbOfUsers=ユーザーのNb
DontDowngradeSuperAdmin=唯一superadminはダウングレードは、superAdminできます
-HierarchicalResponsible=Hierarchical responsible
+HierarchicalResponsible=Supervisor
HierarchicView=Hierarchical view
UseTypeFieldToChange=Use field Type to change
OpenIDURL=OpenID URL
LoginUsingOpenID=Use OpenID to login
+WeeklyHours=Weekly hours
+ColorUser=Color of the user
diff --git a/htdocs/langs/ja_JP/withdrawals.lang b/htdocs/langs/ja_JP/withdrawals.lang
index 720288f291e5d9cd7d1f8a4f80f37ce4d4ced840..c8d4567a6441b1429dd73a85271540f117b67352 100644
--- a/htdocs/langs/ja_JP/withdrawals.lang
+++ b/htdocs/langs/ja_JP/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=領収書
LastWithdrawalReceipts=最後%s撤退領収書
WithdrawedBills=取り下げ請求
WithdrawalsLines=撤退ライン
-RequestStandingOrderToTreat=治療するために立っている注文のための要求
-RequestStandingOrderTreated=立っている注文の要求が処理された
+RequestStandingOrderToTreat=Request for standing orders to process
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=顧客に立って受注
CustomerStandingOrder=顧客の地位の順序
NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
@@ -40,14 +41,13 @@ TransMetod=方式伝送
Send=送信
Lines=行
StandingOrderReject=拒否を発行
-InvoiceRefused=請求書が拒否されました
WithdrawalRefused=撤退は拒否されました
WithdrawalRefusedConfirm=あなたは社会のために撤退拒否を入力してもよろしいです
RefusedData=拒絶反応の日付
RefusedReason=拒否理由
RefusedInvoicing=拒絶反応を請求
NoInvoiceRefused=拒絶反応を充電しないでください
-InvoiceRefused=請求書が拒否されました
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=ステータス
StatusUnknown=未知の
StatusWaiting=待っている
@@ -76,7 +76,7 @@ WithBankUsingRIB=RIBを使用した銀行口座
WithBankUsingBANBIC=IBAN / BIC / SWIFTを使用した銀行口座
BankToReceiveWithdraw=撤回を受け取るために銀行口座
CreditDate=クレジットで
-WithdrawalFileNotCapable=あなたの国のために撤退領収書ファイルを生成することができません
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
ShowWithdraw=引き出しを表示
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=請求書は、まだ少なくとも一つの引き出しの支払いを処理していない場合、前に撤退を管理できるようにするために支払ったとして、しかし、それが設定されません。
DoStandingOrdersBeforePayments=このタブでは、立っている順序のために要求することができます。それが終了されますしたら、請求書を閉じるには、支払を入力することができます。
diff --git a/htdocs/langs/ko_KR/accountancy.lang b/htdocs/langs/ko_KR/accountancy.lang
index 8cab9d2b651d75b0721d76fda619e2034e4509b4..39c2732ec29852cf93d41614ed1812c2a4c1ce4f 100644
--- a/htdocs/langs/ko_KR/accountancy.lang
+++ b/htdocs/langs/ko_KR/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts
Validate=Validate
Addanaccount=Add an accounting account
AccountAccounting=Accounting account
-Ventilation=Ventilation
+Ventilation=Breakdown
ToDispatch=To dispatch
Dispatched=Dispatched
-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
TradeMargin=Trade margin
Reports=Reports
ByCustomerInvoice=By invoices customers
@@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger
Bookkeeping=General ledger
AccountBalanceByMonth=Account balance by month
-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
Line=Line
CAHTF=Total purchase supplier HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice
IntoAccount=In the accounting account
Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
+VentilationAuto=Automatic breakdown
Processing=Processing
EndProcessing=The end of processing
@@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account
ACCOUNTING_SEPARATORCSV=Separator CSV
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
@@ -140,14 +140,14 @@ Active=Statement
NewFiscalYear=New fiscal year
-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
TotalVente=Total turnover HT
TotalMarge=Total sales margin
DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
ChangeAccount=Change the accounting account for lines selected by the account:
Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
@@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically
ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang
index 9fb727b20e4fa30525a7887494aa3138c8062f5c..a8873ee150cca756cfbe3f627cc2e2ad26a7be2f 100644
--- a/htdocs/langs/ko_KR/admin.lang
+++ b/htdocs/langs/ko_KR/admin.lang
@@ -437,8 +437,8 @@ Module52Name=Stocks
Module52Desc=Stock management (products)
Module53Name=Services
Module53Desc=Service management
-Module54Name=Contracts
-Module54Desc=Contract and service management
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=Barcodes
Module55Desc=Barcode management
Module56Name=Telephony
@@ -475,8 +475,8 @@ Module320Name=RSS Feed
Module320Desc=Add RSS feed inside Dolibarr screen pages
Module330Name=Bookmarks
Module330Desc=Bookmark management
-Module400Name=Projects
-Module400Desc=Project management inside other modules
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=Webcalendar
Module410Desc=Webcalendar integration
Module500Name=Special expenses (tax, social contributions, dividends)
@@ -484,7 +484,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di
Module510Name=Salaries
Module510Desc=Management of employees salaries and payments
Module600Name=Notifications
-Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Donations
Module700Desc=Donation management
Module1200Name=Mantis
@@ -514,16 +514,16 @@ Module5000Name=Multi-company
Module5000Desc=Allows you to manage multiple companies
Module6000Name=Workflow
Module6000Desc=Workflow management
-Module20000Name=Holidays
-Module20000Desc=Declare and follow employees holidays
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
Module39000Name=Product batch
Module39000Desc=Batch number, eat-by and sell-by date management on products
Module50000Name=PayBox
Module50000Desc=Module to offer an online payment page by credit card with PayBox
Module50100Name=Point of sales
Module50100Desc=Point of sales module
-Module50200Name= Paypal
-Module50200Desc= Module to offer an online payment page by credit card with Paypal
+Module50200Name=Paypal
+Module50200Desc=Module to offer an online payment page by credit card with Paypal
Module50400Name=Accounting (advanced)
Module50400Desc=Accounting management (double parties)
Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=Read standing orders
Permission152=Create/modify a standing orders request
Permission153=Transmission standing orders receipts
Permission154=Credit/refuse standing orders receipts
-Permission161=Read contracts
-Permission162=Create/modify contracts
-Permission163=Activate a service of a contract
-Permission164=Disable a service of a contract
-Permission165=Delete contracts
-Permission171=Read trips
-Permission172=Create/modify trips
-Permission173=Delete trips
-Permission178=Export trips
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Read trips and expenses (own and his subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
Permission180=Read suppliers
Permission181=Read supplier orders
Permission182=Create/modify supplier orders
@@ -671,7 +672,7 @@ Permission300=Read bar codes
Permission301=Create/modify bar codes
Permission302=Delete bar codes
Permission311=Read services
-Permission312=Assign service to contract
+Permission312=Assign service/subscription to contract
Permission331=Read bookmarks
Permission332=Create/modify bookmarks
Permission333=Delete bookmarks
@@ -701,8 +702,8 @@ Permission701=Read donations
Permission702=Create/modify donations
Permission703=Delete donations
Permission1001=Read stocks
-Permission1002=Create/modify stocks
-Permission1003=Delete stocks
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=Read stock movements
Permission1005=Create/modify stock movements
Permission1101=Read delivery orders
@@ -1038,7 +1039,6 @@ YesInSummer=Yes in summer
OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
SuhosinSessionEncrypt=Session storage encrypted by Suhosin
ConditionIsCurrently=Condition is currently %s
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
YouUseBestDriver=You use driver %s that is best driver available currently.
YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by
ModuleCompanyCodePanicum=Return an empty accountancy code.
ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
UseNotifications=Use notifications
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events, to third parties (customers or suppliers) that are configured to. Choice of active notification and targets contacts is made one third party at time.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
ModelModules=Documents templates
DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
WatermarkOnDraft=Watermark on draft document
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=Add delivery date ability
UseOptionLineIfNoQuantity=A line of product/service with a zero amount is considered as an option
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list
ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order
FreeLegalTextOnOrders=Free text on orders
WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
##### Clicktodial #####
ClickToDialSetup=Click To Dial module setup
ClickToDialUrlDesc=Url called when a click on phone picto is done. In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=Intervention numbering models
TemplatePDFInterventions=Intervention card documents models
WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
##### Contracts #####
-ContractsSetup=Contracts module setup
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=Contracts numbering modules
TemplatePDFContracts=Contracts documents models
FreeLegalTextOnContracts=Free text on contracts
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
CacheByServer=Cache by server
CacheByClient=Cache by browser
CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=Products module setup
ServiceSetup=Services module setup
@@ -1382,9 +1384,10 @@ MailingSetup=EMailing module setup
MailingEMailFrom=Sender EMail (From) for emails sent by emailing module
MailingEMailError=Return EMail (Errors-to) for emails with errors
##### Notification #####
-NotificationSetup=Notification bu email module setup
+NotificationSetup=EMail notification module setup
NotificationEMailFrom=Sender EMail (From) for emails sent for notifications
-ListOfAvailableNotifications=List of available notifications (This list depends on activated modules)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
##### Sendings #####
SendingsSetup=Sending module setup
SendingsReceiptModel=Sending receipt model
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe
OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
##### Stock #####
-StockSetup=Configuration module stock
-UserWarehouse=Use user personal stocks
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=Menu deleted
TreeMenu=Tree menus
@@ -1478,11 +1482,14 @@ ClickToDialDesc=This module allows to add an icon after phone numbers. A click o
##### Point Of Sales (CashDesk) #####
CashDesk=Point of sales
CashDeskSetup=Point of sales module setup
-CashDeskThirdPartyForSell=Generic third party to use for sells
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Default account to use to receive cash payments
CashDeskBankAccountForCheque= Default account to use to receive payments by cheque
CashDeskBankAccountForCB= Default account to use to receive payments by credit cards
-CashDeskIdWareHouse=Warehouse to use for sells
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Bookmark module setup
BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Delete fiscal year
ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
Opened=Opened
Closed=Closed
-
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
diff --git a/htdocs/langs/ko_KR/agenda.lang b/htdocs/langs/ko_KR/agenda.lang
index f8dabc9f38408a89bcda55c2f9e6bc0165a48ce7..35a7cd38655e476e4c483172abf834bcba29d870 100644
--- a/htdocs/langs/ko_KR/agenda.lang
+++ b/htdocs/langs/ko_KR/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= Automatic filling
AgendaAutoActionDesc= Define here events for which you want Dolibarr to create automatically an event in agenda. If nothing is checked (by default), only manual actions will be included in agenda.
AgendaSetupOtherDesc= This page provides options to allow export of your Dolibarr events into an external calendar (thunderbird, google calendar, ...)
AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda.
-ActionsEvents= Events for which Dolibarr will create an action in agenda automatically
-PropalValidatedInDolibarr= Proposal %s validated
-InvoiceValidatedInDolibarr= Invoice %s validated
+ActionsEvents=Events for which Dolibarr will create an action in agenda automatically
+PropalValidatedInDolibarr=Proposal %s validated
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
InvoiceDeleteDolibarr=Invoice %s deleted
OrderValidatedInDolibarr= Order %s validated
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Order %s approved
OrderRefusedInDolibarr=Order %s refused
OrderBackToDraftInDolibarr=Order %s go back to draft status
OrderCanceledInDolibarr=Order %s canceled
-InterventionValidatedInDolibarr=Intervention %s validated
ProposalSentByEMail=Commercial proposal %s sent by EMail
OrderSentByEMail=Customer order %s sent by EMail
InvoiceSentByEMail=Customer invoice %s sent by EMail
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=Supplier order %s sent by EMail
SupplierInvoiceSentByEMail=Supplier invoice %s sent by EMail
ShippingSentByEMail=Shipping %s sent by EMail
ShippingValidated= Shipping %s validated
-InterventionSentByEMail=Intervention %s sent by EMail
-InterventionClassifiedBilled=Intervention %s classified as Billed
NewCompanyToDolibarr= Third party created
DateActionPlannedStart= Planned start date
DateActionPlannedEnd= Planned end date
@@ -70,9 +68,9 @@ DateActionStart= Start date
DateActionEnd= End date
AgendaUrlOptions1=You can also add following parameters to filter output:
AgendaUrlOptions2=<b>login=%s</b> to restrict output to actions created by, assigned to or done by user <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions created by user <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> to restrict output to actions done by user <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
AgendaShowBirthdayEvents=Show birthday's contacts
AgendaHideBirthdayEvents=Hide birthday's contacts
Busy=Busy
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=URL to access .ical file
ExtSiteNoLabel=No Description
WorkingTimeRange=Working time range
WorkingDaysRange=Working days range
-AddEvent=Add event
+AddEvent=Create event
MyAvailability=My availability
diff --git a/htdocs/langs/ko_KR/bills.lang b/htdocs/langs/ko_KR/bills.lang
index 1edd72130768502f868a057917ba530eeb280671..81b7515a8b8c3c3aa8a2d9e46e3fe9ccad263f59 100644
--- a/htdocs/langs/ko_KR/bills.lang
+++ b/htdocs/langs/ko_KR/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Credit note
InvoiceAvoirAsk=Credit note to correct invoice
InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example).
invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
-invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
ReplaceInvoice=Replace invoice %s
ReplacementInvoice=Replacement invoice
ReplacedByInvoice=Replaced by invoice %s
@@ -87,7 +87,7 @@ ClassifyCanceled=Classify 'Abandoned'
ClassifyClosed=Classify 'Closed'
ClassifyUnBilled=Classify 'Unbilled'
CreateBill=Create Invoice
-AddBill=Add invoice or credit note
+AddBill=Create invoice or credit note
AddToDraftInvoices=Add to draft invoice
DeleteBill=Delete invoice
SearchACustomerInvoice=Search for a customer invoice
@@ -99,7 +99,7 @@ DoPaymentBack=Do payment back
ConvertToReduc=Convert into future discount
EnterPaymentReceivedFromCustomer=Enter payment received from customer
EnterPaymentDueToCustomer=Make payment due to customer
-DisabledBecauseRemainderToPayIsZero=Disabled because remainder to pay is zero
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
Amount=Amount
PriceBase=Price base
BillStatus=Invoice status
@@ -137,8 +137,6 @@ BillFrom=From
BillTo=To
ActionsOnBill=Actions on invoice
NewBill=New invoice
-Prélèvements=Standing order
-Prélèvements=Standing order
LastBills=Last %s invoices
LastCustomersBills=Last %s customers invoices
LastSuppliersBills=Last %s suppliers invoices
@@ -156,9 +154,9 @@ ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b> ?
ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned' ?
ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid ?
ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice ?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
@@ -191,9 +189,9 @@ AlreadyPaid=Already paid
AlreadyPaidBack=Already paid back
AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposits)
Abandoned=Abandoned
-RemainderToPay=Remainder to pay
-RemainderToTake=Remainder to take
-RemainderToPayBack=Remainder to pay back
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
Rest=Pending
AmountExpected=Amount claimed
ExcessReceived=Excess received
@@ -219,19 +217,18 @@ NoInvoice=No invoice
ClassifyBill=Classify invoice
SupplierBillsToPay=Suppliers invoices to pay
CustomerBillsUnpaid=Unpaid customers invoices
-DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters
-DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=Non-recoverable
SetConditions=Set payment terms
SetMode=Set payment mode
Billed=Billed
-RepeatableInvoice=Pre-defined invoice
-RepeatableInvoices=Pre-defined invoices
-Repeatable=Pre-defined
-Repeatables=Pre-defined
-ChangeIntoRepeatableInvoice=Convert into pre-defined
-CreateRepeatableInvoice=Create pre-defined invoice
-CreateFromRepeatableInvoice=Create from pre-defined invoice
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines
CustomersInvoicesAndPayments=Customer invoices and payments
ExportDataset_invoice_1=Customer invoices list and invoice's lines
diff --git a/htdocs/langs/ko_KR/categories.lang b/htdocs/langs/ko_KR/categories.lang
index ed61bfc08a61b4e5bfdadecfe7f6a15298afc6e3..22914931db137a565a45daad16b9b04fbd08465b 100644
--- a/htdocs/langs/ko_KR/categories.lang
+++ b/htdocs/langs/ko_KR/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories
CatCusLinks=Links between customers/prospects and categories
CatProdLinks=Links between products/services and categories
CatMemberLinks=Links between members and categories
-CatProdLinks=Links between products/services and categories
-CatCusLinks=Links between customers/prospects and categories
-CatSupLinks=Links between suppliers and categories
DeleteFromCat=Remove from category
DeletePicture=Picture delete
ConfirmDeletePicture=Confirm picture deletion?
@@ -112,3 +109,4 @@ CategoriesSetup=Categories setup
CategorieRecursiv=Link with parent category automatically
CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category
diff --git a/htdocs/langs/ko_KR/compta.lang b/htdocs/langs/ko_KR/compta.lang
index 3929cfde0367b6f5d8dc7945385de4877d9e4759..9fe5eff520d881c617f38aa7d9db675ec18f118a 100644
--- a/htdocs/langs/ko_KR/compta.lang
+++ b/htdocs/langs/ko_KR/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s
SuppliersProductsSellSalesTurnover=The generated turnover by the sales of supplier's products.
CheckReceipt=Check deposit
CheckReceiptShort=Check deposit
+LastCheckReceiptShort=Last %s check receipts
NewCheckReceipt=New discount
NewCheckDeposit=New check deposit
NewCheckDepositOn=Create receipt for deposit on account: %s
diff --git a/htdocs/langs/ko_KR/contracts.lang b/htdocs/langs/ko_KR/contracts.lang
index e5ad112b222db93bedf8e6ded250a39d062215c6..511516dc755e4f3aba2d67e91238426896629cbd 100644
--- a/htdocs/langs/ko_KR/contracts.lang
+++ b/htdocs/langs/ko_KR/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Contracts area
ListOfContracts=List of contracts
-LastContracts=Last %s modified contracts
+LastModifiedContracts=Last %s modified contracts
AllContracts=All contracts
ContractCard=Contract card
ContractStatus=Contract status
@@ -27,7 +27,7 @@ MenuRunningServices=Running services
MenuExpiredServices=Expired services
MenuClosedServices=Closed services
NewContract=New contract
-AddContract=Add contract
+AddContract=Create contract
SearchAContract=Search a contract
DeleteAContract=Delete a contract
CloseAContract=Close a contract
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines
ListOfRunningServices=List of running services
NotActivatedServices=Inactive services (among validated contracts)
BoardNotActivatedServices=Services to activate among validated contracts
-LastContracts=Last %s modified contracts
+LastContracts=Last % contracts
LastActivatedServices=Last %s activated services
LastModifiedServices=Last %s modified services
EditServiceLine=Edit service line
diff --git a/htdocs/langs/ko_KR/cron.lang b/htdocs/langs/ko_KR/cron.lang
index 1be23d72ca326eec0911d33ce575292516014918..195ad43c87c41ae0938fa27745ba14209fbac724 100644
--- a/htdocs/langs/ko_KR/cron.lang
+++ b/htdocs/langs/ko_KR/cron.lang
@@ -1,114 +1,86 @@
# Dolibarr language file - Source file is en_US - cron
-#
# About page
-#
-# About = About
-# CronAbout = About Cron
-# CronAboutPage = Cron about page
-
-#
+About = About
+CronAbout = About Cron
+CronAboutPage = Cron about page
# Right
-#
-# Permission23101 = Read Scheduled task
-# Permission23102 = Create/update Scheduled task
-# Permission23103 = Delete Scheduled task
-# Permission23104 = Execute Scheduled task
-
-#
+Permission23101 = Read Scheduled task
+Permission23102 = Create/update Scheduled task
+Permission23103 = Delete Scheduled task
+Permission23104 = Execute Scheduled task
# Admin
-#
-# CronSetup= Scheduled job management setup
-# URLToLaunchCronJobs=URL to check and launch cron jobs if required
-# OrToLaunchASpecificJob=Or to check and launch a specific job
-# KeyForCronAccess=Security key for URL to launch cron jobs
-# FileToLaunchCronJobs=Command line to launch cron jobs
-# CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes
-# CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
-
-
-#
+CronSetup= Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch cron jobs if required
+OrToLaunchASpecificJob=Or to check and launch a specific job
+KeyForCronAccess=Security key for URL to launch cron jobs
+FileToLaunchCronJobs=Command line to launch cron jobs
+CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
# Menu
-#
-# CronJobs=Scheduled jobs
-# CronListActive= List of active jobs
-# CronListInactive= List of disabled jobs
-# CronListActive= List of active jobs
-
-
-#
+CronJobs=Scheduled jobs
+CronListActive=List of active/scheduled jobs
+CronListInactive=List of disabled jobs
# Page list
-#
-# CronDateLastRun=Last run
-# CronLastOutput=Last run output
-# CronLastResult=Last result code
-# CronListOfCronJobs=List of scheduled jobs
-# CronCommand=Command
-# CronList=Jobs list
-# CronDelete= Delete cron jobs
-# CronConfirmDelete= Are you sure you want to delete this cron job ?
-# CronExecute=Launch job
-# CronConfirmExecute= Are you sure to execute this job now
-# CronInfo= Jobs allow to execute task that have been planned
-# CronWaitingJobs=Wainting jobs
-# CronTask=Job
-# CronNone= None
-# CronDtStart=Start date
-# CronDtEnd=End date
-# CronDtNextLaunch=Next execution
-# CronDtLastLaunch=Last execution
-# CronFrequency=Frequancy
-# CronClass=Classe
-# CronMethod=Method
-# CronModule=Module
-# CronAction=Action
-# CronStatus=Status
-# CronStatusActive=Enabled
-# CronStatusInactive=Disabled
-# CronNoJobs=No jobs registered
-# CronPriority=Priority
-# CronLabel=Description
-# CronNbRun=Nb. launch
-# CronEach=Every
-# JobFinished=Job launched and finished
-
-#
+CronDateLastRun=Last run
+CronLastOutput=Last run output
+CronLastResult=Last result code
+CronListOfCronJobs=List of scheduled jobs
+CronCommand=Command
+CronList=Jobs list
+CronDelete= Delete cron jobs
+CronConfirmDelete= Are you sure you want to delete this cron job ?
+CronExecute=Launch job
+CronConfirmExecute= Are you sure to execute this job now
+CronInfo= Jobs allow to execute task that have been planned
+CronWaitingJobs=Wainting jobs
+CronTask=Job
+CronNone= None
+CronDtStart=Start date
+CronDtEnd=End date
+CronDtNextLaunch=Next execution
+CronDtLastLaunch=Last execution
+CronFrequency=Frequancy
+CronClass=Classe
+CronMethod=Method
+CronModule=Module
+CronAction=Action
+CronStatus=Status
+CronStatusActive=Enabled
+CronStatusInactive=Disabled
+CronNoJobs=No jobs registered
+CronPriority=Priority
+CronLabel=Description
+CronNbRun=Nb. launch
+CronEach=Every
+JobFinished=Job launched and finished
#Page card
-#
-# CronAdd= Add jobs
-# CronHourStart= Start Hour and date of task
-# CronEvery= And execute task each
-# CronObject= Instance/Object to create
-# CronArgs=Parameters
-# CronSaveSucess=Save succesfully
-# CronNote=Comment
-# CronFieldMandatory=Fields %s is mandatory
-# CronErrEndDateStartDt=End date cannot be before start date
-# CronStatusActiveBtn=Enable
-# CronStatusInactiveBtn=Disable
-# CronTaskInactive=This job is disabled
-# CronDtLastResult=Last result date
-# CronId=Id
-# CronClassFile=Classes (filename.class.php)
-# CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-# CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-# CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-# CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is <i>fecth</i>
-# CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-# CronCommandHelp=The system command line to execute.
-
-#
+CronAdd= Add jobs
+CronHourStart= Start Hour and date of task
+CronEvery= And execute task each
+CronObject= Instance/Object to create
+CronArgs=Parameters
+CronSaveSucess=Save succesfully
+CronNote=Comment
+CronFieldMandatory=Fields %s is mandatory
+CronErrEndDateStartDt=End date cannot be before start date
+CronStatusActiveBtn=Enable
+CronStatusInactiveBtn=Disable
+CronTaskInactive=This job is disabled
+CronDtLastResult=Last result date
+CronId=Id
+CronClassFile=Classes (filename.class.php)
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
+CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronCommandHelp=The system command line to execute.
# Info
-#
-# CronInfoPage=Information
-
-
-#
+CronInfoPage=Information
# Common
-#
-# CronType=Task type
-# CronType_method=Call method of a Dolibarr Class
-# CronType_command=Shell command
-# CronMenu=Cron
-# CronCannotLoadClass=Cannot load class %s or object %s
-
-# UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+CronType=Task type
+CronType_method=Call method of a Dolibarr Class
+CronType_command=Shell command
+CronMenu=Cron
+CronCannotLoadClass=Cannot load class %s or object %s
+UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
diff --git a/htdocs/langs/ko_KR/donations.lang b/htdocs/langs/ko_KR/donations.lang
index 66ddea95a5c694d8044c40b7da05319d0b77a530..f7aed91cf81caf0e83e390519642ea1f199670c6 100644
--- a/htdocs/langs/ko_KR/donations.lang
+++ b/htdocs/langs/ko_KR/donations.lang
@@ -4,7 +4,7 @@ Donations=Donations
DonationRef=Donation ref.
Donor=Donor
Donors=Donors
-AddDonation=Add a donation
+AddDonation=Create a donation
NewDonation=New donation
ShowDonation=Show donation
DonationPromise=Gift promise
@@ -31,3 +31,8 @@ DonationRecipient=Donation recipient
ThankYou=Thank You
IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
MinimumAmount=Minimum amount is %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/ko_KR/externalsite.lang b/htdocs/langs/ko_KR/externalsite.lang
index b915c37a5ab8fe3beb5335f7f4ec501a12749c15..da4853df0df086e3040a294cec116c590f4c2e9e 100644
--- a/htdocs/langs/ko_KR/externalsite.lang
+++ b/htdocs/langs/ko_KR/externalsite.lang
@@ -1,4 +1,5 @@
# Dolibarr language file - Source file is en_US - externalsite
-# ExternalSiteSetup=Setup link to external website
-# ExternalSiteURL=External Site URL
-# ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExternalSiteSetup=Setup link to external website
+ExternalSiteURL=External Site URL
+ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/ko_KR/holiday.lang b/htdocs/langs/ko_KR/holiday.lang
index c25abf6449ca2cc97d5dba6340d1530b5ea9c675..f5b87fefb0878c40cc75768a1d1c4bcf4cb80c72 100644
--- a/htdocs/langs/ko_KR/holiday.lang
+++ b/htdocs/langs/ko_KR/holiday.lang
@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
CantCreateCP=You don't have the right to make leave requests.
InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=Update
CantUpdate=You cannot update this leave request.
NoDateDebut=You must select a start date.
NoDateFin=You must select an end date.
-ErrorDureeCP=Your request for holidays does not contain working day.
-TitleValidCP=Approve the request holidays
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
ConfirmValidCP=Are you sure you want to approve the leave request?
DateValidCP=Date approved
TitleToValidCP=Send leave request
ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the request holidays
+TitleRefuseCP=Refuse the leave request
ConfirmRefuseCP=Are you sure you want to refuse the leave request?
NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
+TitleCancelCP=Cancel the leave request
ConfirmCancelCP=Are you sure you want to cancel the leave request?
DetailRefusCP=Reason for refusal
DateRefusCP=Date of refusal
@@ -78,7 +77,7 @@ ActionByCP=Performed by
UserUpdateCP=For the user
PrevSoldeCP=Previous Balance
NewSoldeCP=New Balance
-alreadyCPexist=A request for holidays has already been done on this period.
+alreadyCPexist=A leave request has already been done on this period.
UserName=Name
Employee=Employee
FirstDayOfHoliday=First day of vacation
@@ -88,25 +87,25 @@ ManualUpdate=Manual update
HolidaysCancelation=Leave request cancelation
## Configuration du Module ##
-ConfCP=Configuration of holidays module
+ConfCP=Configuration of leave request module
DescOptionCP=Description of the option
ValueOptionCP=Value
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
UpdateConfCPOK=Updated successfully.
ErrorUpdateConfCP=An error occurred during the update, please try again.
-AddCPforUsers=Please add the balance of holidays of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
Module27130Name= Management of leave requests
Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
TitleOptionEventCP=Settings of leave requets for events
ValidEventCP=Validate
UpdateEventCP=Update events
diff --git a/htdocs/langs/ko_KR/interventions.lang b/htdocs/langs/ko_KR/interventions.lang
index 17641a0ab3e499b2f66a4b4ddd80c46d478ff702..c79da05364e615bb2b234ce4211a373fc94e9168 100644
--- a/htdocs/langs/ko_KR/interventions.lang
+++ b/htdocs/langs/ko_KR/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Intervention
Interventions=Interventions
InterventionCard=Intervention card
NewIntervention=New intervention
-AddIntervention=Add intervention
+AddIntervention=Create intervention
ListOfInterventions=List of interventions
EditIntervention=Edit intervention
ActionsOnFicheInter=Actions on intervention
@@ -30,6 +30,15 @@ StatusInterInvoiced=Billed
RelatedInterventions=Related interventions
ShowIntervention=Show intervention
SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention
TypeContact_fichinter_internal_INTERVENING=Intervening
diff --git a/htdocs/langs/ko_KR/mails.lang b/htdocs/langs/ko_KR/mails.lang
index 6c9a445d4c1838fab42e34cc7170df4a5d5c21ee..dd8caefab78e20efe7803ef0e52f2304b7645982 100644
--- a/htdocs/langs/ko_KR/mails.lang
+++ b/htdocs/langs/ko_KR/mails.lang
@@ -115,7 +115,7 @@ SentBy=Sent by
MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=Clear list
ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
ToAddRecipientsChooseHere=Add recipients by choosing from the lists
@@ -133,6 +133,9 @@ Notifications=Notifications
NoNotificationsWillBeSent=No email notifications are planned for this event and company
ANotificationsWillBeSent=1 notification will be sent by email
SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification request
-ListOfActiveNotifications=List all active email notification requests
+AddNewNotification=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
ListOfNotificationsDone=List all email notifications sent
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/ko_KR/main.lang b/htdocs/langs/ko_KR/main.lang
index c303e23c2c0fc46678042c14809a07875cb0cc1f..2a7132201cde3e6540b7e70d1869d50d26143137 100644
--- a/htdocs/langs/ko_KR/main.lang
+++ b/htdocs/langs/ko_KR/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Dolibarr 데이타베이스에서 <b>%s</b
ErrorNoVATRateDefinedForSellerCountry=오류, '%s' 국가의 부가세율이 정의되지 않았습니다.
ErrorNoSocialContributionForSellerCountry=오류, '%s' 국가의 사회 기여 종류가 지정되지 않았습니다.
ErrorFailedToSaveFile=오류, 파일을 저장할 수 없습니다.
-ErrorOnlyPngJpgSupported=오류, .png 및 .jpg 이미지 파일 양식만을 지원합니다.
-ErrorImageFormatNotSupported=PHP가 이 형식의 이미지를 변환하는 데 필요한 함수를 지원하지 않습니다.
SetDate=Set date
SelectDate=Select a date
SeeAlso=또한 %s
BackgroundColorByDefault=기본 배경
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
FileWasNotUploaded=첨부할 파일을 선택했지만 바로 업로드할 수는 없습니다. 업로드하려면 "파일 첨부"를 클릭하십시오.
NbOfEntries=엔트리 Nb
GoToWikiHelpPage=온라인 도움말 읽기(인터넷 액세스 )
@@ -266,6 +266,7 @@ Afternoon=Afternoon
Quadri=Quadri
MonthOfDay=Month of the day
HourShort=H
+MinuteShort=mn
Rate=Rate
UseLocalTax=Include tax
Bytes=Bytes
@@ -340,6 +341,7 @@ FullList=Full list
Statistics=Statistics
OtherStatistics=Other statistics
Status=Status
+Favorite=Favorite
ShortInfo=Info.
Ref=Ref.
RefSupplier=Ref. supplier
@@ -365,6 +367,7 @@ ActionsOnCompany=Events about this third party
ActionsOnMember=Events about this member
NActions=%s events
NActionsLate=%s late
+RequestAlreadyDone=Request already recorded
Filter=Filter
RemoveFilter=Remove filter
ChartGenerated=Chart generated
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Extra attributes setup
URLPhoto=URL of photo/logo
SetLinkToThirdParty=Link to another third party
CreateDraft=Create draft
+SetToDraft=Back to draft
ClickToEdit=Click to edit
ObjectDeleted=Object %s deleted
ByCountry=By country
@@ -678,7 +682,7 @@ ViewPrivateNote=View notes
XMoreLines=%s line(s) hidden
PublicUrl=Public URL
AddBox=Add box
-
+SelectElementAndClickRefresh=Select an element and click Refresh
# Week day
Monday=월요일
Tuesday=화요일
diff --git a/htdocs/langs/ko_KR/margins.lang b/htdocs/langs/ko_KR/margins.lang
index e8d5fed1af9a379298973a5c33a511cf77ea3706..606d5e5053a25855631a7d6ee61b6c392c1fe32c 100644
--- a/htdocs/langs/ko_KR/margins.lang
+++ b/htdocs/langs/ko_KR/margins.lang
@@ -10,24 +10,18 @@ MarkRate=Mark rate
DisplayMarginRates=Display margin rates
DisplayMarkRates=Display mark rates
InputPrice=Input price
-
margin=Profit margins management
margesSetup=Profit margins management setup
-
MarginDetails=Margin details
-
ProductMargins=Product margins
CustomerMargins=Customer margins
SalesRepresentativeMargins=Sales representative margins
-
ProductService=Product or Service
AllProducts=All products and services
ChooseProduct/Service=Choose product or service
-
StartDate=Start date
EndDate=End date
Launch=Start
-
ForceBuyingPriceIfNull=Force buying price if null
ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0)
MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
@@ -35,16 +29,16 @@ UseDiscountAsProduct=As a product
UseDiscountAsService=As a service
UseDiscountOnTotal=On subtotal
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
-
MARGIN_TYPE=Margin type
MargeBrute=Raw margin
MargeNette=Net margin
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - Cost price
-
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
Charges=Charges
-
AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/ko_KR/orders.lang b/htdocs/langs/ko_KR/orders.lang
index 42444f0ec1c52173f7e7c94b58792d7b03f11de4..6ee9c19fa95f45044b7466cc0fdcbf21819ef13a 100644
--- a/htdocs/langs/ko_KR/orders.lang
+++ b/htdocs/langs/ko_KR/orders.lang
@@ -1,168 +1,162 @@
# Dolibarr language file - Source file is en_US - orders
-# OrdersArea=Customers orders area
-# SuppliersOrdersArea=Suppliers orders area
-# OrderCard=Order card
-# OrderId=Order Id
-# Order=Order
-# Orders=Orders
-# OrderLine=Order line
-# OrderFollow=Follow up
-# OrderDate=Order date
-# OrderToProcess=Order to process
-# NewOrder=New order
-# ToOrder=Make order
-# MakeOrder=Make order
-# SupplierOrder=Supplier order
-# SuppliersOrders=Suppliers orders
-# SuppliersOrdersRunning=Current suppliers orders
-# CustomerOrder=Customer order
-# CustomersOrders=Customer's orders
-# CustomersOrdersRunning=Current customer's orders
-# CustomersOrdersAndOrdersLines=Customer orders and order's lines
-# OrdersToValid=Customer's orders to validate
-# OrdersToBill=Customer's orders delivered
-# OrdersInProcess=Customer's orders in process
-# OrdersToProcess=Customer's orders to process
-# SuppliersOrdersToProcess=Supplier's orders to process
-# StatusOrderCanceledShort=Canceled
-# StatusOrderDraftShort=Draft
-# StatusOrderValidatedShort=Validated
-# StatusOrderSentShort=In process
-# StatusOrderSent=Shipment in process
-# StatusOrderOnProcessShort=Reception
-# StatusOrderProcessedShort=Processed
-# StatusOrderToBillShort=Delivered
-# StatusOrderToBill2Short=To bill
-# StatusOrderApprovedShort=Approved
-# StatusOrderRefusedShort=Refused
-# StatusOrderToProcessShort=To process
-# StatusOrderReceivedPartiallyShort=Partially received
-# StatusOrderReceivedAllShort=Everything received
-# StatusOrderCanceled=Canceled
-# StatusOrderDraft=Draft (needs to be validated)
-# StatusOrderValidated=Validated
-# StatusOrderOnProcess=Waiting to receive
-# StatusOrderProcessed=Processed
-# StatusOrderToBill=Delivered
-# StatusOrderToBill2=To bill
-# StatusOrderApproved=Approved
-# StatusOrderRefused=Refused
-# StatusOrderReceivedPartially=Partially received
-# StatusOrderReceivedAll=Everything received
-# ShippingExist=A shipment exists
-# DraftOrWaitingApproved=Draft or approved not yet ordered
-# DraftOrWaitingShipped=Draft or validated not yet shipped
-# MenuOrdersToBill=Orders delivered
-# MenuOrdersToBill2=Orders to bill
-# SearchOrder=Search order
-# SearchACustomerOrder=Search a customer order
-# ShipProduct=Ship product
-# Discount=Discount
-# CreateOrder=Create Order
-# RefuseOrder=Refuse order
-# ApproveOrder=Accept order
-# ValidateOrder=Validate order
-# UnvalidateOrder=Unvalidate order
-# DeleteOrder=Delete order
-# CancelOrder=Cancel order
-# AddOrder=Add order
-# AddToMyOrders=Add to my orders
-# AddToOtherOrders=Add to other orders
-# AddToDraftOrders=Add to draft order
-# ShowOrder=Show order
-# NoOpenedOrders=No opened orders
-# NoOtherOpenedOrders=No other opened orders
-# NoDraftOrders=No draft orders
-# OtherOrders=Other orders
-# LastOrders=Last %s orders
-# LastModifiedOrders=Last %s modified orders
-# LastClosedOrders=Last %s closed orders
-# AllOrders=All orders
-# NbOfOrders=Number of orders
-# OrdersStatistics=Order's statistics
-# OrdersStatisticsSuppliers=Supplier order's statistics
-# NumberOfOrdersByMonth=Number of orders by month
-# AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
-# ListOfOrders=List of orders
-# CloseOrder=Close order
-# ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed.
-# ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done.
-# ConfirmDeleteOrder=Are you sure you want to delete this order ?
-# ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b> ?
-# ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> to draft status ?
-# ConfirmCancelOrder=Are you sure you want to cancel this order ?
-# ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b> ?
-# GenerateBill=Generate invoice
-# ClassifyShipped=Classify delivered
-# ClassifyBilled=Classify billed
-# ComptaCard=Accountancy card
-# DraftOrders=Draft orders
-# RelatedOrders=Related orders
-# OnProcessOrders=In process orders
-# RefOrder=Ref. order
-# RefCustomerOrder=Ref. customer order
-# CustomerOrder=Customer order
-# RefCustomerOrderShort=Ref. cust. order
-# SendOrderByMail=Send order by mail
-# ActionsOnOrder=Events on order
-# NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
-# OrderMode=Order method
-# AuthorRequest=Request author
-# UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address
-# RunningOrders=Orders on process
-# UserWithApproveOrderGrant=Users granted with "approve orders" permission.
-# PaymentOrderRef=Payment of order %s
-# CloneOrder=Clone order
-# ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b> ?
-# DispatchSupplierOrder=Receiving supplier order %s
+OrdersArea=Customers orders area
+SuppliersOrdersArea=Suppliers orders area
+OrderCard=Order card
+OrderId=Order Id
+Order=Order
+Orders=Orders
+OrderLine=Order line
+OrderFollow=Follow up
+OrderDate=Order date
+OrderToProcess=Order to process
+NewOrder=New order
+ToOrder=Make order
+MakeOrder=Make order
+SupplierOrder=Supplier order
+SuppliersOrders=Suppliers orders
+SuppliersOrdersRunning=Current suppliers orders
+CustomerOrder=Customer order
+CustomersOrders=Customer's orders
+CustomersOrdersRunning=Current customer's orders
+CustomersOrdersAndOrdersLines=Customer orders and order's lines
+OrdersToValid=Customer's orders to validate
+OrdersToBill=Customer's orders delivered
+OrdersInProcess=Customer's orders in process
+OrdersToProcess=Customer's orders to process
+SuppliersOrdersToProcess=Supplier's orders to process
+StatusOrderCanceledShort=Canceled
+StatusOrderDraftShort=Draft
+StatusOrderValidatedShort=Validated
+StatusOrderSentShort=In process
+StatusOrderSent=Shipment in process
+StatusOrderOnProcessShort=Reception
+StatusOrderProcessedShort=Processed
+StatusOrderToBillShort=Delivered
+StatusOrderToBill2Short=To bill
+StatusOrderApprovedShort=Approved
+StatusOrderRefusedShort=Refused
+StatusOrderToProcessShort=To process
+StatusOrderReceivedPartiallyShort=Partially received
+StatusOrderReceivedAllShort=Everything received
+StatusOrderCanceled=Canceled
+StatusOrderDraft=Draft (needs to be validated)
+StatusOrderValidated=Validated
+StatusOrderOnProcess=Waiting to receive
+StatusOrderProcessed=Processed
+StatusOrderToBill=Delivered
+StatusOrderToBill2=To bill
+StatusOrderApproved=Approved
+StatusOrderRefused=Refused
+StatusOrderReceivedPartially=Partially received
+StatusOrderReceivedAll=Everything received
+ShippingExist=A shipment exists
+DraftOrWaitingApproved=Draft or approved not yet ordered
+DraftOrWaitingShipped=Draft or validated not yet shipped
+MenuOrdersToBill=Orders delivered
+MenuOrdersToBill2=Billable orders
+SearchOrder=Search order
+SearchACustomerOrder=Search a customer order
+ShipProduct=Ship product
+Discount=Discount
+CreateOrder=Create Order
+RefuseOrder=Refuse order
+ApproveOrder=Accept order
+ValidateOrder=Validate order
+UnvalidateOrder=Unvalidate order
+DeleteOrder=Delete order
+CancelOrder=Cancel order
+AddOrder=Create order
+AddToMyOrders=Add to my orders
+AddToOtherOrders=Add to other orders
+AddToDraftOrders=Add to draft order
+ShowOrder=Show order
+NoOpenedOrders=No opened orders
+NoOtherOpenedOrders=No other opened orders
+NoDraftOrders=No draft orders
+OtherOrders=Other orders
+LastOrders=Last %s orders
+LastModifiedOrders=Last %s modified orders
+LastClosedOrders=Last %s closed orders
+AllOrders=All orders
+NbOfOrders=Number of orders
+OrdersStatistics=Order's statistics
+OrdersStatisticsSuppliers=Supplier order's statistics
+NumberOfOrdersByMonth=Number of orders by month
+AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
+ListOfOrders=List of orders
+CloseOrder=Close order
+ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed.
+ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done.
+ConfirmDeleteOrder=Are you sure you want to delete this order ?
+ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b> ?
+ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> to draft status ?
+ConfirmCancelOrder=Are you sure you want to cancel this order ?
+ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b> ?
+GenerateBill=Generate invoice
+ClassifyShipped=Classify delivered
+ClassifyBilled=Classify billed
+ComptaCard=Accountancy card
+DraftOrders=Draft orders
+RelatedOrders=Related orders
+OnProcessOrders=In process orders
+RefOrder=Ref. order
+RefCustomerOrder=Ref. customer order
+RefCustomerOrderShort=Ref. cust. order
+SendOrderByMail=Send order by mail
+ActionsOnOrder=Events on order
+NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
+OrderMode=Order method
+AuthorRequest=Request author
+UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address
+RunningOrders=Orders on process
+UserWithApproveOrderGrant=Users granted with "approve orders" permission.
+PaymentOrderRef=Payment of order %s
+CloneOrder=Clone order
+ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b> ?
+DispatchSupplierOrder=Receiving supplier order %s
##### Types de contacts #####
-# TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
-# TypeContact_commande_internal_SHIPPING=Representative following-up shipping
-# TypeContact_commande_external_BILLING=Customer invoice contact
-# TypeContact_commande_external_SHIPPING=Customer shipping contact
-# TypeContact_commande_external_CUSTOMER=Customer contact following-up order
-# TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order
-# TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
-# TypeContact_order_supplier_external_BILLING=Supplier invoice contact
-# TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact
-# TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order
-
-# Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
-# Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
-# Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s'
-# Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s'
-# Error_OrderNotChecked=No orders to invoice selected
-
+TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
+TypeContact_commande_internal_SHIPPING=Representative following-up shipping
+TypeContact_commande_external_BILLING=Customer invoice contact
+TypeContact_commande_external_SHIPPING=Customer shipping contact
+TypeContact_commande_external_CUSTOMER=Customer contact following-up order
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order
+TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
+TypeContact_order_supplier_external_BILLING=Supplier invoice contact
+TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order
+Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
+Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
+Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s'
+Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s'
+Error_OrderNotChecked=No orders to invoice selected
# Sources
-# OrderSource0=Commercial proposal
-# OrderSource1=Internet
-# OrderSource2=Mail campaign
-# OrderSource3=Phone compaign
-# OrderSource4=Fax campaign
-# OrderSource5=Commercial
-# OrderSource6=Store
-# QtyOrdered=Qty ordered
-# AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order
-
+OrderSource0=Commercial proposal
+OrderSource1=Internet
+OrderSource2=Mail campaign
+OrderSource3=Phone compaign
+OrderSource4=Fax campaign
+OrderSource5=Commercial
+OrderSource6=Store
+QtyOrdered=Qty ordered
+AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order
# Documents models
-# PDFEinsteinDescription=A complete order model (logo...)
-# PDFEdisonDescription=A simple order model
-# PDFProformaDescription=A complete proforma invoice (logo…)
+PDFEinsteinDescription=A complete order model (logo...)
+PDFEdisonDescription=A simple order model
+PDFProformaDescription=A complete proforma invoice (logo…)
# Orders modes
-# OrderByMail=Mail
-# OrderByFax=Fax
-# OrderByEMail=EMail
-# OrderByWWW=Online
-# OrderByPhone=Phone
-
-# CreateInvoiceForThisCustomer=Bill orders
-# NoOrdersToInvoice=No orders billable
-# CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-# MenuOrdersToBill2=Orders to bill
-# OrderCreation=Order creation
-# Ordered=Ordered
-# OrderCreated=Your orders have been created
-# OrderFail=An error happened during your orders creation
-# CreateOrders=Create orders
-# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+OrderByMail=Mail
+OrderByFax=Fax
+OrderByEMail=EMail
+OrderByWWW=Online
+OrderByPhone=Phone
+CreateInvoiceForThisCustomer=Bill orders
+NoOrdersToInvoice=No orders billable
+CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
+OrderCreation=Order creation
+Ordered=Ordered
+OrderCreated=Your orders have been created
+OrderFail=An error happened during your orders creation
+CreateOrders=Create orders
+ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
diff --git a/htdocs/langs/ko_KR/oscommerce.lang b/htdocs/langs/ko_KR/oscommerce.lang
deleted file mode 100644
index 42a4a4551b6d42c92c114d1593dbc0f4f53ae4b3..0000000000000000000000000000000000000000
--- a/htdocs/langs/ko_KR/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-# OSCommerce=OS Commerce
-# OSCommerceSetup=OS Commerce module setup
-# OSCommerceSetupSaved=OS Commerce setup saved
-# OSCommerceServer=OS Commerce server host/ip
-# OSCommerceDatabaseName=OS Commerce database name
-# OSCommercePrefix=OS Commerce tables prefix
-# OSCommerceUser=OS Commerce database login
diff --git a/htdocs/langs/ko_KR/other.lang b/htdocs/langs/ko_KR/other.lang
index 6fe5c904eecff229b61df0ecef1b453b833674ca..d20bb5f39b1780b7b2805ad99dd02dd6c243af8f 100644
--- a/htdocs/langs/ko_KR/other.lang
+++ b/htdocs/langs/ko_KR/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=Security code
Calendar=Calendar
-AddTrip=Add trip
Tools=Tools
ToolsDesc=This area is dedicated to group miscellaneous tools not available into other menu entries.<br><br>Those tools can be reached from menu on the side.
Birthday=Birthday
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation
Notify_TASK_CREATE=Task created
Notify_TASK_MODIFY=Task modified
Notify_TASK_DELETE=Task deleted
+SeeModuleSetup=See module setup
NbOfAttachedFiles=Number of attached files/documents
TotalSizeOfAttachedFiles=Total size of attached files/documents
MaxSize=Maximum size
@@ -80,6 +80,16 @@ ModifiedBy=Modified by %s
ValidatedBy=Validated by %s
CanceledBy=Canceled by %s
ClosedBy=Closed by %s
+CreatedById=User id who created
+ModifiedById=User id who made last change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made last change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
FileWasRemoved=File %s was removed
DirWasRemoved=Directory %s was removed
FeatureNotYetAvailableShort=Available in a next version
@@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your
##### Calendar common #####
AddCalendarEntry=Add entry in calendar %s
-NewCompanyToDolibarr=Company %s added into Dolibarr
-ContractValidatedInDolibarr=Contract %s validated in Dolibarr
-ContractCanceledInDolibarr=Contract %s canceled in Dolibarr
-ContractClosedInDolibarr=Contract %s closed in Dolibarr
-PropalClosedSignedInDolibarr=Proposal %s signed in Dolibarr
-PropalClosedRefusedInDolibarr=Proposal %s refused in Dolibarr
-PropalValidatedInDolibarr=Proposal %s validated in Dolibarr
-InvoiceValidatedInDolibarr=Invoice %s validated in Dolibarr
-InvoicePaidInDolibarr=Invoice %s changed to paid in Dolibarr
-InvoiceCanceledInDolibarr=Invoice %s canceled in Dolibarr
-PaymentDoneInDolibarr=Payment %s done in Dolibarr
-CustomerPaymentDoneInDolibarr=Customer payment %s done in Dolibarr
-SupplierPaymentDoneInDolibarr=Supplier payment %s done in Dolibarr
-MemberValidatedInDolibarr=Member %s validated in Dolibarr
-MemberResiliatedInDolibarr=Member %s resiliated in Dolibarr
-MemberDeletedInDolibarr=Member %s deleted from Dolibarr
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added in Dolibarr
-ShipmentValidatedInDolibarr=Shipment %s validated in Dolibarr
-ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
##### Export #####
Export=Export
ExportsArea=Exports area
diff --git a/htdocs/langs/ko_KR/paybox.lang b/htdocs/langs/ko_KR/paybox.lang
index b689bb6cebff21b067564cffd144aa4a6aaa2e98..aced32a49440a9ff7a1b1e0279522ff49cec7821 100644
--- a/htdocs/langs/ko_KR/paybox.lang
+++ b/htdocs/langs/ko_KR/paybox.lang
@@ -1,37 +1,40 @@
# Dolibarr language file - Source file is en_US - paybox
-# PayBoxSetup=PayBox module setup
-# PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
-# FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
-# PaymentForm=Payment form
-# WelcomeOnPaymentPage=Welcome on our online payment service
-# ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
-# ThisIsInformationOnPayment=This is information on payment to do
-# ToComplete=To complete
-# YourEMail=Email to receive payment confirmation
-# Creditor=Creditor
-# PaymentCode=Payment code
-# PayBoxDoPayment=Go on payment
-# YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
-# PleaseBePatient=Please, be patient
-# Continue=Next
-# ToOfferALinkForOnlinePayment=URL for %s payment
-# ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
-# ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
-# ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
-# ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
-# ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
-# YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
-# SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> to have payment created automatically when validated by paybox.
-# YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-# YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
-# AccountParameter=Account parameters
-# UsageParameter=Usage parameters
-# InformationToFindParameters=Help to find your %s account information
-# PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment
-# VendorName=Name of vendor
-# CSSUrlForPaymentForm=CSS style sheet url for payment form
-# MessageOK=Message on validated payment return page
-# MessageKO=Message on canceled payment return page
-# NewPayboxPaymentReceived=New Paybox payment received
-# NewPayboxPaymentFailed=New Paybox payment tried but failed
-# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PayBoxSetup=PayBox module setup
+PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
+FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
+PaymentForm=Payment form
+WelcomeOnPaymentPage=Welcome on our online payment service
+ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
+ThisIsInformationOnPayment=This is information on payment to do
+ToComplete=To complete
+YourEMail=Email to receive payment confirmation
+Creditor=Creditor
+PaymentCode=Payment code
+PayBoxDoPayment=Go on payment
+YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
+PleaseBePatient=Please, be patient
+Continue=Next
+ToOfferALinkForOnlinePayment=URL for %s payment
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
+ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
+YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> to have payment created automatically when validated by paybox.
+YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
+YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
+AccountParameter=Account parameters
+UsageParameter=Usage parameters
+InformationToFindParameters=Help to find your %s account information
+PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment
+VendorName=Name of vendor
+CSSUrlForPaymentForm=CSS style sheet url for payment form
+MessageOK=Message on validated payment return page
+MessageKO=Message on canceled payment return page
+NewPayboxPaymentReceived=New Paybox payment received
+NewPayboxPaymentFailed=New Paybox payment tried but failed
+PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/ko_KR/resource.lang b/htdocs/langs/ko_KR/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..d64075dfbf595897a63e3eebf19194d8f71030dd
--- /dev/null
+++ b/htdocs/langs/ko_KR/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
diff --git a/htdocs/langs/ko_KR/sendings.lang b/htdocs/langs/ko_KR/sendings.lang
index 2ae43f3976607147c1e8fc3a41898f572cee9868..f6111bac6841189e50c3c7fb9028962b56e3997e 100644
--- a/htdocs/langs/ko_KR/sendings.lang
+++ b/htdocs/langs/ko_KR/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is do
RelatedShippings=Related shippings
ShipmentLine=Shipment line
CarrierList=List of transporters
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
# Sending methods
SendingMethodCATCH=Catch by customer
diff --git a/htdocs/langs/ko_KR/stocks.lang b/htdocs/langs/ko_KR/stocks.lang
index ef292b1b4126049984128eb1960d26d4582f6168..6af8727411182402fac845f79f873c4b855a9008 100644
--- a/htdocs/langs/ko_KR/stocks.lang
+++ b/htdocs/langs/ko_KR/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Warehouse label is required
CorrectStock=Correct stock
ListOfWarehouses=List of warehouses
ListOfStockMovements=List of stock movements
-StocksArea=Stocks area
+StocksArea=Warehouses area
Location=위치
LocationSummary=Short name location
NumberOfDifferentProducts=Number of different products
diff --git a/htdocs/langs/ko_KR/users.lang b/htdocs/langs/ko_KR/users.lang
index 0afaab6ad7f7ca7de787d1bad2656917763a3f45..baf209f9d1c7ff7527f6f0237519cac6f683a9e3 100644
--- a/htdocs/langs/ko_KR/users.lang
+++ b/htdocs/langs/ko_KR/users.lang
@@ -63,7 +63,6 @@ ShowGroup=Show group
ShowUser=Show user
NonAffectedUsers=Non assigned users
UserModified=User modified successfully
-GroupModified=Group modified successfully
PhotoFile=Photo file
UserWithDolibarrAccess=User with Dolibarr access
ListOfUsersInGroup=List of users in this group
@@ -103,7 +102,7 @@ UserDisabled=User %s disabled
UserEnabled=User %s activated
UserDeleted=User %s removed
NewGroupCreated=Group %s created
-GroupModified=Group modified successfully
+GroupModified=Group %s modified
GroupDeleted=Group %s removed
ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact ?
ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member ?
@@ -114,8 +113,10 @@ YourRole=Your roles
YourQuotaOfUsersIsReached=Your quota of active users is reached !
NbOfUsers=Nb of users
DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
-HierarchicalResponsible=Hierarchical responsible
+HierarchicalResponsible=Supervisor
HierarchicView=Hierarchical view
UseTypeFieldToChange=Use field Type to change
OpenIDURL=OpenID URL
LoginUsingOpenID=Use OpenID to login
+WeeklyHours=Weekly hours
+ColorUser=Color of the user
diff --git a/htdocs/langs/ko_KR/withdrawals.lang b/htdocs/langs/ko_KR/withdrawals.lang
index 58ac3e252ec59d67ff8d71c394b4c44265bc3add..e433730908416bbfa32c181a580b9e2e7e34717c 100644
--- a/htdocs/langs/ko_KR/withdrawals.lang
+++ b/htdocs/langs/ko_KR/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=Receipt
LastWithdrawalReceipts=Last %s withdrawal receipts
WithdrawedBills=Withdrawn invoices
WithdrawalsLines=Withdrawal lines
-RequestStandingOrderToTreat=Request for standing orders to treat
-RequestStandingOrderTreated=Request for standing orders treated
+RequestStandingOrderToTreat=Request for standing orders to process
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=Customer standing orders
CustomerStandingOrder=Customer standing order
NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
@@ -40,14 +41,13 @@ TransMetod=Transmission method
Send=Send
Lines=Lines
StandingOrderReject=Issue a rejection
-InvoiceRefused=Invoice refused
WithdrawalRefused=Withdrawal refused
WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society
RefusedData=Date of rejection
RefusedReason=Reason for rejection
RefusedInvoicing=Billing the rejection
NoInvoiceRefused=Do not charge the rejection
-InvoiceRefused=Invoice refused
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=Status
StatusUnknown=Unknown
StatusWaiting=Waiting
@@ -76,7 +76,7 @@ WithBankUsingRIB=For bank accounts using RIB
WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
BankToReceiveWithdraw=Bank account to receive withdraws
CreditDate=Credit on
-WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
ShowWithdraw=Show Withdraw
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
diff --git a/htdocs/langs/lt_LT/accountancy.lang b/htdocs/langs/lt_LT/accountancy.lang
index 8cab9d2b651d75b0721d76fda619e2034e4509b4..39c2732ec29852cf93d41614ed1812c2a4c1ce4f 100644
--- a/htdocs/langs/lt_LT/accountancy.lang
+++ b/htdocs/langs/lt_LT/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts
Validate=Validate
Addanaccount=Add an accounting account
AccountAccounting=Accounting account
-Ventilation=Ventilation
+Ventilation=Breakdown
ToDispatch=To dispatch
Dispatched=Dispatched
-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
TradeMargin=Trade margin
Reports=Reports
ByCustomerInvoice=By invoices customers
@@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger
Bookkeeping=General ledger
AccountBalanceByMonth=Account balance by month
-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
Line=Line
CAHTF=Total purchase supplier HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice
IntoAccount=In the accounting account
Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
+VentilationAuto=Automatic breakdown
Processing=Processing
EndProcessing=The end of processing
@@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account
ACCOUNTING_SEPARATORCSV=Separator CSV
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
@@ -140,14 +140,14 @@ Active=Statement
NewFiscalYear=New fiscal year
-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
TotalVente=Total turnover HT
TotalMarge=Total sales margin
DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
ChangeAccount=Change the accounting account for lines selected by the account:
Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
@@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically
ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index 82b6a410baa9cd48210decdd23070e81e6a80000..5039352d999c2f896332d933d8eb20c0dc1984bd 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -437,8 +437,8 @@ Module52Name=Atsargos
Module52Desc=Atsargų valdymas (produktai)
Module53Name=Paslaugos
Module53Desc=Paslaugų valdymas
-Module54Name=Sutartys
-Module54Desc=Sutarčių ir paslaugų valdymas
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=Brūkšniniai kodai
Module55Desc=Brūkšninių kodų valdymas
Module56Name=Telefonija
@@ -475,8 +475,8 @@ Module320Name=RSS mechanizmas
Module320Desc=Pridėti RSS mechanizmą Dolibarr ekrano puslapių viduje
Module330Name=Žymekliai
Module330Desc=Žymeklių valdymas
-Module400Name=Projektai
-Module400Desc=Projektų valdymas kitų modulių viduje
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=Web kalendorius
Module410Desc=Web kalendoriaus integracija
Module500Name=Specialiosios išlaidos (mokesčiai, socialinės įmokos, dividendai)
@@ -484,7 +484,7 @@ Module500Desc=Spec. išlaidų valdymas, pavyzdžiui: mokesčių, socialinių įm
Module510Name=Atlyginimai
Module510Desc=Management of employees salaries and payments
Module600Name=Pranešimai
-Module600Desc=Siųsti pranešimus elektroniniu paštu apie kai kokius Dolibarr verslo įvykius į trečiųjų šalių kontaktus
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Parama
Module700Desc=Paramos valdymas
Module1200Name=Mantis
@@ -514,16 +514,16 @@ Module5000Name=Multi įmonė
Module5000Desc=Jums leidžiama valdyti kelias įmones
Module6000Name=Darbo eiga
Module6000Desc=Darbo eigos valdymas
-Module20000Name=Švenčių dienos
-Module20000Desc=Deklaruoti ir sekti darbuotojų atostogas
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
Module39000Name=Product batch
Module39000Desc=Batch number, eat-by and sell-by date management on products
Module50000Name=Paybox
Module50000Desc=Modulis siūlo internetinio mokėjimo kreditine kortele per Paybox puslapį
Module50100Name=Pardavimų taškas
Module50100Desc=Pardavimų taško modulis
-Module50200Name= PayPal
-Module50200Desc= Modulis siūlo internetinio mokėjimo kreditine kortele per PayPal puslapį
+Module50200Name=PayPal
+Module50200Desc=Modulis siūlo internetinio mokėjimo kreditine kortele per PayPal puslapį
Module50400Name=Accounting (advanced)
Module50400Desc=Accounting management (double parties)
Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=Skaityti pastovius užsakymus
Permission152=Sukurti/pakeisti pastovių uždsakymų prašymus
Permission153=Pastovių užsakymų pajamų perdavimas
Permission154=Pastovių užsakymų pajamų kreditas/atmetimas
-Permission161=Skaityti sutartis
-Permission162=Sukurti/keisti sutartis
-Permission163=Įjungti sutarties paslaugą
-Permission164=Išjungti sutarties paslaugą
-Permission165=Ištrinti sutartis
-Permission171=Skaityti klaidas
-Permission172=Sukurti/keisti klaidas
-Permission173=Ištrinti klaidas
-Permission178=Eksportuoti klaidas
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Read trips and expenses (own and his subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
Permission180=Skaityti tiekėjus
Permission181=Skaityti tiekėjo užsakymus
Permission182=Sukurti/keisti tiekėjo užsakymus
@@ -671,7 +672,7 @@ Permission300=Skaityti brūkšninius kodus
Permission301=Sukurti/keisti brūkšninius kodus
Permission302=Ištrinti brūkšninius kodus
Permission311=Skaityti paslaugas
-Permission312=Priskirti paslaugas prie sutarties
+Permission312=Assign service/subscription to contract
Permission331=Skaityti žymes
Permission332=Sukurti/keisti žymes
Permission333=Ištrinti žymes
@@ -701,8 +702,8 @@ Permission701=Skaityti aukas
Permission702=Sukurti/keisti aukas
Permission703=Ištrinti aukas
Permission1001=Skaityti atsargas
-Permission1002=Sukurti/keisti atsargas
-Permission1003=Ištrinti atsargas
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=Skaityti atsargų judėjimą
Permission1005=Sukurti/keisti atsargų judėjimą
Permission1101=Skaityti pristatymo užsakymus
@@ -1038,7 +1039,6 @@ YesInSummer=Taip vasarą
OnlyFollowingModulesAreOpenedToExternalUsers=Atkreipkite dėmesį, kad tik šie moduliai yra atviri išorės vartotojams (kokie bebūtų šių vartotojų leidimai):
SuhosinSessionEncrypt=Sesijų saugykla užšifruota Suhosin
ConditionIsCurrently=Dabartinė būklė yra %s
-TestNotPossibleWithCurrentBrowsers=Automatinė detekcija negalima
YouUseBestDriver=Jūs naudojate tvarkyklę %s, kuri yra geriausia tvarkyklė prieinama šiuo metu.
YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
NbOfProductIsLowerThanNoPb=Turite tik %s produktus/paslaugas duomenų bazėje. Tam nereikia jokio ypatingo optimizavimo.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=Grąžinti apskaitos kodą, sudarytą pagal:<br>%s po
ModuleCompanyCodePanicum=Grąžinti tuščią apskaitos kodą.
ModuleCompanyCodeDigitaria=Apskaitos kodas priklauso nuo trečiosios šalies kodo. Kodas yra sudarytas iš simbolių "C" į pirmąją poziciją, toliau seka 5 simbolių trečiosios šalies kodas.
UseNotifications=Naudokite pranešimus
-NotificationsDesc=El. pašto pranešimų funkcija leidžia Jums tyliai išsiųsti automatinį laišką dėl kai kurių Dolibarr įvykių trečiosioms šalims (klientams arba tiekėjams), kurie yra sukonfigūruoti. Aktyvių pranešimų ir kontaktų pasirinkimas galimas su viena trečiąja šalimi vienu metu.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
ModelModules=Dokumentų šablonai
DocumentModelOdt=Sukurti dokumentus pagal OpenDocuments šablonus (.ODT arba .OAM failus OpenOffice, KOffice, TextEdit, ...)
WatermarkOnDraft=Vandens ženklas ant dokumento projekto
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=Pridėti galimą pristatymo datą
UseOptionLineIfNoQuantity=Produkto/paslaugos linija su nuline suma yra laikoma galima opcija
FreeLegalTextOnProposal=Laisvas tekstas komerciniame pasiūlyme
WatermarkOnDraftProposal=Vandens ženklas komercinių pasiūlymų projekte (nėra, jei lapas tuščias)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=Užsakymų valdymo nuostatos
OrdersNumberingModules=Užsakymų numeracijos modeliai
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list
ValidOrderAfterPropalClosed=Patvirtinti užsakymą, kuriam komercinis pasiūlymas jau pasibaigęs, leidžia be laikino užsakymo.
FreeLegalTextOnOrders=Laisvas tekstas užsakymuose
WatermarkOnDraftOrders=Vandens ženklas užsakymų projektuose (nėra, jei lapas tuščias)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
##### Clicktodial #####
ClickToDialSetup=Click To Dial modulio nuostatos
ClickToDialUrlDesc=Paspaudus telefono piktogramą kviečiamas URL. Galima naudoti žymes<br><b>__PHONETO__</b>, tam, kad pakeisti asmens, kuriam skambinama, telefono numeriu<br><b>__PHONEFROM__</b>, tam, kad pakeisti asmens, kuris skambina, telefono numeriu (Jūsų)<br><b>__LOGIN__</b>, tam, kad pakeisti Jūsų ClickToDial prisijungimo vardu (nustatytu vartotojo kortelėje)<br><b>__PASS__</b>, tam, kad pakeisti Jūsų ClickToDial slaptažodį (nustatytą vartotojo kortelėje).
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=Intervencijų numeracijos modeliai
TemplatePDFInterventions=Intervencija kortelių dokumentų modeliai
WatermarkOnDraftInterventionCards=Vandens ženklas ant intervencijų kortelės dokumentų (nėra, jei lapas tuščias)
##### Contracts #####
-ContractsSetup=Sutarčių modulio nuostatos
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=Sutarčių numeracijos moduliai
TemplatePDFContracts=Sutarčių dokumentų modeliai
FreeLegalTextOnContracts=Laisvas tekstas sutartyse
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=%s tipo failai nėra suspausti HTTP serveryje
CacheByServer=Laikoma serverio atmintyje
CacheByClient=Laikoma naršyklės atmintyje
CompressionOfResources=HTTP atsakymų suspaudimas
-TestNotPossibleWithCurrentBrowsers=Automatinė detekcija negalima
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=Produktų modulio nuostatos
ServiceSetup=Paslaugų modulio nuostatos
@@ -1382,9 +1384,10 @@ MailingSetup=E-pašto modulio nuostatos
MailingEMailFrom=Siuntėjo e-paštas (nuo) e-laiškams, siunčiamiems per e-pašto modulį
MailingEMailError=Grąžinamas e-paštas (Errors-to) klaidingiems e-laiškams
##### Notification #####
-NotificationSetup=Pranešimas apie e-pašto modulio nuostatas
+NotificationSetup=EMail notification module setup
NotificationEMailFrom=Siuntėjo e-paštas (nuo) e-laiškams siunčiamiems perspėjimams
-ListOfAvailableNotifications=Galimų pranešimų sąrašas (sąrašas priklauso nuo aktyvuotų modulių)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
##### Sendings #####
SendingsSetup=Siuntimo modulio nuostatos
SendingsReceiptModel=Įplaukų siuntimo modelis
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=Prisijungimas prie serverio '%s' duomenų bazėje "%s" su varto
OSCommerceTestKo1=Prisijungimas prie serverio '%s' pavyko, bet duomenų bazė "%s" nepasiekiama.
OSCommerceTestKo2=Prisijungimas prie serverio '%s' su vartotoju '%s' nepavyko.
##### Stock #####
-StockSetup=Atsargų konfigūravimo modulis
-UserWarehouse=Naudoti vartotojo asmenines atsargas
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=Meniu ištrintas
TreeMenu=Medžio meniu
@@ -1478,11 +1482,14 @@ ClickToDialDesc=Šis modulis leidžia pridėti ikoną už telefono numerio. Šio
##### Point Of Sales (CashDesk) #####
CashDesk=Pardavimų taškas
CashDeskSetup=Pardavimų taško modulio nustatymas
-CashDeskThirdPartyForSell=Bendroji trečioji šalis naudojama pardavimams
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Sąskaita grynųjų pinigų įmokoms pagal nutylėjimą
CashDeskBankAccountForCheque= Sąskaita čekių įmokoms pagal nutylėjimą
CashDeskBankAccountForCB= Sąskaita įmokoms kreditinėmis kortelėmis pagal nutylėjimą
-CashDeskIdWareHouse=Pardavimų sandėlis
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Žymeklių modulio nustatymas
BookmarkDesc=Šis modulis leidžia valdyti žymeklius. Taip pat galite pridėti trumpąsias nuorodas į bet kurį Dolibarr puslapį ar išorinį web tinklalapį Jūsų kairiajame meniu.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Delete fiscal year
ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
Opened=Opened
Closed=Closed
-
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
diff --git a/htdocs/langs/lt_LT/agenda.lang b/htdocs/langs/lt_LT/agenda.lang
index 54733de04086de8017220242c36387206a2e664b..e56ed276d04fbbb8bce7315c7b0d039ab62695c9 100644
--- a/htdocs/langs/lt_LT/agenda.lang
+++ b/htdocs/langs/lt_LT/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= Automatinis užpildymas
AgendaAutoActionDesc= Nustatykite įvykius, kuriems norite, kad Dolibarr sukurtų automatiškai įvykį operacijoje. Jei niekas nepažymėta (pagal nutylėjimą), tik rankomis įvesti veiksmai bus įtraukti į operaciją.
AgendaSetupOtherDesc= Šis puslapis suteikia galimybę eksportuoti Jūsų Dolibarr įvykius į išorinį kalendorių (Thunderbird, Google Calendar, ...)
AgendaExtSitesDesc=Šis puslapis leidžia paskelbti išorinius kalendorių šaltinius, kad pamatyti juose esančius įvykius Dolibarr operacijose.
-ActionsEvents= Įvykiai, kuriems Dolibarr sukurs veiksmą operacijų sąraše automatiškai
-PropalValidatedInDolibarr= Pasiūlymas %s pripažintas galiojančiu
-InvoiceValidatedInDolibarr= Sąskaita-faktūra %s pripažinta galiojančia
+ActionsEvents=Įvykiai, kuriems Dolibarr sukurs veiksmą operacijų sąraše automatiškai
+PropalValidatedInDolibarr=Pasiūlymas %s pripažintas galiojančiu
+InvoiceValidatedInDolibarr=Sąskaita-faktūra %s pripažinta galiojančia
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=Sąskaita-faktūra %s grąžinama į projektinę būklę
InvoiceDeleteDolibarr=Sąskaita-faktūra %s ištrinta
OrderValidatedInDolibarr= Užsakymas %s pripažintas galiojančiu
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Užsakymas %s patvirtintas
OrderRefusedInDolibarr=Užsakymas %s atmestas
OrderBackToDraftInDolibarr=Užsakymas %s grąžintas į projektinę būklę
OrderCanceledInDolibarr=Užsakymas %s atšauktas
-InterventionValidatedInDolibarr=Intervencija %s pripažinta galiojančia
ProposalSentByEMail=Komercinis pasiūlymas %s išsiųstas e-paštu
OrderSentByEMail=Kliento užsakymas %s atsiųstas e-paštu
InvoiceSentByEMail=Kliento sąskaita-faktūra %s išsiųsta e-paštu
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=Tiekėjo užsakymas %s atsiųstas e-paštu
SupplierInvoiceSentByEMail=Tiekėjo sąskaita-faktūra %s atsiųsta e-paštu
ShippingSentByEMail=Pakrovimo dokumentas %s atsiųstas e-paštu
ShippingValidated= Pakrovimas %s pripažintas galiojančiu
-InterventionSentByEMail=Intervencija %s atsiųsta e-paštu
-InterventionClassifiedBilled=Intervention %s classified as Billed
NewCompanyToDolibarr= Trečioji šalis sukūrė
DateActionPlannedStart= Planuojama pradžios data
DateActionPlannedEnd= Planuojama pabaigos data
@@ -70,9 +68,9 @@ DateActionStart= Pradžios data
DateActionEnd= Pabaigos data
AgendaUrlOptions1=Taip pat galite pridėti šiuos parametrus išvesties filtravimui:
AgendaUrlOptions2=<b>login=%s</b> apriboti išvedimą veiksmais, sukurtais, priskirtais arba įvykdytais vartotojo <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> apriboti išvedimą veiksmais, sukurtais vartotojo <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
AgendaUrlOptions4=<b>logint =%s</b> apriboti išvedimą veiksmais, priskirtais vartotojui <b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> apriboti išvedimo veiksmais, padarytais vartotojo <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
AgendaShowBirthdayEvents=Rodyti gimtadienio adresatus
AgendaHideBirthdayEvents=Paslėpti gimtadienio adresatus
Busy=Užimtas
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=URL prieiga prie .ical failo
ExtSiteNoLabel=Aprašymo nėra
WorkingTimeRange=Working time range
WorkingDaysRange=Working days range
-AddEvent=Add event
+AddEvent=Create event
MyAvailability=My availability
diff --git a/htdocs/langs/lt_LT/bills.lang b/htdocs/langs/lt_LT/bills.lang
index 8ccc4b6dd48a2064ae870700b3f861cc7ae8d389..640764f26bdbf852d58fb5bc16dc17c68820399f 100644
--- a/htdocs/langs/lt_LT/bills.lang
+++ b/htdocs/langs/lt_LT/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Kreditinė sąskaita (kredito aviza)
InvoiceAvoirAsk=Kreditinė sąskaita tikslinanti sąskaitą-faktūrą
InvoiceAvoirDesc=<b>Kreditinė sąskaita</b> yra neigiama sąskaita-faktūra, naudojama išspręsti faktui, kai sąskaitos-faktūros suma realiai skiriasi nuo sumokėtos sumos (nes klientas per klaidą sumokėjo per daug, ar nesumokėjo pilnai, nes grąžino dalį produktų).
invoiceAvoirWithLines=Sukurti kreditinę sąskaitą su eilutėmis iš originalios sąskaitos-faktūros
-invoiceAvoirWithPaymentRestAmount=Sukurti kreditinę sąskaitą su suma iš originalios sąskaitos-faktūros
-invoiceAvoirLineWithPaymentRestAmount=Kreditinės sąskaitos suma iš sąskaitos-faktūros
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
ReplaceInvoice=Pakeisti sąskaitą %s
ReplacementInvoice=Sąskaitos-faktūros pakeitimas
ReplacedByInvoice=Pakeistas sąskaita %s
@@ -87,7 +87,7 @@ ClassifyCanceled=Priskirti 'Neįvykusios'
ClassifyClosed=Priskirti 'Uždarytos'
ClassifyUnBilled=Classify 'Unbilled'
CreateBill=Sukurti sąskaitą-faktūrą
-AddBill=Pridėti sąskaitą-faktūrą ar kreditinę sąskaitą (kredito avizą)
+AddBill=Create invoice or credit note
AddToDraftInvoices=Pridėti į projektinę sąskaitą-faktūrą
DeleteBill=Ištrinti sąskaitą-faktūrą
SearchACustomerInvoice=Ieškoti kliento sąskaitos-faktūros
@@ -99,7 +99,7 @@ DoPaymentBack=Atlikti sumokėtos sumos grąžinimą
ConvertToReduc=Konvertuoti į ateities nuolaidą
EnterPaymentReceivedFromCustomer=Įveskite gautą iš kliento mokėjimą
EnterPaymentDueToCustomer=Atlikti mokėjimą klientui
-DisabledBecauseRemainderToPayIsZero=Negalimas, nes likutis mokėti lygus nuliui
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
Amount=Suma
PriceBase=Kainos bazė
BillStatus=Sąskaitos-faktūros būklė
@@ -137,8 +137,6 @@ BillFrom=Iš
BillTo=Į
ActionsOnBill=Veiksmai sąskaitoje-faktūroje
NewBill=Nauja sąskaita-faktūra
-Prélèvements=Pastovus užsakymas
-Prélèvements=Pastovus užsakymas
LastBills=Paskutinės %s sąskaitos-faktūros
LastCustomersBills=Paskutinės %s klientų sąskaitos-faktūros
LastSuppliersBills=Paskutinės %s tiekėjų sąskaitos-faktūros
@@ -156,9 +154,9 @@ ConfirmCancelBill=Ar tikrai norite atšaukti sąskaitą-faktūrą <b>%s</b> ?
ConfirmCancelBillQuestion=Kodėl norite priskirti šią sąskaitą-faktūrą prie "Neįvykusi" ?
ConfirmClassifyPaidPartially=Ar tikrai norite pakeisti sąskaitos-faktūros <b>%s</b> būklę į "Apmokėta" ?
ConfirmClassifyPaidPartiallyQuestion=Ši sąskaita-faktūra nebuvo pilnai apmokėta. Kokios yra priežastys, kad norite uždaryti šią sąskaitą-faktūrą ?
-ConfirmClassifyPaidPartiallyReasonAvoir=Likutis apmokėti <b>(%s %s)</b> yra atsižvelgiant į suteiktą nuolaidą, nes mokėjimas buvo atliktas prieš terminą. Sukoreguosiu PVM per kreditinę sąskaitą.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Likutis apmokėti <b>(%s %s)</b> yra atsižvelgiant į suteiktą nuolaidą, nes mokėjimas buvo atliktas prieš terminą. Sutinku prarasti PVM nuo šios nuolaidos.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Likutis apmokėti <b>(%s i%s)</b> yra atsižvelgiant į suteiktą nuolaidą, nes mokėjimas buvo atliktas prieš terminą. Aš susigrąžinsiu PVM per šią nuolaidą be kreditinės sąskaitos.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
ConfirmClassifyPaidPartiallyReasonBadCustomer=Blogas klientas
ConfirmClassifyPaidPartiallyReasonProductReturned=Produktų dalis grąžinta
ConfirmClassifyPaidPartiallyReasonOther=Suma atsisakyta dėl kitų priežasčių
@@ -191,9 +189,9 @@ AlreadyPaid=Jau apmokėta
AlreadyPaidBack=Mokėjimas jau grąžintas
AlreadyPaidNoCreditNotesNoDeposits=Jau apmokėta (be kreditinių sąskaitų ir depozitų)
Abandoned=Neįvykusi
-RemainderToPay=Likutis apmokėti
-RemainderToTake=Likutis gauti
-RemainderToPayBack=Likutis grąžinti
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
Rest=Laukiantis
AmountExpected=Reikalaujama suma
ExcessReceived=Gautas perviršis
@@ -219,19 +217,18 @@ NoInvoice=Nėra sąskaitos-faktūros
ClassifyBill=Priskirti sąskaitą-faktūrą
SupplierBillsToPay=Tiekėjų sąskaitos-faktūros apmokėjimui
CustomerBillsUnpaid=Neapmokėtos klientų sąskaitos-faktūros
-DispenseMontantLettres=Sąskaita parengta mechanografiniu būdu atleidžiama nuo užsakymo raidėmis
-DispenseMontantLettres=Sąskaita parengta mechanografiniu būdu atleidžiama nuo užsakymo raidėmis
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=Neatitaisomas
SetConditions=Nustatykite mokėjimo terminus
SetMode=Nustatykite mokėjimo būdą
Billed=Pateikta sąskaita
-RepeatableInvoice=Iš anksto nustatyta sąskaita-faktūra
-RepeatableInvoices=Iš anksto nustatytos sąskaitos-faktūros
-Repeatable=Iš anksto nustatyta
-Repeatables=Iš anksto nustatyta
-ChangeIntoRepeatableInvoice=Konvertuoti į iš anksto nustatytą
-CreateRepeatableInvoice=Sukurti iš anksto nustatytą sąskaitą-faktūrą
-CreateFromRepeatableInvoice=Kurti iš apibrėžtos sąskaitos-faktūros
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
CustomersInvoicesAndInvoiceLines=Klientų sąskaitos-faktūros ir sąskaitų-faktūrų serijos
CustomersInvoicesAndPayments=Kliento sąskaitos-faktūros ir mokėjimai
ExportDataset_invoice_1=Kliento sąskaitų-faktūrų sąrašas ir sąskaitų-faktūros serijos
diff --git a/htdocs/langs/lt_LT/categories.lang b/htdocs/langs/lt_LT/categories.lang
index 7f998cd3c4d4ad1a31305ab5ca62d8fd9fd112f3..ffa404fbb6df07395895adcac8c0dde200b73ce1 100644
--- a/htdocs/langs/lt_LT/categories.lang
+++ b/htdocs/langs/lt_LT/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Ryšys tarp tiekėjų ir kategorijų
CatCusLinks=Ryšys tarp klientų/planų ir kategorijų
CatProdLinks=Ryšys tarp produktų/paslaugų ir kategorijų
CatMemberLinks=Ryšys tarp narių ir kategorijų
-CatProdLinks=Ryšys tarp produktų/paslaugų ir kategorijų
-CatCusLinks=Ryšys tarp klientų/planų ir kategorijų
-CatSupLinks=Ryšys tarp tiekėjų ir kategorijų
DeleteFromCat=Pašalinti iš kategorijos
DeletePicture=Ištrinti nuotrauką
ConfirmDeletePicture=Patvirtinkite nuotraukos trynimą
@@ -112,3 +109,4 @@ CategoriesSetup=Kategorijų nustatymai
CategorieRecursiv=Automatiškai susieti su pirmine kategorija
CategorieRecursivHelp=Jei įjungta, produktas taip pat susijęs su pirmine kategorija, kai dedamas į subkategoriją
AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category
diff --git a/htdocs/langs/lt_LT/compta.lang b/htdocs/langs/lt_LT/compta.lang
index e30bc42289afb9f8be390b8223a5d0e088472c48..f07b82c6e965e836494536b4165bce59ae87c876 100644
--- a/htdocs/langs/lt_LT/compta.lang
+++ b/htdocs/langs/lt_LT/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Klaidingas kliento apskaitos kodas %s
SuppliersProductsSellSalesTurnover=Sugeneruota apyvarta pagal tiekėjo produktų pardavimus.
CheckReceipt=Čekio depozitas
CheckReceiptShort=Čekio depozitas
+LastCheckReceiptShort=Last %s check receipts
NewCheckReceipt=Nauja nuolaida
NewCheckDeposit=Naujas čekio depozitas
NewCheckDepositOn=Sukurti sąskaitos %s depozito kvitą
diff --git a/htdocs/langs/lt_LT/contracts.lang b/htdocs/langs/lt_LT/contracts.lang
index 3e4b6b1f9ad0809e1a4bb3dd1bc9f86817e4b9eb..bc325523e1ceb2e635898830ca8638698cab967b 100644
--- a/htdocs/langs/lt_LT/contracts.lang
+++ b/htdocs/langs/lt_LT/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Sutarčių sritis
ListOfContracts=Sutarčių sąrašas
-LastContracts=Paskutinės %s pakeistos sutartys
+LastModifiedContracts=Last %s modified contracts
AllContracts=Visos sutartys
ContractCard=Sutarties kortelė
ContractStatus=Sutarties būklė
@@ -27,7 +27,7 @@ MenuRunningServices=Veikiančios paslaugas
MenuExpiredServices=Pasibaigusios paslaugos
MenuClosedServices=Uždarytos paslaugos
NewContract=Nauja sutartis
-AddContract=Pridėti sutartį
+AddContract=Create contract
SearchAContract=Ieškoti sutarties
DeleteAContract=Ištrinti sutartį
CloseAContract=Uždaryti sutartį
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Veikiančių sutarčių eilučių sąrašas
ListOfRunningServices=Veikiančių paslaugų sąrašas
NotActivatedServices=Neaktyvios paslaugos (tarp patvirtintų sutarčių)
BoardNotActivatedServices=Paslaugos aktyvavimui iš patvirtintų sutarčių
-LastContracts=Paskutinės %s pakeistos sutartys
+LastContracts=Last % contracts
LastActivatedServices=Paskutinės %s aktyvuotos paslaugos
LastModifiedServices=Paskutinės %s modifikuotos paslaugos
EditServiceLine=Redaguoti paslaugos eilutę
diff --git a/htdocs/langs/lt_LT/cron.lang b/htdocs/langs/lt_LT/cron.lang
index 1be23d72ca326eec0911d33ce575292516014918..6c9e5b5a84b254d6d8fe535b1fa172d1e7a33b7e 100644
--- a/htdocs/langs/lt_LT/cron.lang
+++ b/htdocs/langs/lt_LT/cron.lang
@@ -1,114 +1,86 @@
# Dolibarr language file - Source file is en_US - cron
-#
# About page
-#
-# About = About
-# CronAbout = About Cron
-# CronAboutPage = Cron about page
-
-#
+About = Apie
+CronAbout = Apie Cron
+CronAboutPage = Cron apie puslapį
# Right
-#
-# Permission23101 = Read Scheduled task
-# Permission23102 = Create/update Scheduled task
-# Permission23103 = Delete Scheduled task
-# Permission23104 = Execute Scheduled task
-
-#
+Permission23101 = Skaityti Numatytas užduotis
+Permission23102 = Sukurti/atnaujinti Numatytas užduotis
+Permission23103 = Ištrinti Numatytas užduotis
+Permission23104 = Vykdyti Numatytas užduotis
# Admin
-#
-# CronSetup= Scheduled job management setup
-# URLToLaunchCronJobs=URL to check and launch cron jobs if required
-# OrToLaunchASpecificJob=Or to check and launch a specific job
-# KeyForCronAccess=Security key for URL to launch cron jobs
-# FileToLaunchCronJobs=Command line to launch cron jobs
-# CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes
-# CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
-
-
-#
+CronSetup= Numatytos užduoties valdymo nustatymas
+URLToLaunchCronJobs=URL patikrinti ir pradėti cron darbą, jei reikės
+OrToLaunchASpecificJob=Arba patikrinti ir pradėti spec. darbą
+KeyForCronAccess=Apsaugos raktas URL pradėti cron darbus
+FileToLaunchCronJobs=Komandinė eilutė paleisti cron darbą
+CronExplainHowToRunUnix=Unix aplinkoje reikia naudoti crontab paleisti komandinę eilutę kiekvieną minutę
+CronExplainHowToRunWin=Microsoft (tm) Windows aplinkoje galite naudoti Numatytų užduočių įrankį paleisti komandinę eilutę kiekvieną minutę
# Menu
-#
-# CronJobs=Scheduled jobs
-# CronListActive= List of active jobs
-# CronListInactive= List of disabled jobs
-# CronListActive= List of active jobs
-
-
-#
+CronJobs=Suplanuoti darbai
+CronListActive=List of active/scheduled jobs
+CronListInactive=Išjungtų darbų sąrašas
# Page list
-#
-# CronDateLastRun=Last run
-# CronLastOutput=Last run output
-# CronLastResult=Last result code
-# CronListOfCronJobs=List of scheduled jobs
-# CronCommand=Command
-# CronList=Jobs list
-# CronDelete= Delete cron jobs
-# CronConfirmDelete= Are you sure you want to delete this cron job ?
-# CronExecute=Launch job
-# CronConfirmExecute= Are you sure to execute this job now
-# CronInfo= Jobs allow to execute task that have been planned
-# CronWaitingJobs=Wainting jobs
-# CronTask=Job
-# CronNone= None
-# CronDtStart=Start date
-# CronDtEnd=End date
-# CronDtNextLaunch=Next execution
-# CronDtLastLaunch=Last execution
-# CronFrequency=Frequancy
-# CronClass=Classe
-# CronMethod=Method
-# CronModule=Module
-# CronAction=Action
-# CronStatus=Status
-# CronStatusActive=Enabled
-# CronStatusInactive=Disabled
-# CronNoJobs=No jobs registered
-# CronPriority=Priority
-# CronLabel=Description
-# CronNbRun=Nb. launch
-# CronEach=Every
-# JobFinished=Job launched and finished
-
-#
+CronDateLastRun=Paskutinis paleistas
+CronLastOutput=Paskutinė paleista išvestis
+CronLastResult=Paskutinio rezultato kodas
+CronListOfCronJobs=Numatytų darbų sąrašas
+CronCommand=Komanda
+CronList=Darbų sąrašas
+CronDelete= Ištrinti cron darbus
+CronConfirmDelete= Ar tikrai norite ištrinti šį cron darbą ?
+CronExecute=Pradėti darbą
+CronConfirmExecute= Ar tikrai norite vykdyti šį darbą dabar ?
+CronInfo= Darbai leidžia vykdyti užduotį, kuri buvo suplanuota
+CronWaitingJobs=Laukiantys darbai
+CronTask=Darbas
+CronNone= Nė vienas
+CronDtStart=Pradžios data
+CronDtEnd=Pabaigos data
+CronDtNextLaunch=Kitas vykdymas
+CronDtLastLaunch=Paskutinis vykdymas
+CronFrequency=Dažnis
+CronClass=Klasė
+CronMethod=Metodas
+CronModule=Modulis
+CronAction=Veiksmas
+CronStatus=Būklė
+CronStatusActive=Įjungtas
+CronStatusInactive=Išjungtas
+CronNoJobs=Nėra registruotų darbų
+CronPriority=Prioritetas
+CronLabel=Aprašymas
+CronNbRun=Pradėti skaičių
+CronEach=Kiekvienas
+JobFinished=Darbas pradėtas ir baigtas
#Page card
-#
-# CronAdd= Add jobs
-# CronHourStart= Start Hour and date of task
-# CronEvery= And execute task each
-# CronObject= Instance/Object to create
-# CronArgs=Parameters
-# CronSaveSucess=Save succesfully
-# CronNote=Comment
-# CronFieldMandatory=Fields %s is mandatory
-# CronErrEndDateStartDt=End date cannot be before start date
-# CronStatusActiveBtn=Enable
-# CronStatusInactiveBtn=Disable
-# CronTaskInactive=This job is disabled
-# CronDtLastResult=Last result date
-# CronId=Id
-# CronClassFile=Classes (filename.class.php)
-# CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-# CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-# CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-# CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is <i>fecth</i>
-# CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-# CronCommandHelp=The system command line to execute.
-
-#
+CronAdd= Pridėti darbus
+CronHourStart= Užduoties pradžios data ir valanda
+CronEvery= Ir vykdyti kiekvieną užduotį
+CronObject= Sukurti Instanciją.Objektą
+CronArgs=Parametrai
+CronSaveSucess=Išsaugota sėkmingai
+CronNote=Komentaras
+CronFieldMandatory=Laukai %s yra privalomi
+CronErrEndDateStartDt=Pabaigos data negali būti ankstesnė už pradžios datą
+CronStatusActiveBtn=Įjungti
+CronStatusInactiveBtn=Išjungti
+CronTaskInactive=Šis darbas yra išjungtas
+CronDtLastResult=Paskutinio rezultato data
+CronId=ID
+CronClassFile=Klasės (filename.class.php)
+CronModuleHelp=Dolibarr modulio aplanko vardas (taip pat dirba su išorės Dolibarr moduliu). <BR> Pvz.: Dolibarr Produkto objekto patraukimo metodas /htdocs/<u>product</u>/class/product.class.php, modulio reikšmė yra <i>product</i>
+CronClassFileHelp=Failo pavadinimas įkėlimui. <BR> Pvz.: Dolibarr Produkto objekto patraukimo metodas /htdocs/product/class/<u>product.class.php</u>, klasės failo vardo reikšmė yra <i>product.class.php</i>
+CronObjectHelp=Objekto pavadinimas įkėlimui. <BR> Pvz.:Dolibarr Produkto objekto patraukimo metodas /htdocs/product/clas/product.class.php, klasės failo vardo reikšmė yra <i>Product</i>
+CronMethodHelp=Objekto metodas įkėlimui. <BR> Pvz.: Dolibarr Produkto objekto patraukimo metodas /htdocs/product/class/product.class.php, metodo reikšmė yra <i>fecth</i>
+CronArgsHelp=Metodo argumentai. <BR> Pvz.: Dolibarr Produkto objekto patraukimo metodas /htdocs/product/class/product.class.php, parametrų reikšmė gali būti <i>0, ProductRef</i>
+CronCommandHelp=Sistemos komandinė eilutė vykdymui
# Info
-#
-# CronInfoPage=Information
-
-
-#
+CronInfoPage=Informacija
# Common
-#
-# CronType=Task type
-# CronType_method=Call method of a Dolibarr Class
-# CronType_command=Shell command
-# CronMenu=Cron
-# CronCannotLoadClass=Cannot load class %s or object %s
-
-# UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+CronType=Užduoties tipas
+CronType_method=Dolibarr klasės kvietimo metodas
+CronType_command=Apvalkalo komanda
+CronMenu=Cron
+CronCannotLoadClass=Nepavyko įkelti klasės %s arba objekto %s
+UseMenuModuleToolsToAddCronJobs=Eikite į meniu "Pagrindinis - Modulių įrankiai - Darbo sąrašas" norėdami peržiūrėti ir redaguoti numatytus darbus.
diff --git a/htdocs/langs/lt_LT/donations.lang b/htdocs/langs/lt_LT/donations.lang
index 1f5134b50e7d567781a40c355d569291602d6709..145d05b7cf1ed367a86e320e9f4bf50a2d6446ea 100644
--- a/htdocs/langs/lt_LT/donations.lang
+++ b/htdocs/langs/lt_LT/donations.lang
@@ -4,7 +4,7 @@ Donations=Aukos
DonationRef=Aukos nuoroda
Donor=Donoras
Donors=Donorai
-AddDonation=Pridėti auką
+AddDonation=Create a donation
NewDonation=Nauja auka
ShowDonation=Rodyti auką
DonationPromise=Dovanos pažadas
@@ -31,3 +31,8 @@ DonationRecipient=Aukos gavėjas
ThankYou=Ačiū
IConfirmDonationReception=Gavėjas deklaruoja sekančios sumos priėmimą kaip auką
MinimumAmount=Minimum amount is %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/lt_LT/externalsite.lang b/htdocs/langs/lt_LT/externalsite.lang
index b915c37a5ab8fe3beb5335f7f4ec501a12749c15..1196c8466c03a27558e8f1d9c10d9b4e3bcfadc2 100644
--- a/htdocs/langs/lt_LT/externalsite.lang
+++ b/htdocs/langs/lt_LT/externalsite.lang
@@ -1,4 +1,5 @@
# Dolibarr language file - Source file is en_US - externalsite
-# ExternalSiteSetup=Setup link to external website
-# ExternalSiteURL=External Site URL
-# ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExternalSiteSetup=Nustatymų nuoroda į išorinę interneto svetainę
+ExternalSiteURL=Išorinės svetainės URL
+ExternalSiteModuleNotComplete=Modulis ExternalSite nebuvo tinkamai sukonfigūruotas.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/lt_LT/holiday.lang b/htdocs/langs/lt_LT/holiday.lang
index 41e186648227bb6de8cae715b65de77bf867693e..597f964781a7604700cb912f64737d31b0ffe093 100644
--- a/htdocs/langs/lt_LT/holiday.lang
+++ b/htdocs/langs/lt_LT/holiday.lang
@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
CantCreateCP=You don't have the right to make leave requests.
InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=Atnaujinimas
CantUpdate=You cannot update this leave request.
NoDateDebut=Turite pasirinkti pradžios datą.
NoDateFin=Turite pasirinkti pabaigos datą.
-ErrorDureeCP=Jūsų prašymas suteikti atostogas neturi darbo dienų.
-TitleValidCP=Patvirtinti atostogų prašymą
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
ConfirmValidCP=Are you sure you want to approve the leave request?
DateValidCP=Data patvirtinta
TitleToValidCP=Send leave request
ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Atmesti atostogų prašymą
+TitleRefuseCP=Refuse the leave request
ConfirmRefuseCP=Are you sure you want to refuse the leave request?
NoMotifRefuseCP=Jūs turite pasirinkti priežastį dėl prašymo atostogoms atmetimo
-TitleCancelCP=Atšaukti atostogų prašymą
+TitleCancelCP=Cancel the leave request
ConfirmCancelCP=Are you sure you want to cancel the leave request?
DetailRefusCP=Atmetimo priežastis
DateRefusCP=Atmetimo data
@@ -78,7 +77,7 @@ ActionByCP=Atlieka
UserUpdateCP=Vartotojui
PrevSoldeCP=Ankstesnis balansas
NewSoldeCP=Naujas balansas
-alreadyCPexist=Atostogų prašymas jau buvo padarytas šiuo laikotarpiu.
+alreadyCPexist=A leave request has already been done on this period.
UserName=Pavadinimas/vardas
Employee=Darbuotojas
FirstDayOfHoliday=First day of vacation
@@ -88,25 +87,25 @@ ManualUpdate=Rankinis atnaujinimas
HolidaysCancelation=Leave request cancelation
## Configuration du Module ##
-ConfCP=Atostogų modulio konfigūracija
+ConfCP=Configuration of leave request module
DescOptionCP=Opcijos aprašymas
ValueOptionCP=Reikšmė
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
ConfirmConfigCP=Patvirtinti konfigūraciją
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
UpdateConfCPOK=Sėkmingai atnaujinta
ErrorUpdateConfCP=Atnaujinimo metu įvyko klaida, prašome pabandyti dar kartą.
-AddCPforUsers=Prašome pridėti vartotojų atostogų balansą pagal <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">paspaudę čia</a> .
-DelayForSubmitCP=Terminas kreiptis dėl atostogų
-AlertapprobatortorDelayCP=Neleidžia aprobuoti, jeigu atostogų prašymo pateikimui praleisti terminai
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
Module27130Name= Management of leave requests
Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
TitleOptionEventCP=Settings of leave requets for events
ValidEventCP=Patvirtinti
UpdateEventCP=Atnaujinti įvykius
diff --git a/htdocs/langs/lt_LT/interventions.lang b/htdocs/langs/lt_LT/interventions.lang
index 1c046dff1bc67280b0831b2336f50e8b60964e19..f50261243a8948cd2594c53cc032a28bdf1be3bd 100644
--- a/htdocs/langs/lt_LT/interventions.lang
+++ b/htdocs/langs/lt_LT/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Intervencija
Interventions=Intervencijos
InterventionCard=Intervencijos kortelė
NewIntervention=Nauja intervencija
-AddIntervention=Pridėti intervenciją
+AddIntervention=Create intervention
ListOfInterventions=Intervencijų sąrašas
EditIntervention=Redaguoti intervenciją
ActionsOnFicheInter=Intervencijos veiksmai
@@ -30,6 +30,15 @@ StatusInterInvoiced=Pateikta sąskaita
RelatedInterventions=Susiję intervencijos
ShowIntervention=Rodyti intervenciją
SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Sekančios intervencijos atstovas
TypeContact_fichinter_internal_INTERVENING=Intervencija
diff --git a/htdocs/langs/lt_LT/mails.lang b/htdocs/langs/lt_LT/mails.lang
index 5ffb0fd7525f6f0971205e4a544601d46e266336..39c860d518db97ca67dedae802e21c361e138ec4 100644
--- a/htdocs/langs/lt_LT/mails.lang
+++ b/htdocs/langs/lt_LT/mails.lang
@@ -115,7 +115,7 @@ SentBy=Išsiųsta iš
MailingNeedCommand=Saugumo sumetimais, siunčiant e-paštu yra geriau, kai tai atliekama iš komandinės eilutės. Jei turite vieną, kreipkitės į serverio administratorių pradėti šią komandą siųsti e-paštą visiems gavėjams:
MailingNeedCommand2=Galite siųsti jiems internetu pridedant parametrą MAILING_LIMIT_SENDBYWEB su maks. laiškų kiekio, norimų siųsti sesijos metu, reikšme. Tam eiti į Pagrindinis-Nustatymai-Kiti.
ConfirmSendingEmailing=Jei negalite ar teikiate prioritetą siųsti juos per Jūsų www naršyklę, prašome patvirtinti, kad esate tikri, kad norite siųsti e-paštą dabar iš naršyklės.
-LimitSendingEmailing=Pastaba: Internetu siunčiamas e-paštas yra ribojamas saugumo ir laiko sumetimais <b>%s</b> gavėjams pagal siuntimo sesiją.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=Išvalyti sąrašą
ToClearAllRecipientsClickHere=Spauskite čia, kad išvalytumėte šio e-laiško gavėjų sąrašą
ToAddRecipientsChooseHere=Įtraukti gavėjus pasirinkant iš sąrašų
@@ -133,6 +133,9 @@ Notifications=Pranešimai
NoNotificationsWillBeSent=Nėra numatytų e-pašto pranešimų šiam įvykiui ir įmonei
ANotificationsWillBeSent=1 pranešimas bus išsiųstas e-paštu
SomeNotificationsWillBeSent=%s pranešimai bus siunčiami e-paštu
-AddNewNotification=Įjungti naujo e-pašto pranešimo užklausą
-ListOfActiveNotifications=Visų aktyvių e-pašto pranešimo užklausų sąrašas
+AddNewNotification=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
ListOfNotificationsDone=Visų išsiųstų e-pašto pranešimų sąrašas
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/lt_LT/main.lang b/htdocs/langs/lt_LT/main.lang
index 0e998278fa0f1f5b3b384c0838d2edf61bdbccdf..e994caef29ea0b6cc490b62187d68cc9051f7313 100644
--- a/htdocs/langs/lt_LT/main.lang
+++ b/htdocs/langs/lt_LT/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Nepavyko rasti vartotojo <b>%s</b> Dolibar
ErrorNoVATRateDefinedForSellerCountry=Klaida, nėra apibrėžtų PVM tarifų šaliai '%s'.
ErrorNoSocialContributionForSellerCountry=Klaida, nėra apibrėžtų socialinių įmokų šaliai '%s'.
ErrorFailedToSaveFile=Klaida, nepavyko išsaugoti failo.
-ErrorOnlyPngJpgSupported=Klaida, palaikomi tik .png ir .jpg ekrano vaizdo formatai.
-ErrorImageFormatNotSupported=Jūsų PHP nepalaiko funkcijos konvertuoti šio formato vaizdus.
SetDate=Nustatyti datą
SelectDate=Pasirinkti datą
SeeAlso=Taip pat žiūrėkite %s
BackgroundColorByDefault=Fono spalva pagal nutylėjimą
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
FileWasNotUploaded=Failas prikabinimui pasirinktas, bet dar nebuvo įkeltas. Paspauskite tam "Pridėti failą".
NbOfEntries=Įrašų skaičius
GoToWikiHelpPage=Skaityti tiesioginės pagalbos žinyne (būtina interneto prieiga)
@@ -266,6 +266,7 @@ Afternoon=Popietė
Quadri=Ketur-
MonthOfDay=Dienos mėnuo
HourShort=H
+MinuteShort=mn
Rate=Norma
UseLocalTax=Įtraukti mokestį
Bytes=Baitų
@@ -340,6 +341,7 @@ FullList=Pilnas sąrašas
Statistics=Statistika
OtherStatistics=Kiti statistika
Status=Būklė
+Favorite=Favorite
ShortInfo=Informacija
Ref=Nuoroda
RefSupplier=Tiekėjo nuoroda
@@ -365,6 +367,7 @@ ActionsOnCompany=Įvykiai su šia trečiają šalimi
ActionsOnMember=Įvykiai su šiuo nariu
NActions=%s įvykiai
NActionsLate=%s vėluoja
+RequestAlreadyDone=Request already recorded
Filter=Filtras
RemoveFilter=Pašalinti filtrą
ChartGenerated=Sukurta diagrama
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Papildomų atributų nustatymas
URLPhoto=Nuotraukos/logotipo URL
SetLinkToThirdParty=Saitas į kitą trečiąją šalį
CreateDraft=Sukurti projektą
+SetToDraft=Back to draft
ClickToEdit=Spausk redaguoti
ObjectDeleted=Objektas %s ištrintas
ByCountry=Pagal šalį
@@ -678,7 +682,7 @@ ViewPrivateNote=Peržiūrėti pastabas
XMoreLines=%s paslėptos eilutės
PublicUrl=Viešas URL
AddBox=Add box
-
+SelectElementAndClickRefresh=Select an element and click Refresh
# Week day
Monday=Pirmadienis
Tuesday=Antradienis
diff --git a/htdocs/langs/lt_LT/margins.lang b/htdocs/langs/lt_LT/margins.lang
index e8d5fed1af9a379298973a5c33a511cf77ea3706..273ff448e747dcbe3ca0bb4255ed53a111df58db 100644
--- a/htdocs/langs/lt_LT/margins.lang
+++ b/htdocs/langs/lt_LT/margins.lang
@@ -1,50 +1,44 @@
# Dolibarr language file - Source file is en_US - marges
-Margin=Margin
-Margins=Margins
-TotalMargin=Total Margin
-MarginOnProducts=Margin / Products
-MarginOnServices=Margin / Services
-MarginRate=Margin rate
-MarkRate=Mark rate
-DisplayMarginRates=Display margin rates
-DisplayMarkRates=Display mark rates
-InputPrice=Input price
-
-margin=Profit margins management
-margesSetup=Profit margins management setup
-
-MarginDetails=Margin details
-
-ProductMargins=Product margins
-CustomerMargins=Customer margins
-SalesRepresentativeMargins=Sales representative margins
-
-ProductService=Product or Service
-AllProducts=All products and services
-ChooseProduct/Service=Choose product or service
-
-StartDate=Start date
-EndDate=End date
-Launch=Start
-
-ForceBuyingPriceIfNull=Force buying price if null
-ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0)
-MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
-UseDiscountAsProduct=As a product
-UseDiscountAsService=As a service
-UseDiscountOnTotal=On subtotal
-MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
-
-MARGIN_TYPE=Margin type
-MargeBrute=Raw margin
-MargeNette=Net margin
-MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - Cost price
-
-CostPrice=Cost price
-BuyingCost=Cost price
-UnitCharges=Unit charges
-Charges=Charges
-
-AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents
+Margin=Marža
+Margins=Maržos
+TotalMargin=Visa marža
+MarginOnProducts=Maržos/Produktai
+MarginOnServices=Maržos/Paslaugos
+MarginRate=Maržos norma
+MarkRate=Pažymėti normą
+DisplayMarginRates=Rodyti maržos normas
+DisplayMarkRates=Rodyti žymių normas
+InputPrice=Įvesti kaina
+margin=Pelno maržų valdymas
+margesSetup=Pelno maržų valdymo nustatymai
+MarginDetails=Maržos detalės
+ProductMargins=Produkto maržos
+CustomerMargins=Kliento maržos
+SalesRepresentativeMargins=Prekybos atstovo maržos
+ProductService=Produktas ar Paslaugos
+AllProducts=Visi produktai ir paslaugos
+ChooseProduct/Service=Pasirinkite produktą ar paslaugą
+StartDate=Pradžios data
+EndDate=Pabaigos data
+Launch=Pradžia
+ForceBuyingPriceIfNull=Priverstinė pirkimo kaina, jei nulis
+ForceBuyingPriceIfNullDetails=Jei "ON", marža bus 0 (pirkimo kaina = pardavimo kaina), kitaip ("OFF"), marža bus lygi pardavimo kainai (pirkimo kaina = 0)
+MARGIN_METHODE_FOR_DISCOUNT=Maržos metodas visuotinėms nuolaidoms
+UseDiscountAsProduct=Kaip produktas
+UseDiscountAsService=Kaip paslauga
+UseDiscountOnTotal=Tarpinė suma
+MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Apibrėžia, ar visuotinė nuolaida yra traktuojama kaip produktas, kaip paslaugos ar tik tarpinė sumamaržos skaičiavimui.
+MARGIN_TYPE=Maržos tipas
+MargeBrute=Maržos eilutė
+MargeNette=Grynojo pelno marža
+MARGIN_TYPE_DETAILS=Maržos eilutė: Pardavimo kaina - Pirkimo kaina<br/> Grynoji marža: Pardavimo kaina - Savikaina
+CostPrice=Savikaina
+BuyingCost=Savikaina
+UnitCharges=Vieneto sąnaudos
+Charges=Sąnaudos
+AgentContactType=Prekybos agento kontakto tipas
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/lt_LT/orders.lang b/htdocs/langs/lt_LT/orders.lang
index 8f24c81553558456ba9063d612f0b81723f8a313..f17be373c09ff860e7cd4fcd806abda635258e68 100644
--- a/htdocs/langs/lt_LT/orders.lang
+++ b/htdocs/langs/lt_LT/orders.lang
@@ -53,7 +53,7 @@ ShippingExist=Gabenimas vyksta
DraftOrWaitingApproved=Projektas arba patvirtintas, bet dar nebuvo užsakymo
DraftOrWaitingShipped=Projektas arba patvirtintas, bet dar negabenamas
MenuOrdersToBill=Pristatyti užsakymai
-MenuOrdersToBill2=Užsakymai, kuriems reikia pateikti sąskaitą-faktūrą
+MenuOrdersToBill2=Billable orders
SearchOrder=Ieškoti užsakymo
SearchACustomerOrder=Ieškoti kliento užsakymo
ShipProduct=Gabenti produktą
@@ -65,7 +65,7 @@ ValidateOrder=Patvirtinti užsakymą
UnvalidateOrder=Nepatvirtinti užsakymo
DeleteOrder=Ištrinti užsakymą
CancelOrder=Atšaukti užsakymą
-AddOrder=Pridėti užsakymą
+AddOrder=Create order
AddToMyOrders=Įtraukti į mano užsakymus
AddToOtherOrders=Įtraukti į kitų užsakymus
AddToDraftOrders=Pridėti į užsakymo projektą
@@ -154,7 +154,6 @@ OrderByPhone=Telefonas
CreateInvoiceForThisCustomer=Pateikti sąskaitą užsakymams
NoOrdersToInvoice=Nėra užsakymų, kuriems galima išrašyti sąskaitą
CloseProcessedOrdersAutomatically=Klasifikuoti "Apdoroti" visus pasirinktus užsakymus.
-MenuOrdersToBill2=Užsakymai, kuriems reikia pateikti sąskaitą-faktūrą
OrderCreation=Užsakymo kūrimas
Ordered=Užsakyta
OrderCreated=Jūsų užsakymai sukurti
diff --git a/htdocs/langs/lt_LT/oscommerce.lang b/htdocs/langs/lt_LT/oscommerce.lang
deleted file mode 100644
index 42a4a4551b6d42c92c114d1593dbc0f4f53ae4b3..0000000000000000000000000000000000000000
--- a/htdocs/langs/lt_LT/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-# OSCommerce=OS Commerce
-# OSCommerceSetup=OS Commerce module setup
-# OSCommerceSetupSaved=OS Commerce setup saved
-# OSCommerceServer=OS Commerce server host/ip
-# OSCommerceDatabaseName=OS Commerce database name
-# OSCommercePrefix=OS Commerce tables prefix
-# OSCommerceUser=OS Commerce database login
diff --git a/htdocs/langs/lt_LT/other.lang b/htdocs/langs/lt_LT/other.lang
index 87717932cadde64555cfcd53c6671d07c70af526..36fb7dd69b7a8171bfe4b35c6939323010a60bf1 100644
--- a/htdocs/langs/lt_LT/other.lang
+++ b/htdocs/langs/lt_LT/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=Saugos kodas
Calendar=Kalendorius
-AddTrip=Pridėti atskyriklį
Tools=Įrankiai
ToolsDesc=Ši sritis yra skirta įvairių Įrankių, nepasiekiamų per kitus meniu, grupei.<br><br> Šie įrankiai gali būti pasiekiami iš šoninio meniu.
Birthday=Gimimo diena
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Projekto kūrimas
Notify_TASK_CREATE=Task created
Notify_TASK_MODIFY=Task modified
Notify_TASK_DELETE=Task deleted
+SeeModuleSetup=See module setup
NbOfAttachedFiles=Prikabintų failų/dokumentų skaičius
TotalSizeOfAttachedFiles=Iš viso prikabintų failų/dokumentų dydis
MaxSize=Maksimalus dydis
@@ -80,6 +80,16 @@ ModifiedBy=Modifikuota %s
ValidatedBy=Patvirtinta %s
CanceledBy=Atšaukta %s
ClosedBy=Uždaryta %s
+CreatedById=User id who created
+ModifiedById=User id who made last change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made last change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
FileWasRemoved=Failas %s buvo pašalintas
DirWasRemoved=Katalogas %s buvo pašalintas
FeatureNotYetAvailableShort=Galimas sekančioje versijoje
@@ -193,25 +203,26 @@ ForgetIfNothing=Jei neprašėte šio pakeitimo, tiesiog pamirškite šį praneš
##### Calendar common #####
AddCalendarEntry=Pridėti įrašą kalendoriuje %s
-NewCompanyToDolibarr=Įmonė %s įdėta į Dolibarr
-ContractValidatedInDolibarr=Sutartis %s pripažinta galiojančia Dolibarr
-ContractCanceledInDolibarr=Sutartis %s atšaukta Dolibarr
-ContractClosedInDolibarr=Sutartis %s uždaryta Dolibarr
-PropalClosedSignedInDolibarr=Pasiūlymas %s pasirašytas Dolibarr
-PropalClosedRefusedInDolibarr=Pasiūlymas %s atmestas Dolibarr
-PropalValidatedInDolibarr=Pasiūlymas %s pripažintas galiojančiu Dolibarr
-InvoiceValidatedInDolibarr=Sąskaita-faktūra %s pripažinta galiojančia Dolibarr
-InvoicePaidInDolibarr=Sąskaita-faktūra %s pasikeista į apmokėtą Dolibarr
-InvoiceCanceledInDolibarr=Sąskaita-faktūra %s atšaukta Dolibarr
-PaymentDoneInDolibarr=Mokėjimas %s atliktas Dolibarr
-CustomerPaymentDoneInDolibarr=Kliento mokėjimas %s atliktas Dolibarr
-SupplierPaymentDoneInDolibarr=Tiekėjo mokėjimas %s atliktas Dolibarr
-MemberValidatedInDolibarr=Narys %s patvirtintas Dolibarr
-MemberResiliatedInDolibarr=Narys %s atkurtas Dolibarr
-MemberDeletedInDolibarr=Narys %s ištrintas iš Dolibarr
-MemberSubscriptionAddedInDolibarr=Pasirašymas nariui %s pridėtas į Dolibarr
-ShipmentValidatedInDolibarr=Pakrovimas %s patvirtintas Dolibarr
-ShipmentDeletedInDolibarr=Pakrovimas %s ištrintas iš Dolibarr
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
##### Export #####
Export=Eksportas
ExportsArea=Eksporto sritis
diff --git a/htdocs/langs/lt_LT/paybox.lang b/htdocs/langs/lt_LT/paybox.lang
index b689bb6cebff21b067564cffd144aa4a6aaa2e98..b615d096db2115a8844094d194799b19e2d8bfa9 100644
--- a/htdocs/langs/lt_LT/paybox.lang
+++ b/htdocs/langs/lt_LT/paybox.lang
@@ -1,37 +1,40 @@
# Dolibarr language file - Source file is en_US - paybox
-# PayBoxSetup=PayBox module setup
-# PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
-# FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
-# PaymentForm=Payment form
-# WelcomeOnPaymentPage=Welcome on our online payment service
-# ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
-# ThisIsInformationOnPayment=This is information on payment to do
-# ToComplete=To complete
-# YourEMail=Email to receive payment confirmation
-# Creditor=Creditor
-# PaymentCode=Payment code
-# PayBoxDoPayment=Go on payment
-# YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
-# PleaseBePatient=Please, be patient
-# Continue=Next
-# ToOfferALinkForOnlinePayment=URL for %s payment
-# ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
-# ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
-# ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
-# ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
-# ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
-# YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
-# SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> to have payment created automatically when validated by paybox.
-# YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-# YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
-# AccountParameter=Account parameters
-# UsageParameter=Usage parameters
-# InformationToFindParameters=Help to find your %s account information
-# PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment
-# VendorName=Name of vendor
-# CSSUrlForPaymentForm=CSS style sheet url for payment form
-# MessageOK=Message on validated payment return page
-# MessageKO=Message on canceled payment return page
-# NewPayboxPaymentReceived=New Paybox payment received
-# NewPayboxPaymentFailed=New Paybox payment tried but failed
-# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PayBoxSetup=Paybox modulio nustatymas
+PayBoxDesc=Šis modulis siūlo puslapius, leidžiančius mokėjimą <a href="http://www.paybox.com" target="_blank">Paybox</a> klientams. Tai gali būti naudojama nemokamam mokėjimui arba tam tikram specifiniam Dolibarr mokėjimui (sąskaitos-faktūros, užskymas, ...)
+FollowingUrlAreAvailableToMakePayments=Sekantys URL siūlo puslapį klientui Dolibarr objektų mokėjimui
+PaymentForm=Mokėjimo forma
+WelcomeOnPaymentPage=Sveiki atvykę į mūsų interneto mokėjimo paslaugą
+ThisScreenAllowsYouToPay=Šis ekranas leidžia atlikti internetinį mokėjimą į %s
+ThisIsInformationOnPayment=Tai informacija apie reikalingą atlikti mokėjimą
+ToComplete=Užbaigti
+YourEMail=E-paštas mokėjimo patvirtinimo gavimui
+Creditor=Kreditorius
+PaymentCode=Mokėjimo kodas
+PayBoxDoPayment=Eiti į mokėjimą
+YouWillBeRedirectedOnPayBox=Būsite nukreipti į saugų Paybox puslapį kredito kortelės informacijos įvedimui
+PleaseBePatient=Prašome, būkite kantrūs
+Continue=Kitas
+ToOfferALinkForOnlinePayment=URL %s mokėjimui
+ToOfferALinkForOnlinePaymentOnOrder=URL siūlo %s interneto mokėjimui vartotojo sąsają kliento užsakymui
+ToOfferALinkForOnlinePaymentOnInvoice=URL siūlo %s interneto mokėjimui vartotojo sąsają kliento sąskaitai-faktūrai
+ToOfferALinkForOnlinePaymentOnContractLine=URL siūlo %s interneto mokėjimui vartotojo sąsają sutarties eilutei.
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL siūlo %s interneto mokėjimui vartotojo sąsaja nemokamam kiekiui.
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL pasiūlymui %s interneto mokėjimui vartotojo sąsają nario pasirašymui.
+YouCanAddTagOnUrl=Taip pat galite pridėti URL parametrą <b>&tag=<i>value</i></b> į bet kurį URL (reikalingas tik nemokamam mokėjimui) pridėti nuosavo mokėjimo komentaro žymę.
+SetupPayBoxToHavePaymentCreatedAutomatically=Nustatyti savo Paybox su URL <b>%s</b>, kad mokėjimas būtų sukuriamas automatiškai, kai patvirtintas per PayBox.
+YourPaymentHasBeenRecorded=Šis puslapis patvirtina, kad jūsų mokėjimas buvo užregistruotas. Ačiū.
+YourPaymentHasNotBeenRecorded=Mokėjimas nebuvo įregistruotas ir operacija buvo atšaukta. Ačiū.
+AccountParameter=Sąskaitos parametrai
+UsageParameter=Naudojimo parametrai
+InformationToFindParameters=Padėti rasti savo %s sąskaitos informaciją
+PAYBOX_CGI_URL_V2=Paybox CGI modulio mokėjimams URL
+VendorName=Paravėjo vardas
+CSSUrlForPaymentForm=CSS stiliaus lapo URL mokėjimo formai
+MessageOK=Pranešimas patvirtinto mokėjimo grąžinimo puslapyje
+MessageKO=Pranešimas atšaukto mokėjimo grąžinimo puslapyje
+NewPayboxPaymentReceived=Naujas Paybox gautas mokėjimas
+NewPayboxPaymentFailed=Naujas Paybox mokėjimo bandymas, bet nepavykęs
+PAYBOX_PAYONLINE_SENDEMAIL=E-laiškas įspėjimui po apmokėjimo (sėkmingas ar ne)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/lt_LT/resource.lang b/htdocs/langs/lt_LT/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..d64075dfbf595897a63e3eebf19194d8f71030dd
--- /dev/null
+++ b/htdocs/langs/lt_LT/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
diff --git a/htdocs/langs/lt_LT/sendings.lang b/htdocs/langs/lt_LT/sendings.lang
index 2e735a6697c2698ee7d14e3697fff42859c1d386..38030437e9ba97c3cf2bff24591ef82c241cc681 100644
--- a/htdocs/langs/lt_LT/sendings.lang
+++ b/htdocs/langs/lt_LT/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=Šiuo metu, naujos siuntos sukūrimas atliktas i
RelatedShippings=Susiję siuntos
ShipmentLine=Siuntimo eilutė
CarrierList=Vežėjų sąrašas
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
# Sending methods
SendingMethodCATCH=Kliento pagautė
diff --git a/htdocs/langs/lt_LT/stocks.lang b/htdocs/langs/lt_LT/stocks.lang
index 5a69d15bac66c833b3435224f77860f2a4229447..de4457074dca3ac23468750bb3c4b3e6921a15ec 100644
--- a/htdocs/langs/lt_LT/stocks.lang
+++ b/htdocs/langs/lt_LT/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Sandėlio etiketė būtina
CorrectStock=Koreguoti atsargas
ListOfWarehouses=Sandėlių sąrašas
ListOfStockMovements=Atsargų judėjimų sąrašas
-StocksArea=Atsargų sritis
+StocksArea=Warehouses area
Location=Vieta
LocationSummary=Trumpas vietos pavadinimas
NumberOfDifferentProducts=Skirtingų produktų skaičius
diff --git a/htdocs/langs/lt_LT/users.lang b/htdocs/langs/lt_LT/users.lang
index 1bcbada5049eafc3b8abd4fa9c9305e817b62591..f463e8e7216b9785eb912aeec65a64b680edda75 100644
--- a/htdocs/langs/lt_LT/users.lang
+++ b/htdocs/langs/lt_LT/users.lang
@@ -63,7 +63,6 @@ ShowGroup=Rodyti grupę
ShowUser=Rodyti vartotoją
NonAffectedUsers=Neįgalioti vartotojai
UserModified=Vartotojas sėkmingai modifikuotas
-GroupModified=Grupė sėkmingai modifikuota
PhotoFile=Nuotraukos failas
UserWithDolibarrAccess=Vartotojas su Dolibarr prieiga
ListOfUsersInGroup=Šios grupės vartotojų sąrašas
@@ -103,7 +102,7 @@ UserDisabled=Vartotojas %s išjungtas
UserEnabled=Vartotojas %s aktyvuotas
UserDeleted=Vartotojas %s pašalintas
NewGroupCreated=Grupė %s sukurta
-GroupModified=Grupė sėkmingai modifikuota
+GroupModified=Group %s modified
GroupDeleted=Grupė %s pašalinta
ConfirmCreateContact=Ar tikrai norite sukurti Dolibarr sąskaitą šiam adresui ?
ConfirmCreateLogin=Ar tikrai norite sukurti Dolibarr sąskaitą šiam nariui ?
@@ -114,8 +113,10 @@ YourRole=Jūsų vaidmenys
YourQuotaOfUsersIsReached=Jūsų aktyvių vartotojų kvota išnaudota !
NbOfUsers=Vartotojų skaičius
DontDowngradeSuperAdmin=Tik superadministratorius gali sumažinti kito superadministratoriaus teises
-HierarchicalResponsible=Atsakomybės hierarchija
+HierarchicalResponsible=Supervisor
HierarchicView=Hierarchinis vaizdas
UseTypeFieldToChange=Pakeitimui naudoti laukelio tipą
OpenIDURL=OpenID URL
LoginUsingOpenID=Prisijungimui naudoti OpenID
+WeeklyHours=Weekly hours
+ColorUser=Color of the user
diff --git a/htdocs/langs/lt_LT/withdrawals.lang b/htdocs/langs/lt_LT/withdrawals.lang
index b9c09e7b8f54a58fffc582cdfcd04c84a1a56b00..57893855393f0a21a01b0dbf88cbb7ddac6e563c 100644
--- a/htdocs/langs/lt_LT/withdrawals.lang
+++ b/htdocs/langs/lt_LT/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=Kvitas
LastWithdrawalReceipts=Paskutinio %s išėmimo įplaukos
WithdrawedBills=Panaikintos sąskaitos-faktūros
WithdrawalsLines=Atšaukimo eilutės
-RequestStandingOrderToTreat=Periodinių neapdorotų užsakymų užklausa
-RequestStandingOrderTreated=Periodinių apdorotų užsakymų užklausa
+RequestStandingOrderToTreat=Request for standing orders to process
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=Kliento periodiniai užsakymai
CustomerStandingOrder=Kliento periodiniai užsakymai
NbOfInvoiceToWithdraw=Sąskaitos-faktūros su atsiėmimo prašymu numeris
@@ -40,14 +41,13 @@ TransMetod=Perdavimo būdas
Send=Siųsti
Lines=Linijos
StandingOrderReject=Išduoti atmetimą
-InvoiceRefused=Sąskaita-faktūra atmesta
WithdrawalRefused=Išėmimas atmestas
WithdrawalRefusedConfirm=Ar tikrai norite įvesti išėmimo atmetimą visuomenei ?
RefusedData=Atmetimo data
RefusedReason=Atmetimo priežastis
RefusedInvoicing=Atmetimo apmokestinimas
NoInvoiceRefused=Neapmokestinti atmetimo
-InvoiceRefused=Sąskaita-faktūra atmesta
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=Būklė
StatusUnknown=Nežinomas
StatusWaiting=Laukiama
@@ -76,7 +76,7 @@ WithBankUsingRIB=Banko sąskaitoms, naudojančioms RIB
WithBankUsingBANBIC=Banko sąskaitoms, naudojančioms IBAN / BIC / SWIFT
BankToReceiveWithdraw=Banko sąskaita išėmimų gavimui
CreditDate=Kreditą
-WithdrawalFileNotCapable=Neįmanoma sugeneruoti išėmimo gavimo failo Jūsų šaliai
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
ShowWithdraw=Rodyti Išėmimą
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Jei sąskaita-faktūra turi mažiausiai vieną išėmimo mokėjimą dar apdorojamą, tai nebus nustatyta kaip apmokėta, kad pirmiausia leisti išėmimo valdymą.
DoStandingOrdersBeforePayments=Ši kortelė leidžia prašyti periodinio užsakymo. Kai jis bus įvykdytas, galite įvesti mokėjimą sąskaitos-faktūros uždarymui.
diff --git a/htdocs/langs/lv_LV/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang
index e6c5bf4000ed466e66277e438636438ed1d0982a..cb192f1f6842c5741521e31eae3ce0310013da71 100644
--- a/htdocs/langs/lv_LV/accountancy.lang
+++ b/htdocs/langs/lv_LV/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts
Validate=Apstiprināt
Addanaccount=Add an accounting account
AccountAccounting=Accounting account
-Ventilation=Ventilation
+Ventilation=Breakdown
ToDispatch=Jānosūta
Dispatched=Nosūtīts
-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
TradeMargin=Trade margin
Reports=Atskaites
ByCustomerInvoice=By invoices customers
@@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger
Bookkeeping=Virsgrāmata
AccountBalanceByMonth=Konta bilance pa mēnešiem
-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
Line=Line
CAHTF=Total purchase supplier HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice
IntoAccount=In the accounting account
Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
+VentilationAuto=Automatic breakdown
Processing=Apstrādā
EndProcessing=The end of processing
@@ -66,11 +66,11 @@ Lineofinvoice=Line of invoice
VentilatedinAccount=Ventilated successfully in the accounting account
NotVentilatedinAccount=Not ventilated in the accounting account
-ACCOUNTING_SEPARATORCSV=Separator CSV
+ACCOUNTING_SEPARATORCSV=CSV atdalītājs
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
@@ -140,14 +140,14 @@ Active=Statement
NewFiscalYear=Jaauns fiskālais gads
-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
TotalVente=Total turnover HT
TotalMarge=Total sales margin
DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
ChangeAccount=Change the accounting account for lines selected by the account:
Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
@@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically
ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index 7d86abfa21d8c73e13cc0460b8a7937f3abfdf7d..36406135905123939704f3bc048fbf7787db38f7 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -14,7 +14,7 @@ SessionSavePath=Atmiņas sesija lokalizācija
PurgeSessions=Iztīrīt sesijas
ConfirmPurgeSessions=Vai jūs tiešām vēlaties iztīrītu visas sesijas? Tas atvienos katru lietotāju (izņemot sevi).
NoSessionListWithThisHandler=Saglabāt sesija apdarinātājs konfigurēts jūsu PHP neļauj uzskaitīt visas darbojošās sesijas.
-LockNewSessions=Lock jaunus sakarus
+LockNewSessions=Bloķēt jaunas sesijas
ConfirmLockNewSessions=Vai jūs tiešām vēlaties, lai ierobežotu jebkuru jaunu Dolibarr savienojumu ar sevi. Tikai lietotājs <b>%s</b> varēs pieslēgties pēc tam.
UnlockNewSessions=Noņemt savienojuma bloķēšanu
YourSession=Jūsu sesija
@@ -359,7 +359,7 @@ UrlGenerationParameters=Parametri, lai nodrošinātu drošas saites
SecurityTokenIsUnique=Izmantojiet unikālu securekey parametrs katram URL
EnterRefToBuildUrl=Ievadiet atsauci objektam %s
GetSecuredUrl=Saņemt aprēķināto URL
-ButtonHideUnauthorized=Slēpt pogas, lai neatļautu rīcību, nevis rāda invalīdu pogas
+ButtonHideUnauthorized=Slēpt pogas, kas nav pieejamas nevis rādīt tās pelēcīgas
OldVATRates=Vecā PVN likme
NewVATRates=Jaunā PVN likme
PriceBaseTypeToChange=Pārveidot par cenām ar bāzes atsauces vērtību, kas definēta tālāk
@@ -437,8 +437,8 @@ Module52Name=Krājumi
Module52Desc=Krājumu pārvaldīšana (produkti)
Module53Name=Pakalpojumi
Module53Desc=Pakalpojumu vadība
-Module54Name=Līgumi
-Module54Desc=Līgumu un pakalpojumu pārvaldība
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=Svītrkodi
Module55Desc=Svītrkodu vadība
Module56Name=Telefonija
@@ -475,8 +475,8 @@ Module320Name=RSS barotne
Module320Desc=Pievienot RSS plūsmu Dolibarr lapās
Module330Name=Grāmatzīmes
Module330Desc=Grāmatzīmju pārvaldība
-Module400Name=Projekti
-Module400Desc=Projektu vadība iekšpusē citiem moduļiem
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=Vebkalendārs
Module410Desc=Web kalendāra integrācija
Module500Name=Special expenses (tax, social contributions, dividends)
@@ -484,7 +484,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di
Module510Name=Atalgojums
Module510Desc=Management of employees salaries and payments
Module600Name=Paziņojumi
-Module600Desc=Sūtīt paziņojumus pa e-pastu uz dažiem Dolibarr biznesa notikumiem trešo pušu kontaktiem
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Ziedojumi
Module700Desc=Ziedojumu pārvaldība
Module1200Name=Dievlūdzējs
@@ -514,16 +514,16 @@ Module5000Name=Multi-kompānija
Module5000Desc=Ļauj jums pārvaldīt vairākus uzņēmumus
Module6000Name=Darba plūsma
Module6000Desc=Plūsmas vadība
-Module20000Name=Brīvdienas
-Module20000Desc=Atzīt un ievērot darbinieku brīvdienas
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
Module39000Name=Product batch
Module39000Desc=Batch number, eat-by and sell-by date management on products
Module50000Name=Paybox
Module50000Desc=Modulis piedāvā tiešsaistes maksājumu lapā, ar kredītkarti, ar Paybox
Module50100Name=Tirdzniecības punkts
Module50100Desc=Tirdzniecības punkta moduļi
-Module50200Name= Paypal
-Module50200Desc= Modulis piedāvā tiešsaistes maksājumu lapā ar kredītkarti ar Paypal
+Module50200Name=Paypal
+Module50200Desc=Modulis piedāvā tiešsaistes maksājumu lapā ar kredītkarti ar Paypal
Module50400Name=Accounting (advanced)
Module50400Desc=Accounting management (double parties)
Module54000Name=PrintIPP
@@ -543,7 +543,7 @@ Permission14=Pārbaudīt klientu rēķinus
Permission15=Nosūtīt klientu rēķinus pa e-pastu
Permission16=Izveidot maksājumus klientu rēķiniem
Permission19=Dzēst klienta rēķinu
-Permission21=Lasīt komerciālos priekšlikumus
+Permission21=Skatīt komerciālos priekšlikumus
Permission22=Izveidot/mainīt komerciālos priekšlikumus
Permission24=Apstiprināt komerciālos priekšlikumus
Permission25=Sūtīt komerciālus priekšlikumus
@@ -606,15 +606,16 @@ Permission151=Lasīt pastāvīgos pieprasījumus
Permission152=Izveidot / mainīt pastāvīgu pasūtījumu pieprasījumu
Permission153=Transmisijas regulārā maksājuma rīkojumu ieņēmumi
Permission154=Kredītkartes / atteikties regulārā maksājuma rīkojumu ieņēmumiem
-Permission161=Lasīt līgumus
-Permission162=Izveidot / mainīt līgumus
-Permission163=Aktivizētu pakalpojumu līgumu
-Permission164=Atslēgt pakalpojumu līguma slēgšanu
-Permission165=Dzēst līgumus
-Permission171=Lasīt braucienus
-Permission172=Izveidot / mainīt braucienus
-Permission173=Dzēst braucienus
-Permission178=Eksportēt braucienus
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Read trips and expenses (own and his subordinates)
+Permission172=Izveidot/labot ceļojumu un izdevumus
+Permission173=Dzēst ceļojumus un izdevumus
+Permission174=Read all trips and expenses
+Permission178=Eksportēt ceļojumus un izdevumus
Permission180=Lasīt piegādātājus
Permission181=Lasīt piegādātāju pasūtījumus
Permission182=Izveidot/mainīt piegādātāju pasūtījumus
@@ -666,12 +667,12 @@ Permission283=Dzēst kontaktus
Permission286=Eksportēt kontaktus
Permission291=Skatīt tarifus
Permission292=Kas atļaujas par tarifiem
-Permission293=Modificēt klientiem tarifus
+Permission293=Labot klientu tarifus
Permission300=Lasīt svītrkodus
Permission301=Izveidot / mainīt svītrkodus
Permission302=Dzēst svītrkodus
Permission311=Lasīt pakalpojumus
-Permission312=Piešķirt pakalpojumu līgumam
+Permission312=Assign service/subscription to contract
Permission331=Lasīt grāmatzīmes
Permission332=Izveidot/mainīt grāmatzīmes
Permission333=Dzēst grāmatzīmes
@@ -701,8 +702,8 @@ Permission701=Lasīt ziedojumus
Permission702=Izveidot/mainīt ziedojumus
Permission703=Dzēst ziedojumus
Permission1001=Lasīt krājumus
-Permission1002=Izveidot / mainīt krājumus
-Permission1003=Dzēst krājumus
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=Lasīt krājumu pārvietošanas
Permission1005=Izveidot/mainīt krājumu pārvietošanu
Permission1101=Skatīt piegādes pasūtījumus
@@ -995,9 +996,9 @@ YourPHPDoesNotHaveSSLSupport=SSL funkcijas, kas nav pieejama jūsu PHP
DownloadMoreSkins=Vairāki izskati lejupielādei
SimpleNumRefModelDesc=Atgriež atsauces numuru formātā %syymm-NNNN kur yy ir gads, MM ir mēnesis, un nnnn ir secība bez cauruma un bez reset
ShowProfIdInAddress=Rādīt professionnal id ar adresēm par dokumentu
-ShowVATIntaInAddress=Slēpt PVN Intra num ar adresēm uz dokumentiem
+ShowVATIntaInAddress=Slēpt PVN maksātāja numuru un adreses uz dokumentiem
TranslationUncomplete=Daļējs tulkojums
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="http://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Dažas valodas var būt daļēji iztulkotas, vai saturēt kļūdas. Ja atrodat kādu neprecizitāti, tad varat to izlabot piereģistrējoties <a href="http://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
MenuUseLayout=Padarīt vertikālās izvēlnes hidable (opcija JavaScript nedrīkst atspējots)
MAIN_DISABLE_METEO=Atslēgt Meteo skatu
TestLoginToAPI=Tests pieteikties API
@@ -1038,7 +1039,6 @@ YesInSummer=Jā vasarā
OnlyFollowingModulesAreOpenedToExternalUsers=Ņemiet vērā, ka tikai šādi moduļi ir pieejami ārējiem lietotājiem (Lai ar kādas ir atļaujas šiem lietotājiem):
SuhosinSessionEncrypt=Sesija uzglabāšana šifrēta ar Suhosin
ConditionIsCurrently=Stāvoklis šobrīd ir %s
-TestNotPossibleWithCurrentBrowsers=Automātiska noteikšana nav iespējama
YouUseBestDriver=Jūs varat izmantot vadītāja %s, kas ir labākais draiveris, kas pieejams šobrīd.
YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
NbOfProductIsLowerThanNoPb=Tev ir tikai %s produktus / pakalpojumus Into datu bāze. Tas nav nepieciešams kādu konkrētu optimizāciju.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=Atgriezties grāmatvedības kodu būvēts pēc: <br> %
ModuleCompanyCodePanicum=Atgriezt tukšu grāmatvedības uzskaites kodu.
ModuleCompanyCodeDigitaria=Grāmatvedība kods ir atkarīgs no trešās personas kodu. Kods sastāv no simbols "C" pirmajā pozīcijā un pēc tam pirmais 5 zīmēm no trešās puses kodu.
UseNotifications=Izmantot paziņojumus
-NotificationsDesc=E-pastus paziņojumi funkcija ļauj jums klusi sūtīt automātisko pastu, dažiem Dolibarr notikumiem, trešajām personām (klientiem vai piegādātājiem), kas ir konfigurēti. Izvēle aktīvas paziņošanas un Mērķu kontaktiem tiek veikta viena trešā persona laikā.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
ModelModules=Dokumentu veidnes
DocumentModelOdt=Izveidot dokumentus no OpenDocument veidnes (. ODT vai. ODS failus OpenOffice, KOffice, TextEdit, ...)
WatermarkOnDraft=Ūdenszīme dokumenta projektā
@@ -1124,7 +1124,7 @@ EnableEditDeleteValidInvoice=Nodrošinātu iespēju rediģēt / dzēst derīgu r
SuggestPaymentByRIBOnAccount=Ieteikt maksājumus, ko izņemt no konta
SuggestPaymentByChequeToAddress=Ieteikt maksājumu ar čeku, lai
FreeLegalTextOnInvoices=Brīvs teksts uz rēķiniem
-WatermarkOnDraftInvoices=Ūdenszīme projektu rēķiniem (none ja tukšs)
+WatermarkOnDraftInvoices=Ūdenszīme uz sagataves rēķiniem (nav ja tukšs)
##### Proposals #####
PropalSetup=Commercial priekšlikumi modulis uzstādīšana
CreateForm=Izveidot veidlapas
@@ -1138,14 +1138,16 @@ AddDeliveryAddressAbility=Pievienot piegādes datuma iespējas
UseOptionLineIfNoQuantity=Produkta / pakalpojuma ar nulles summu līnija tiek uzskatīta par iespēju
FreeLegalTextOnProposal=Brīvais teksts komerciālajos priekšlikumos
WatermarkOnDraftProposal=Ūdenszīme projektu komerciālo priekšlikumu (none ja tukšs)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=Pasūtījumu vadības iestatīšana
-OrdersNumberingModules=Pasūtījumi numerācijas modeļus
+OrdersNumberingModules=Pasūtījumu numerācijas modeļi
OrdersModelModule=Pasūtīt dokumenti modeļi
HideTreadedOrders=Hide the treated or cancelled orders in the list
ValidOrderAfterPropalClosed=Lai apstiprinātu pasūtījumu pēc priekšlikuma tuvāk, ļauj ne soli pa pagaidu rīkojumu
FreeLegalTextOnOrders=Brīvs teksts pasūtījumos
WatermarkOnDraftOrders=Ūdenszīme projektu pasūtījumiem (none ja tukšs)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
##### Clicktodial #####
ClickToDialSetup=Klikšķiniet Dial moduļa uzstādīšanas
ClickToDialUrlDesc=Url sauc, kad uz tālruņa Piktogramma klikšķis tiek darīts. In URL, jūs varat izmantot tagus <br> <b>__PHONETO__</b> Kas tiks aizstāts ar tālruņa numuru personai, lai izsauktu <br> <b>__PHONEFROM__</b> Kas tiks aizstāts ar tālruņa numuru, aicinot personas (jūsu) <br> <b>__LOGIN__</b> Kas tiks aizstāts ar jūsu clicktodial pieteikšanās (definēts jūsu lietotāja kartes) <br> <b>__PASS__</b> Kas tiks aizstāts ar jūsu clicktodial paroli (definēts jūsu lietotāja kartes).
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=Intervences numerācijas modeļi
TemplatePDFInterventions=Intervences karšu dokumenti modeļi
WatermarkOnDraftInterventionCards=Ūdenszīme intervences karšu dokumentiem (neviena ja tukšs)
##### Contracts #####
-ContractsSetup=Līgumi modulis uzstādīšana
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=Līgumi numerācijas moduļus
TemplatePDFContracts=Contracts documents models
FreeLegalTextOnContracts=Free text on contracts
@@ -1250,9 +1252,9 @@ LDAPLdapMapping=LDAP kartēšana
LDAPFieldLoginUnix=Lietotājs (Unix)
LDAPFieldLoginExample=Piemērs: uid
LDAPFilterConnection=Meklēšanas filtrs
-LDAPFilterConnectionExample=Piemērs: &(objektklase = inetOrgPerson)
-LDAPFieldLoginSamba=Login (samba, ActiveDirectory)
-LDAPFieldLoginSambaExample=Piemērs: samaccountname
+LDAPFilterConnectionExample=Piemērs: &(objektClass = inetOrgPerson)
+LDAPFieldLoginSamba=Lietotāja vārds (samba, Aktīvā direktorija)
+LDAPFieldLoginSambaExample=Piemērs: kāds konta nosaukums
LDAPFieldFullname=Vārds un uzvārds
LDAPFieldFullnameExample=Piemērs: cn
LDAPFieldPassword=Parole
@@ -1264,7 +1266,7 @@ LDAPFieldCommonNameExample=Piemērs: cn
LDAPFieldName=Nosaukums
LDAPFieldNameExample=Piemērs: sn
LDAPFieldFirstName=Vārds
-LDAPFieldFirstNameExample=Piemērs: givenName
+LDAPFieldFirstNameExample=Piemērs: Vārds
LDAPFieldMail=E-pasta adrese
LDAPFieldMailExample=Piemērs: pasts
LDAPFieldPhone=Darba tālruņa numurs
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Faili Tipa %s nav saspiesti ar HTTP serveri
CacheByServer=Cache serverim
CacheByClient=Cache pārlūks
CompressionOfResources=Kompresijas HTTP atbildes
-TestNotPossibleWithCurrentBrowsers=Automātiska noteikšana nav iespējama
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=Produktu moduļa uzstādīšana
ServiceSetup=Pakalpojumu moduļa uzstādīšana
@@ -1382,9 +1384,10 @@ MailingSetup=Pasta vēstuļu sūtīšanas modulis iestatīšanu
MailingEMailFrom=Nosūtītāja e-pasts (No) uz e-pastu nosūtīto vēstuļu sūtīšanas modulis
MailingEMailError=Atgriezties e-pastu (Kļūdas-līdz) uz e-pastu ar kļūdām
##### Notification #####
-NotificationSetup=Paziņošana bu e-pasta modulis iestatīšanas
+NotificationSetup=EMail notification module setup
NotificationEMailFrom=Nosūtītāja e-pasts (No) uz e-pastu nosūtīti paziņojumi
-ListOfAvailableNotifications=Saraksts ar pieejamiem paziņojumiem (Šis saraksts ir atkarīgs no aktīvajiem moduļiem)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
##### Sendings #####
SendingsSetup=Nosūtot modulis iestatīšanu
SendingsReceiptModel=Nosūtot saņemšanas modeli
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=Savienojums ar serveri '%s' par datu bāzē '%s' ar lietotāja
OSCommerceTestKo1=Savienojums ar serveri '%s' izdoties, bet datubāze '%s' nevar sasniegt.
OSCommerceTestKo2=Savienojums ar serveri '%s' ar lietotāja '%s' neizdevās.
##### Stock #####
-StockSetup=Konfigurācijas modulis akciju
-UserWarehouse=Izmantot lietotāja personīgos krājumi
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=Izvēlne dzēsta
TreeMenu=Izvēlņu koks
@@ -1478,11 +1482,14 @@ ClickToDialDesc=Šis modulis ļauj pievienot ikonu pēc tālruņa numuriem. Uz
##### Point Of Sales (CashDesk) #####
CashDesk=Tirdzniecības punkts
CashDeskSetup=Pārdošanas punktu moduļa iestatīšana
-CashDeskThirdPartyForSell=Generic trešajai personai izmantot pārdod
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Noklusējuma konts, lai izmantotu, lai saņemtu naudas maksājumus
CashDeskBankAccountForCheque= Noklusējuma konts, lai izmantotu, lai saņemtu maksājumus ar čeku
CashDeskBankAccountForCB= Noklusējuma konts, lai izmantotu, lai saņemtu maksājumus ar kredītkarti
-CashDeskIdWareHouse=Noliktava kuru jāizmanto pārdošanai
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Grāmatzīme modulis iestatīšanu
BookmarkDesc=Šis modulis ļauj pārvaldīt grāmatzīmes. Jūs varat arī pievienot īsceļus uz jebkuru Dolibarr lapām vai externale tīmekļa vietnes uz jūsu kreisajā izvēlnē.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Dzēst fiskālo gadu
ConfirmDeleteFiscalYear=Vai tiešām vēlaties dzēst fiskālo gadu?
Opened=Atvērts
Closed=Slēgts
-
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
Format=Formāts
TypePaymentDesc=0:Klienta maksāšanas veids, 1:Piegādātāja maksāšanas veids, 2:Abi klientu un piegādātāju maksāšanas veids
diff --git a/htdocs/langs/lv_LV/agenda.lang b/htdocs/langs/lv_LV/agenda.lang
index 5a18b50c2c7aba08c1d6dfb3522554a43d854055..ac398549ce79d18d59eb66ea8c51d2fe9936bdce 100644
--- a/htdocs/langs/lv_LV/agenda.lang
+++ b/htdocs/langs/lv_LV/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= Automātiskā aizpildīšana
AgendaAutoActionDesc= Noteikt šeit notikumus, par kuriem vēlaties Dolibarr izveidot automātiski Notikuma kārtībā. Ja nekas netiks pārbaudīts (pēc noklusējuma), tikai manuālā pasākumi tiks iekļauti darba kārtībā.
AgendaSetupOtherDesc= Šī lapa sniedz iespējas, lai ļautu eksportēt savu Dolibarr notikumiem uz ārēju kalendāru (Thunderbird, Google Calendar, ...)
AgendaExtSitesDesc=Šī lapa ļauj atzīt ārējos avotus kalendārus, lai redzētu savus notikumus uz Dolibarr kārtībā.
-ActionsEvents= Pasākumi, par kuriem Dolibarr radīs prasību kārtībā automātiski
-PropalValidatedInDolibarr= Priekšlikums %s apstiprināts
-InvoiceValidatedInDolibarr= Rēķins %s apstiprināts
+ActionsEvents=Pasākumi, par kuriem Dolibarr radīs prasību kārtībā automātiski
+PropalValidatedInDolibarr=Priekšlikums %s apstiprināts
+InvoiceValidatedInDolibarr=Rēķins %s apstiprināts
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=Rēķins %s doties atpakaļ uz melnrakstu
InvoiceDeleteDolibarr=Rēķins %s dzēsts
OrderValidatedInDolibarr= Pasūtījums %s pārbaudīts
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Pasūtījums %s apstiprināts
OrderRefusedInDolibarr=Pasūtījums %s atteikts
OrderBackToDraftInDolibarr=Pasūtījums %s doties atpakaļ uz melnrakstu
OrderCanceledInDolibarr=Pasūtījums %s atcelts
-InterventionValidatedInDolibarr=Intervences %s apstiprināts
ProposalSentByEMail=Komerciālais priedāvājums %s nosūtīts pa e-pastu
OrderSentByEMail=Klienta pasūtījums %s nosūtīts pa e-pastu
InvoiceSentByEMail=Klienta rēķins %s nosūtīts pa e-pastu
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=Piegādātāja pasūtījums %s nosūtīts pa e-pastu
SupplierInvoiceSentByEMail=Piegādātāja rēķins %s nosūtīts pa e-pastu
ShippingSentByEMail=Piegāde %s nosūtīta pa pastu
ShippingValidated= Piegāde %s apstiprināta
-InterventionSentByEMail=Intervences %s nosūtīta pa pastu
-InterventionClassifiedBilled=Intervention %s classified as Billed
NewCompanyToDolibarr= Trešā puses izveidota
DateActionPlannedStart= Plānotais sākuma datums
DateActionPlannedEnd= Plānotais beigu datums
@@ -70,9 +68,9 @@ DateActionStart= Sākuma datums
DateActionEnd= Beigu datums
AgendaUrlOptions1=Jūs varat pievienot arī šādus parametrus, lai filtrētu produkciju:
AgendaUrlOptions2=<b>login=%s</b> ierobežot izejas uz darbībām, ko rada, piešķirto vai izdarīt lietotāju <b>%s.</b>
-AgendaUrlOptions3=<b>Logina = %s</b> ierobežot izejas uz darbībām, ko rada lietotāju <b>%s.</b>
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
AgendaUrlOptions4=<b>logint = %s</b> ierobežot izejas darbībām piešķirto lietotāja <b>%s.</b>
-AgendaUrlOptions5=<b>logind = %s</b> ierobežot izejas uz darbībām, ko veic lietotājs <b>%s.</b>
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
AgendaShowBirthdayEvents=Rādīt kontaktu dzimšanas dienas
AgendaHideBirthdayEvents=Slēpt kontaktu dzimšanas dienas
Busy=Aizņemts
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=URL, lai piekļūtu. ICal failam
ExtSiteNoLabel=Nav Apraksta
WorkingTimeRange=Working time range
WorkingDaysRange=Working days range
-AddEvent=Add event
+AddEvent=Izveidot notikumu
MyAvailability=My availability
diff --git a/htdocs/langs/lv_LV/bills.lang b/htdocs/langs/lv_LV/bills.lang
index cb87cac35a7e7aa4ad4fd8414592c12d7fba1aca..bca0426a8b5aef5f750d3c09552d4274d8cbfb56 100644
--- a/htdocs/langs/lv_LV/bills.lang
+++ b/htdocs/langs/lv_LV/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Kredīta piezīme
InvoiceAvoirAsk=Kredīta piezīme, lai koriģētu rēķinu
InvoiceAvoirDesc=<b>Kredīts piezīme</b> ir negatīvs rēķins izmantot, lai atrisinātu to, ka rēķins ir summa, kas atšķiras par summu, patiesībā maksā (jo klients maksā pārāk daudz kļūdas dēļ, vai arī nav samaksāta pilnībā, jo viņš atgriezās dažus produktus, piemēram).
invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
-invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
ReplaceInvoice=Aizstāt rēķinu %s
ReplacementInvoice=Nomaiņa rēķins
ReplacedByInvoice=Aizstāts ar rēķinu %s
@@ -87,7 +87,7 @@ ClassifyCanceled=Klasificēt "Abandoned"
ClassifyClosed=Klasificēt 'Slēgts'
ClassifyUnBilled=Classify 'Unbilled'
CreateBill=Izveidot rēķinu
-AddBill=Pievienot rēķina vai kredīta piezīmi
+AddBill=Create invoice or credit note
AddToDraftInvoices=Pievienot izstrādāt rēķinu
DeleteBill=Dzēst rēķinu
SearchACustomerInvoice=Meklēt klienta rēķinu
@@ -99,7 +99,7 @@ DoPaymentBack=Atgriezt maksājumu
ConvertToReduc=Pārvērst nākotnes atlaidē
EnterPaymentReceivedFromCustomer=Ievadiet saņemto naudas summu no klienta
EnterPaymentDueToCustomer=Veikt maksājumu dēļ klientam
-DisabledBecauseRemainderToPayIsZero=Atspējots, jo atlikusī maksāt ir nulle
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
Amount=Summa
PriceBase=Bāzes cena
BillStatus=Rēķina statuss
@@ -137,8 +137,6 @@ BillFrom=No
BillTo=Kam
ActionsOnBill=Pasākumi attiecībā uz rēķinu
NewBill=Jauns rēķins
-Prélèvements=Regulārais maksājums
-Prélèvements=Regulārais maksājums
LastBills=Pēdējie %s rēķini
LastCustomersBills=Pēdējie %s klientu rēķini
LastSuppliersBills=Pēdējie %s piegādātāju rēķini
@@ -153,12 +151,12 @@ ConfirmValidateBill=Vai jūs tiešām vēlaties apstiprināt šo rēķinu ar ats
ConfirmUnvalidateBill=Vai esat pārliecināts, ka vēlaties mainīt rēķinu <b>%s</b> uz sagataves statusu?
ConfirmClassifyPaidBill=Vai esat pārliecināts, ka vēlaties mainīt rēķina <b>%s,</b> statusu uz maksāts?
ConfirmCancelBill=Vai esat pārliecināts, ka vēlaties atcelt rēķinu <b>%s</b> ?
-ConfirmCancelBillQuestion=Kāpēc jūs vēlaties, lai klasificētu šo rēķinu "pamesta"?
+ConfirmCancelBillQuestion=Kāpēc jūs vēlaties, lai klasificētu šo rēķinu 'pamests'?
ConfirmClassifyPaidPartially=Vai esat pārliecināts, ka vēlaties mainīt rēķina <b>%s</b> lai statusu apmaksāts?
ConfirmClassifyPaidPartiallyQuestion=Šis rēķins nav samaksāts pilnībā. Kādi ir iemesli, lai jūs varētu aizvērt šo rēķinu?
-ConfirmClassifyPaidPartiallyReasonAvoir=Atlikums maksāt <b>(%s %s)</b> ir atlaide piešķirta, jo maksājums tika veikts pirms termiņa. Es legalizēt PVN ar kredītu piezīmi.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Atlikums maksāt <b>(%s %s)</b> ir atlaide piešķirta, jo maksājums tika veikts pirms termiņa. Es piekrītu zaudēt PVN par šo atlaidi.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Atlikums maksāt <b>(%s %s)</b> ir atlaide piešķirta, jo maksājums tika veikts pirms termiņa. Es atgūt PVN par šo atlaidi, bez kredīta piezīmi.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
ConfirmClassifyPaidPartiallyReasonBadCustomer=Slikts klients
ConfirmClassifyPaidPartiallyReasonProductReturned=Produkti daļēji atgriezti
ConfirmClassifyPaidPartiallyReasonOther=Summa pamesti cita iemesla dēļ
@@ -191,9 +189,9 @@ AlreadyPaid=Jau samaksāts
AlreadyPaidBack=Jau atgriezta nauda
AlreadyPaidNoCreditNotesNoDeposits=Jau samaksāts (bez kredīta piezīmes un noguldījumiem)
Abandoned=Pamests
-RemainderToPay=Atlikums, kas jāsamaksā
-RemainderToTake=Atlikums veikt
-RemainderToPayBack=Atlikums, kas jāatmaksā
+RemainderToPay=Neapmaksāts
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
Rest=Līdz
AmountExpected=Pieprasīto summu
ExcessReceived=Excess saņemti
@@ -207,7 +205,7 @@ NoOtherDraftBills=Nekādi citi projekti rēķini
NoDraftInvoices=Nav projektu rēķini
RefBill=Rēķina ref
ToBill=Lai likumprojektu
-RemainderToBill=Atlikums rēķinu
+RemainderToBill=Jāsamaksā vēl
SendBillByMail=Nosūtīt rēķinu pa e-pastu
SendReminderBillByMail=Sūtīt atgādinājumu pa e-pastu
RelatedCommercialProposals=Saistītie tirdzniecības priekšlikumi
@@ -219,26 +217,25 @@ NoInvoice=Nav rēķinu
ClassifyBill=Klasificēt rēķinu
SupplierBillsToPay=Piegādātāji rēķinus apmaksāt
CustomerBillsUnpaid=Neapmaksātie klientu rēķini
-DispenseMontantLettres=Likumprojektu izstrādāja mašīnraksta ir jāatbrīvo no rīkojuma burtiem
-DispenseMontantLettres=Likumprojektu izstrādāja mašīnraksta ir jāatbrīvo no rīkojuma burtiem
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=Neatgūstams
SetConditions=Uzstādīt apmaksas nosacījumus
SetMode=Uzstādīt maksājumu režīmu
Billed=Samaksāts
-RepeatableInvoice=Iepriekš definēts rēķins
-RepeatableInvoices=Iepriekš definēti rēķini
-Repeatable=Iepriekš definēts
-Repeatables=Iepriekš definēts
-ChangeIntoRepeatableInvoice=Pārvērst iepriekš definētā
-CreateRepeatableInvoice=Izveidot iepriekš definētu rēķinu
-CreateFromRepeatableInvoice=Izveidot no iepriekš noteiktā rēķina
+RepeatableInvoice=Rēķina paraugs
+RepeatableInvoices=Rēķinu paraugs
+Repeatable=Sagateve
+Repeatables=Sagataves
+ChangeIntoRepeatableInvoice=Pārveidot par parauga rēķinu
+CreateRepeatableInvoice=Izveidot rēķina paraugu
+CreateFromRepeatableInvoice=Izveidot no parauga rēķina
CustomersInvoicesAndInvoiceLines=Klientu rēķinus un rēķinu s līnijas
CustomersInvoicesAndPayments=Klientu rēķiniem un maksājumiem
ExportDataset_invoice_1=Klientu rēķinu sarakstu un rēķins ir līnijas
ExportDataset_invoice_2=Klientu rēķiniem un maksājumiem
ProformaBill=Proforma Bils:
-Reduction=Samazināšana
-ReductionShort=Samazināšana.
+Reduction=Atlaide
+ReductionShort=Atlaide.
Reductions=Samazinājumi
ReductionsShort=Samazināšana.
Discount=Atlaide
@@ -322,7 +319,7 @@ VarAmount=Mainīgais apjoms (%% tot.)
PaymentTypeVIR=Bankas noguldījums
PaymentTypeShortVIR=Bankas noguldījums
PaymentTypePRE=Bankas rīkojums
-PaymentTypeShortPRE=Bankas pasūtījums
+PaymentTypeShortPRE=Bankas pārskaitījums
PaymentTypeLIQ=Skaidra nauda
PaymentTypeShortLIQ=Skaidra nauda
PaymentTypeCB=Kredītkarte
@@ -350,7 +347,7 @@ RegulatedOn=Regulēta uz
ChequeNumber=Pārbaudiet N °
ChequeOrTransferNumber=Pārbaudiet / Transfer N °
ChequeMaker=Pārbaudiet raidītājs
-ChequeBank=Banka pārbaude
+ChequeBank=Čeka izsniegšanas banka
NetToBePaid=Neto jāmaksā
PhoneNumber=Tel
FullPhoneNumber=Tālrunis
@@ -410,6 +407,6 @@ TypeContact_facture_external_BILLING=Klienta rēķina kontakts
TypeContact_facture_external_SHIPPING=Klientu kuģniecības kontakts
TypeContact_facture_external_SERVICE=Klienta pakalpojuma kontakts
TypeContact_invoice_supplier_internal_SALESREPFOLL=Pārstāvis turpinot darboties piegādātāju rēķinu
-TypeContact_invoice_supplier_external_BILLING=Piegādātāju rēķinu kontakts
+TypeContact_invoice_supplier_external_BILLING=Piegādātāja rēķinu kontaktpersona
TypeContact_invoice_supplier_external_SHIPPING=Piegādātājs kuģniecības kontakts
TypeContact_invoice_supplier_external_SERVICE=Piegādātājs dienests kontakts
diff --git a/htdocs/langs/lv_LV/categories.lang b/htdocs/langs/lv_LV/categories.lang
index 3337dc5b403e9176efe9c6c930e64f5a71fe9950..95aa9d16c4c50c9a0abc120776567bf21294dc5a 100644
--- a/htdocs/langs/lv_LV/categories.lang
+++ b/htdocs/langs/lv_LV/categories.lang
@@ -65,12 +65,12 @@ ReturnInSupplier=Atpakaļ uz piegādātāju karti
ReturnInCompany=Atpakaļ uz klienta / izredzes kartes
ContentsVisibleByAll=Saturs būs redzams visiem
ContentsVisibleByAllShort=Saturs redzams visiem
-ContentsNotVisibleByAllShort=Saturs nav redzami visi
+ContentsNotVisibleByAllShort=Saturu visi neredz
CategoriesTree=Sadaļu koks
DeleteCategory=Dzēst kategoriju
ConfirmDeleteCategory=Vai tiešām vēlaties dzēst šo sadaļu?
RemoveFromCategory=Noņemt sadaļas saiti
-RemoveFromCategoryConfirm=Vai esat pārliecināts, ka vēlaties noņemt saiti starp darījuma un kategorijā?
+RemoveFromCategoryConfirm=Vai esat pārliecināts, ka vēlaties noņemt saiti starp darījumu un sadaļu?
NoCategoriesDefined=Nav izveidotu sadaļu
SuppliersCategoryShort=Piegādātāju sadaļa
CustomersCategoryShort=Klientu sadaļa
@@ -93,17 +93,14 @@ InternalCategory=Iekšējā sadaļa
CategoryContents=Sadaļas saturs
CategId=Sadaļas id
CatSupList=Piegādātāju sadaļu saraksts
-CatCusList=Saraksts klientu / perspektīva kategorijām
+CatCusList=Klientu/perspektīva sadaļu saraksts
CatProdList=Produktu sadaļu saraksts
CatMemberList=Dalībnieku sadaļu saraksts
CatContactList=Saraksts kontaktu kategorijām un kontaktu
-CatSupLinks=Saikne starp piegādātājiem un kategorijām
+CatSupLinks=Saikne starp piegādātājiem un sadaļām
CatCusLinks=Saiknes starp klientu / perspektīvām un kategorijām
CatProdLinks=Saiknes starp produktu / pakalpojumu un kategoriju
CatMemberLinks=Saikne starp biedriem un kategorijām
-CatProdLinks=Saiknes starp produktu / pakalpojumu un kategoriju
-CatCusLinks=Saiknes starp klientu / perspektīvām un kategorijām
-CatSupLinks=Saikne starp piegādātājiem un kategorijām
DeleteFromCat=Noņemt no sadaļas
DeletePicture=Dzēst attēlu
ConfirmDeletePicture=Apstiprināt attēla dzēšanu
@@ -112,3 +109,4 @@ CategoriesSetup=Sadaļas iestatījumi
CategorieRecursiv=Link with parent category automatically
CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category
diff --git a/htdocs/langs/lv_LV/compta.lang b/htdocs/langs/lv_LV/compta.lang
index 21c2433e46dbf94f8d49fa3dbdc4540cbe83b0c9..8c1e60218e21a0fa50f4ee1f359a87e3f809a8b0 100644
--- a/htdocs/langs/lv_LV/compta.lang
+++ b/htdocs/langs/lv_LV/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad klienta grāmatvedības kodu %s
SuppliersProductsSellSalesTurnover=Radītais apgrozījums, ko no piegādātāja produkcijas pārdošanas.
CheckReceipt=Čeka depozīts
CheckReceiptShort=Pārbaudīt depozītu
+LastCheckReceiptShort=Last %s check receipts
NewCheckReceipt=Jauna atlaide
NewCheckDeposit=Jauns pārbaude depozīts
NewCheckDepositOn=Izveidot kvīti par depozīta kontā: %s
diff --git a/htdocs/langs/lv_LV/contracts.lang b/htdocs/langs/lv_LV/contracts.lang
index 44268727261bee64b3ab79a02dfb93dbec67b9cb..9ba92ea73c9badd00d83e6738cedfcfd97da57eb 100644
--- a/htdocs/langs/lv_LV/contracts.lang
+++ b/htdocs/langs/lv_LV/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Līgumu sadaļa
ListOfContracts=Līgumu sarakstu
-LastContracts=Pēdējās %s modificēts līgumus
+LastModifiedContracts=Last %s modified contracts
AllContracts=Visi līgumi
ContractCard=Līguma kartiņa
ContractStatus=Līgums statuss
@@ -27,7 +27,7 @@ MenuRunningServices=Darbojošies pakalpojumi
MenuExpiredServices=Beigušies pakalpojumi
MenuClosedServices=Slēgtie pakalpojumi
NewContract=Jaunu līgumu
-AddContract=Pievienot līgums
+AddContract=Izveidot līgmu
SearchAContract=Meklēt līgumu
DeleteAContract=Dzēst līgumu
CloseAContract=Slēgt līgumu
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Saraksts darbojas līguma līniju
ListOfRunningServices=Saraksts ar aktīvajiem pakalpojumiem
NotActivatedServices=Neaktīvais pakalpojumi (starp apstiprinātiem līgumiem)
BoardNotActivatedServices=Pakalpojumi aktivizēt starp apstiprinātiem līgumiem
-LastContracts=Pēdējās %s modificēts līgumus
+LastContracts=Last % contracts
LastActivatedServices=Pēdējais %s aktivizētais pakalpojums
LastModifiedServices=Pēdējais %s labotais pakalpojums
EditServiceLine=Edit servisa līnija
diff --git a/htdocs/langs/lv_LV/cron.lang b/htdocs/langs/lv_LV/cron.lang
index cca8d25e5af1006f27a1a358ca34b8947cc4af89..fdbba9abcff3cec46f2ab5c7c3bc6dff6c47b556 100644
--- a/htdocs/langs/lv_LV/cron.lang
+++ b/htdocs/langs/lv_LV/cron.lang
@@ -18,14 +18,13 @@ CronExplainHowToRunUnix=Par Unix vidē, jums vajadzētu izmantot crontab palaist
CronExplainHowToRunWin=Microsoft (tm), Windows environement jūs varat izmantot regulāro uzdevums rīkus, lai palaistu komandrindas viena otras minūtes
# Menu
CronJobs=Plānotie darbi
-CronListActive= Aktīvo darbu saraksts
-CronListInactive= Saraksts ar invaliditāti darba vietas
-CronListActive= Aktīvo darbu saraksts
+CronListActive=List of active/scheduled jobs
+CronListInactive=Saraksts ar invaliditāti darba vietas
# Page list
CronDateLastRun=Pēdējo reizi palaists
CronLastOutput=Pēdējo reizi palaist izejas
-CronLastResult=Pēdējais rezultāts kods
-CronListOfCronJobs=Saraksts ar plānoto darbu
+CronLastResult=Pēdējais rezultātu kods
+CronListOfCronJobs=Saraksts ar plānotajiem darbiem
CronCommand=Komanda
CronList=Darbu saraksts
CronDelete= Dzēst cron darbavietas
diff --git a/htdocs/langs/lv_LV/donations.lang b/htdocs/langs/lv_LV/donations.lang
index 8eeef8d3755f336800905e182c0b21fd8f261af5..0d9036343bb4e7d56e9cef7b1cf3074a52d525e5 100644
--- a/htdocs/langs/lv_LV/donations.lang
+++ b/htdocs/langs/lv_LV/donations.lang
@@ -4,7 +4,7 @@ Donations=Ziedojumi
DonationRef=Ziedojuma ref.
Donor=Donors
Donors=Donori
-AddDonation=Pievienot ziedojumu
+AddDonation=Izveidot ziedojumu
NewDonation=Jauns ziedojums
ShowDonation=Rādīt ziedojumu
DonationPromise=Dāvanu solījumu
@@ -30,4 +30,9 @@ SearchADonation=Meklēt ziedojumu
DonationRecipient=Ziedojuma saņēmējs
ThankYou=Paldies
IConfirmDonationReception=Saņēmējs atzīt saņemšanu, kā ziedojums, par šādu summu
-MinimumAmount=Minimum amount is %s
+MinimumAmount=Minimum amount is %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/lv_LV/externalsite.lang b/htdocs/langs/lv_LV/externalsite.lang
index 2c84feb75bbb19f5e8dc34f2d1af2def1948bf7e..55591b840fada6bcd6827172bceaef0388d9c52a 100644
--- a/htdocs/langs/lv_LV/externalsite.lang
+++ b/htdocs/langs/lv_LV/externalsite.lang
@@ -2,3 +2,4 @@
ExternalSiteSetup=Ārējo vietņu iestatīšana
ExternalSiteURL=Ārējā Vietnes URL
ExternalSiteModuleNotComplete=Modulis ExternalSite nav pareizi konfigurēts.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/lv_LV/holiday.lang b/htdocs/langs/lv_LV/holiday.lang
index 6580ca40ca2fa052fe9f7d357a31c0f1b401f43c..358ca95141da8e397614bacc7db367defc22c150 100644
--- a/htdocs/langs/lv_LV/holiday.lang
+++ b/htdocs/langs/lv_LV/holiday.lang
@@ -6,7 +6,7 @@ MenuReportMonth=Ikmēneša paziņojums
MenuAddCP=Make a leave request
NotActiveModCP=You must enable the module Leaves to view this page.
NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
-NoCPforUser=You don't have any available day.
+NoCPforUser=Jums nav nevienas brīvas dienas
AddCP=Make a leave request
Employe=Darbinieks
DateDebCP=Sākuma datums
@@ -35,7 +35,7 @@ InfosCP=Information of the leave request
InfosWorkflowCP=Informācijas plūsma
RequestByCP=Pieprasījis
TitreRequestCP=Leave request
-NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCP=Patērēto atvaļinājuma dienu skaits
EditCP=Rediģēt
DeleteCP=Dzēst
ActionValidCP=Apstiprināt
@@ -43,25 +43,24 @@ ActionRefuseCP=Atteikt
ActionCancelCP=Atcelt
StatutCP=Statuss
SendToValidationCP=Sūtīt uz apstiprināšanu
-TitleDeleteCP=Delete the leave request
+TitleDeleteCP=Leave request
ConfirmDeleteCP=Confirm the deletion of this leave request?
ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
CantCreateCP=You don't have the right to make leave requests.
InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=Atjaunināt
CantUpdate=You cannot update this leave request.
NoDateDebut=Jums ir jāizvēlas sākuma datums.
NoDateFin=Jums ir jāizvēlas beigu datums.
-ErrorDureeCP=Jūsu pieprasījums brīvdienas nesatur darba dienu.
-TitleValidCP=Apstiprināt brīvdienu pieprasījumu
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
ConfirmValidCP=Are you sure you want to approve the leave request?
DateValidCP=Datums apstiprināts
TitleToValidCP=Send leave request
ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Noraidīt brīvdienu pieprasījumu
+TitleRefuseCP=Refuse the leave request
ConfirmRefuseCP=Are you sure you want to refuse the leave request?
NoMotifRefuseCP=Jums ir jāizvēlas iemesls kāpēc atteikt pieprasījums.
-TitleCancelCP=Atcelt brīvdienu pieprasījumu
+TitleCancelCP=Cancel the leave request
ConfirmCancelCP=Are you sure you want to cancel the leave request?
DetailRefusCP=Atteikuma iemesls
DateRefusCP=Atteikuma datums
@@ -78,35 +77,35 @@ ActionByCP=Veic
UserUpdateCP=Lietotājam
PrevSoldeCP=Iepriekšējā bilance
NewSoldeCP=Jana Bilance
-alreadyCPexist=Brīvdienām pieprasījums jau ir izdarīts šajā laika posmā.
+alreadyCPexist=A leave request has already been done on this period.
UserName=Vārds
Employee=Darbinieks
-FirstDayOfHoliday=First day of vacation
-LastDayOfHoliday=Last day of vacation
+FirstDayOfHoliday=Pirmā atvaļinājuma diena
+LastDayOfHoliday=Pēdēja atvaļinājuma diena
HolidaysMonthlyUpdate=Ikmēneša atjauninājums
ManualUpdate=Manuāla aktualizēšana
HolidaysCancelation=Leave request cancelation
## Configuration du Module ##
-ConfCP=Konfigurācija brīvdienas moduļa
+ConfCP=Configuration of leave request module
DescOptionCP=Apraksts iespēju
ValueOptionCP=Vērtība
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
ConfirmConfigCP=Apstiprināt konfigurāciju
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
UpdateConfCPOK=Veiksmīgi atjaunināta.
ErrorUpdateConfCP=Kļūda atjaunināšanas laikā, lūdzu, mēģiniet vēlreiz.
-AddCPforUsers=Lūdzu, pievienojiet līdzsvaru svētkiem lietotājiem, <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">klikšķinot šeit</a> .
-DelayForSubmitCP=Termiņš, lai pieteiktos brīvdienām
-AlertapprobatortorDelayCP=Novērst approbator ja brīvdienu pieprasījums neatbilst termiņu
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
-nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbUserCP=Lietotāju skaits, kuru atbalsta modulis leaves
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
Module27130Name= Management of leave requests
Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
TitleOptionEventCP=Settings of leave requets for events
ValidEventCP=Apstiprināt
UpdateEventCP=Atjaunināt notikumus
@@ -136,7 +135,7 @@ HolidaysToValidateDelay=This leave request will take place within a period of le
HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
HolidaysValidated=Validated leave requests
HolidaysValidatedBody=Your leave request for %s to %s has been validated.
-HolidaysRefused=Request denied
+HolidaysRefused=Pieprasījums noraidīts
HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
HolidaysCanceled=Canceled leaved request
HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
diff --git a/htdocs/langs/lv_LV/interventions.lang b/htdocs/langs/lv_LV/interventions.lang
index c24ded1a1300aa8d3b2090165c0ffbb2a05a3df0..2b5798ca1982a5717ee9cdf2c2729899e530d0c3 100644
--- a/htdocs/langs/lv_LV/interventions.lang
+++ b/htdocs/langs/lv_LV/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Iejaukšanās
Interventions=Iejaukšanās
InterventionCard=Iejaukšanās kartiņa
NewIntervention=Jauna iejaukšanās
-AddIntervention=Pievienot iejaukšanos
+AddIntervention=Create intervention
ListOfInterventions=Iejaukšanās saraksts
EditIntervention=Labot iejaukšanos
ActionsOnFicheInter=Pasākumi attiecībā uz intervenci
@@ -30,6 +30,15 @@ StatusInterInvoiced=Jāmaksā
RelatedInterventions=Saistītie pasākumi
ShowIntervention=Rādīt iejaukšanās
SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Pārstāvis turpinot darboties iejaukšanās
TypeContact_fichinter_internal_INTERVENING=Iejaukšanās
diff --git a/htdocs/langs/lv_LV/mails.lang b/htdocs/langs/lv_LV/mails.lang
index 97e77443c8b902b6518eb245a1f82684dded977a..2a1530a3612042050f1b0ce6a47190cbbe307654 100644
--- a/htdocs/langs/lv_LV/mails.lang
+++ b/htdocs/langs/lv_LV/mails.lang
@@ -12,7 +12,7 @@ MailTitle=Apraksts
MailFrom=Nosūtītājs
MailErrorsTo=Kļūdas līdz
MailReply=Atbildēt uz
-MailTo=Uztvērējs (-i)
+MailTo=Saņēmējs (-i)
MailCC=Kopēt
MailCCC=Kešatmiņā kopiju
MailTopic=E-pasta tēma
@@ -115,7 +115,7 @@ SentBy=Iesūtīja
MailingNeedCommand=Drošības apsvērumu dēļ, sūtot e-pasta vēstuļu sūtīšanas ir labāk, ja to veic no komandrindas. Ja jums ir viens, jautājiet savam servera administratoru, lai uzsāktu šādu komandu, lai nosūtītu pasta vēstuļu sūtīšanas uz visiem saņēmējiem:
MailingNeedCommand2=Taču jūs varat sūtīt tos tiešsaistē, pievienojot parametru MAILING_LIMIT_SENDBYWEB ar vērtību max skaitu e-pasta Jūs vēlaties nosūtīt pa sesiju. Lai to izdarītu, dodieties uz Home - Setup - pārējie.
ConfirmSendingEmailing=Ja jūs nevarat vai dod nosūtot tos ar savu Web pārlūkprogrammu, lūdzu, apstipriniet, jūs esat pārliecināts, ka vēlaties nosūtīt e-pastu tagad no jūsu pārlūkprogrammā?
-LimitSendingEmailing=Piezīme: On line nosūtīšanu emailings ir ierobežoti drošības un taimautu, Iemesli <b>%s</b> adresātus, nosūtot sesiju.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=Nodzēst sarakstu
ToClearAllRecipientsClickHere=Klikšķiniet šeit, lai notīrītu adresātu sarakstu par šo pasta vēstuļu sūtīšanas
ToAddRecipientsChooseHere=Pievienotu adresātus, izvēloties no sarakstiem
@@ -133,6 +133,9 @@ Notifications=Paziņojumi
NoNotificationsWillBeSent=Nav e-pasta paziņojumi ir plānota šī notikuma, un uzņēmums
ANotificationsWillBeSent=1 paziņojums tiks nosūtīts pa e-pastu
SomeNotificationsWillBeSent=%s paziņojumi tiks nosūtīti pa e-pastu
-AddNewNotification=Aktivizēt jaunu e-pasta paziņojumu pieteikumu
-ListOfActiveNotifications=Uzskaitiet visus aktīvos e-pasta paziņojumu pieprasījumiem
+AddNewNotification=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
ListOfNotificationsDone=Uzskaitīt visus e-pasta nosūtītās paziņojumus
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang
index 5a02e07292e1ebdf1f30e0085634e764e6a0cc41..f2a4fe61cb88c42a0c334b6a7baee70ac497f0b2 100644
--- a/htdocs/langs/lv_LV/main.lang
+++ b/htdocs/langs/lv_LV/main.lang
@@ -55,15 +55,15 @@ ErrorDuplicateField=Dubulta vērtība unikālā laukā
ErrorSomeErrorWereFoundRollbackIsDone=Dažas kļūdas tika atrastas. Mēs atgriezām atpakaļ visu izejas pozīcijā.
ErrorConfigParameterNotDefined=Parametrs <b>%s</b> nav definētas Dolibarr konfigurācijas failā <b>conf.php.</b>
ErrorCantLoadUserFromDolibarrDatabase=Neizdevās atrast lietotāju <b>%s</b> Dolibarr datu bāzē.
-ErrorNoVATRateDefinedForSellerCountry=Kļūda, PVN likme nav definēta sekojošai valstij "%s".
+ErrorNoVATRateDefinedForSellerCountry=Kļūda, PVN likme nav definēta sekojošai valstij '%s'.
ErrorNoSocialContributionForSellerCountry=Kļūda, nav definēts sociālās iemaksas veids valstī "%s".
ErrorFailedToSaveFile=Kļūda, neizdevās saglabāt failu.
-ErrorOnlyPngJpgSupported=Kļūda, tikai. Png un. Jpg attēla formāti ir atļauti.
-ErrorImageFormatNotSupported=Jūsu PHP neatbalsta funkcijas, lai pārvērstu attēlus šajā formātā.
SetDate=Iestatīt datumu
SelectDate=Izvēlēties datumu
SeeAlso=Skatīt arī %s
BackgroundColorByDefault=Noklusējuma fona krāsu
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
FileWasNotUploaded=Fails ir izvēlēts pielikumam, bet vēl nav augšupielādēti. Noklikšķiniet uz "Pievienot failu", lai to pievienotu.
NbOfEntries=Ierakstu sk
GoToWikiHelpPage=Lasīt tiešsaistes palīdzību (nepieciešams interneta piekļuve)
@@ -81,7 +81,7 @@ PasswordForgotten=Aizmirsāt paroli?
SeeAbove=Skatīt iepriekš
HomeArea=Mājas sadaļa
LastConnexion=Pēdējā savienojums
-PreviousConnexion=Iepriekšējais savienojums
+PreviousConnexion=Iepriekšējā pieslēgšanās
ConnectedOnMultiCompany=Pieslēgts videi
ConnectedSince=Pievienots kopš
AuthenticationMode=Autentifikācija režīms
@@ -157,7 +157,7 @@ SearchOf=Meklēšana
Valid=Derīgs
Approve=Apstiprināt
ReOpen=Atvērt par jaunu
-Upload=Sūtīt failu
+Upload=Augšupielādēt failu
ToLink=Saite
Select=Atlasīt
Choose=Izvēlēties
@@ -266,6 +266,7 @@ Afternoon=Vakars
Quadri=Kvadrāt-
MonthOfDay=Mēneša laikā no dienas
HourShort=H
+MinuteShort=mn
Rate=Likme
UseLocalTax=Ar PVN
Bytes=Baiti
@@ -339,7 +340,8 @@ List=Saraksts
FullList=Pilns saraksts
Statistics=Statistika
OtherStatistics=Citas statistika
-Status=Status
+Status=Statuss
+Favorite=Favorite
ShortInfo=Info.
Ref=Ref.
RefSupplier=Ref. piegādātājs
@@ -365,6 +367,7 @@ ActionsOnCompany=Pasākumi par šīs trešās personas
ActionsOnMember=Pasākumi par šo locekli
NActions=%s notikumi
NActionsLate=%s vēlu
+RequestAlreadyDone=Request already recorded
Filter=Filtrs
RemoveFilter=Noņemt filtru
ChartGenerated=Grafiks izveidots
@@ -375,16 +378,16 @@ Duration=Ilgums
TotalDuration=Kopējais pasākuma ilgums
Summary=Kopsavilkums
MyBookmarks=Manas grāmatzīmes
-OtherInformationsBoxes=Citas informācijas ailes
+OtherInformationsBoxes=Cita informācija
DolibarrBoard=Dolibarr padome
DolibarrStateBoard=Statistika
-DolibarrWorkBoard=Darba uzdevumi padome
+DolibarrWorkBoard=Darba uzdevumi
Available=Pieejams
NotYetAvailable=Nav vēl pieejams
NotAvailable=Nav pieejams
Popularity=Popularitāte
-Categories=Kategorijas
-Category=Kategorija
+Categories=Sadaļas
+Category=Sadaļa
By=Līdz
From=No
to=līdz
@@ -403,7 +406,7 @@ Reporting=Pārskata
Reportings=Pārskati
Draft=Melnraksts
Drafts=Melnraksti
-Validated=Validēta
+Validated=Apstiprināts
Opened=Atvērts
New=Jauns
Discount=Atlaide
@@ -540,7 +543,7 @@ InfoAdmin=Informācija administratoriem
Undo=Atcelt
Redo=Atcelt
ExpandAll=Izvērst visu
-UndoExpandAll=Atsaukt paplašināt
+UndoExpandAll=Paplašināt
Reason=Iemesls
FeatureNotYetSupported=Funkcija netiek atbalstīta
CloseWindow=Aizvērt logu
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Papildus atribūtu iestatīšana
URLPhoto=Saite bildei/logo
SetLinkToThirdParty=Saite uz citu trešo pusei
CreateDraft=Izveidot melnrakstu
+SetToDraft=Atpakaļ uz melnrakstu
ClickToEdit=Klikšķiniet, lai rediģētu
ObjectDeleted=Objekts %s dzēsts
ByCountry=Pēc valsts
@@ -678,7 +682,7 @@ ViewPrivateNote=Apskatīt piezīmes
XMoreLines=%s līnija(as) slēptas
PublicUrl=Publiskā saite
AddBox=Pievienot info logu
-
+SelectElementAndClickRefresh=Izvēlieties elementu un nospiediet atjaunot
# Week day
Monday=Pirmdiena
Tuesday=Otrdiena
diff --git a/htdocs/langs/lv_LV/margins.lang b/htdocs/langs/lv_LV/margins.lang
index 23e19fe33928342bb53fea5b092002d72f962c33..4a221740342ece1dcc2f84293343a761b4b23da4 100644
--- a/htdocs/langs/lv_LV/margins.lang
+++ b/htdocs/langs/lv_LV/margins.lang
@@ -22,7 +22,7 @@ ChooseProduct/Service=Izvēlies preci vai pakalpojumu
StartDate=Sākuma datums
EndDate=Beigu datums
Launch=Sākt
-ForceBuyingPriceIfNull=Force iepirkuma cena, ja null
+ForceBuyingPriceIfNull=Forsēt iepirkuma cenu, ja nulle
ForceBuyingPriceIfNullDetails=ja "ON", starpība būs nulle tiešsaistē (pirkšanas cena = pārdošanas cenu), pretējā gadījumā ("OFF"), Marge būs vienāda ar pārdošanas cenu (pirkšanas cena = 0)
MARGIN_METHODE_FOR_DISCOUNT=Maržinālā metode pasaules atlaides
UseDiscountAsProduct=Kā produktu
@@ -38,4 +38,7 @@ BuyingCost=Pašizmaksa
UnitCharges=Vienības izmaksas
Charges=Maksas
AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/lv_LV/orders.lang b/htdocs/langs/lv_LV/orders.lang
index 5069f05eab487816a58abfe5ae08e7f135d5488b..a15b3d85d245d9eb12ac5c141e12a24bbbdede0e 100644
--- a/htdocs/langs/lv_LV/orders.lang
+++ b/htdocs/langs/lv_LV/orders.lang
@@ -53,7 +53,7 @@ ShippingExist=Sūtījums pastāv
DraftOrWaitingApproved=Projektu vai apstiprinājušas vēl nav pasūtīts
DraftOrWaitingShipped=Projektu vai apstiprināt vēl nav nosūtīti
MenuOrdersToBill=Pasūtījumi piegādāti
-MenuOrdersToBill2=Pasūtījumi, kas jāapmaksā
+MenuOrdersToBill2=Billable orders
SearchOrder=Meklēšanas kārtība
SearchACustomerOrder=Meklēt klienta pasūtījumu
ShipProduct=Sūtīt produktu
@@ -65,7 +65,7 @@ ValidateOrder=Apstiprināt pasūtījumu
UnvalidateOrder=Unvalidate pasūtījumu
DeleteOrder=Dzēst pasūtījumu
CancelOrder=Atcelt pasūtījumu
-AddOrder=Pievienot pasūtījumu
+AddOrder=Jauns pasūtījums
AddToMyOrders=Pievienot maniem pasūtījumiem
AddToOtherOrders=Pievienot citiem pasūtījumiem
AddToDraftOrders=Pievienot rīkojuma projektu
@@ -154,7 +154,6 @@ OrderByPhone=Telefons
CreateInvoiceForThisCustomer=Rēķinu pasūtījumi
NoOrdersToInvoice=Nav pasūtījumi apmaksājamo
CloseProcessedOrdersAutomatically=Klasificēt "apstrādā" visus atlasītos pasūtījumus.
-MenuOrdersToBill2=Pasūtījumi, kas jāapmaksā
OrderCreation=Pasūtīt izveide
Ordered=Sakārtots
OrderCreated=Jūsu pasūtījumi ir radīti
diff --git a/htdocs/langs/lv_LV/oscommerce.lang b/htdocs/langs/lv_LV/oscommerce.lang
deleted file mode 100644
index 3841b934eb6932e6ca83f5a5dae4be5c5e944df5..0000000000000000000000000000000000000000
--- a/htdocs/langs/lv_LV/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=OS Commerce moduļa konfigurēšana
-OSCommerceSetupSaved=OS Commerce uzstādīšanas konfigurācija saglabāta
-OSCommerceServer=OS Commerce servera nosaukums / ip adrese
-OSCommerceDatabaseName=OS Commerce datubāzes nosaukums
-OSCommercePrefix=OS Commerce tabulas prefikss
-OSCommerceUser=OS Commerce datu bāzes pieteikšanās vārds
diff --git a/htdocs/langs/lv_LV/other.lang b/htdocs/langs/lv_LV/other.lang
index f612333dce4677384660a6940cb814ab3fdb85f7..c7d228cf34caa832ca061e52e411c682cd317798 100644
--- a/htdocs/langs/lv_LV/other.lang
+++ b/htdocs/langs/lv_LV/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=Drošības kods
Calendar=Kalendārs
-AddTrip=Pievienot ceļojumu
Tools=Darbarīki
ToolsDesc=Šī joma ir veltīta grupas dažādiem rīkiem nav pieejama citās izvēlnes ierakstus. <br><br> Šos rīkus var sasniegt no izvēlnes uz pusi.
Birthday=Dzimšanas diena
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Projekts izveidots
Notify_TASK_CREATE=Uzdevums izveidots
Notify_TASK_MODIFY=Uzdevums labots
Notify_TASK_DELETE=Uzdevums dzēsts
+SeeModuleSetup=See module setup
NbOfAttachedFiles=Skaits pievienotos failus / dokumentus
TotalSizeOfAttachedFiles=Kopējais apjoms pievienotos failus / dokumentus
MaxSize=Maksimālais izmērs
@@ -59,7 +59,7 @@ PredefinedMailTest=Šis ir testa e-pasts \\ nthe divas līnijas ir atdalīti ar
PredefinedMailTestHtml=Tas ir <b>tests</b> pasts (vārds testam jābūt treknrakstā). <br> Abas līnijas ir atdalīti ar rakstatgriezi. <br><br> __SIGNATURE__
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\n\nYou will find here the invoice __FACREF__\n\n\n__PERSONALIZED__Sincerely\n\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n\n__PERSONALIZED__Sincerely\n\n\n\n__SIGNATURE__
-PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nJums tiek nosūtīts komerciālais piedāvājums __PROPREF__\n\n__PERSONALIZED__Ar cieņu\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
@@ -203,25 +203,26 @@ ForgetIfNothing=Ja Jums nav lūgt šīs izmaiņas, vienkārši aizmirst šo e-pa
##### Calendar common #####
AddCalendarEntry=Pievienot ierakstu kalendārā %s
-NewCompanyToDolibarr=Uzņēmums %s pievienots Dolibarr
-ContractValidatedInDolibarr=Līgums %s apstiprināts Dolibarr
-ContractCanceledInDolibarr=Līgums %s anulēts Dolibarr
-ContractClosedInDolibarr=Līgums %s slēgts Dolibarr
-PropalClosedSignedInDolibarr=Priekšlikums %s parakstīts Dolibarr
-PropalClosedRefusedInDolibarr=Priekšlikums %s atteikts Dolibarr
-PropalValidatedInDolibarr=Priekšlikums %s apstiprināts Dolibarr
-InvoiceValidatedInDolibarr=Rēķins %s pārbaudīts Dolibarr
-InvoicePaidInDolibarr=Rēķins mainīts %s uz samaksāts Dolibarr
-InvoiceCanceledInDolibarr=Rēķins %s atcelts Dolibarr
-PaymentDoneInDolibarr=Maksājumu %s veikts Dolibarr
-CustomerPaymentDoneInDolibarr=Klientu maksājumu %s veikts Dolibarr
-SupplierPaymentDoneInDolibarr=Piegādātāja maksājums %s veikts Dolibarr
-MemberValidatedInDolibarr=Dalībnieks %s apstiprināts ar Dolibarr
-MemberResiliatedInDolibarr=Dalībvalstis %s resiliated jo Dolibarr
-MemberDeletedInDolibarr=Dalībnieks %s izdzēsts no Dolibarr
-MemberSubscriptionAddedInDolibarr=Parakstīšanās uz dalībvalstīm %s papildina Dolibarr
-ShipmentValidatedInDolibarr=Sūtījumi %s apstiprināti Dolibarr
-ShipmentDeletedInDolibarr=Sūtījums %s izdzēsts no Dolibarr
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
##### Export #####
Export=Eksportēt
ExportsArea=Eksportēšanas sadaļa
diff --git a/htdocs/langs/lv_LV/paybox.lang b/htdocs/langs/lv_LV/paybox.lang
index edfeea53eb33ea1a687b92fbad929c1b476a161c..1b7b7db71def4b723cfd4d67a88cd3941e456c6d 100644
--- a/htdocs/langs/lv_LV/paybox.lang
+++ b/htdocs/langs/lv_LV/paybox.lang
@@ -35,3 +35,6 @@ MessageKO=Ziņa par atcelto maksājumu atgriešanās lapā
NewPayboxPaymentReceived=Jauns Paybox maksājums saņemts
NewPayboxPaymentFailed=Jauns Paybox maksājums mēģināju, bet neizdevās
PAYBOX_PAYONLINE_SENDEMAIL=E-pastu, lai brīdinātu pēc maksājuma (veiksme vai nav)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/lv_LV/resource.lang b/htdocs/langs/lv_LV/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..d64075dfbf595897a63e3eebf19194d8f71030dd
--- /dev/null
+++ b/htdocs/langs/lv_LV/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
diff --git a/htdocs/langs/lv_LV/sendings.lang b/htdocs/langs/lv_LV/sendings.lang
index 72849e0b9f75749e7ac61c76521360387fd67a62..7eed9a6f743adf7f1b5aae12ea66817daaa0a166 100644
--- a/htdocs/langs/lv_LV/sendings.lang
+++ b/htdocs/langs/lv_LV/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=Izveidot jaunu sūtījumu var no pasūtījuma ka
RelatedShippings=Saistītie sūtījumi
ShipmentLine=Sūtījumu līnija
CarrierList=Saraksts pārvadātājiem
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
# Sending methods
SendingMethodCATCH=Nozvejas klienta
@@ -74,5 +76,5 @@ SumOfProductVolumes=Summa saražotās produkcijas apjomu
SumOfProductWeights=Summēt produkta svaru
# warehouse details
-DetailWarehouseNumber= Warehouse details
+DetailWarehouseNumber= Noliktavas detaļas
DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/lv_LV/stocks.lang b/htdocs/langs/lv_LV/stocks.lang
index b2b6cfc6e25401cdcba2f1ec51f5365f12b8669d..7d8e5c0b9aecf0a62c3e870d77188b33e90097ac 100644
--- a/htdocs/langs/lv_LV/stocks.lang
+++ b/htdocs/langs/lv_LV/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Noliktavas nosaukums ir nepieciešams
CorrectStock=Labot krājumus
ListOfWarehouses=Saraksts noliktavās
ListOfStockMovements=Krājumu pārvietošanas saraksts
-StocksArea=Krājumu sadaļa
+StocksArea=Warehouses area
Location=Vieta
LocationSummary=Īsais atrašanās vietas nosaukums
NumberOfDifferentProducts=Dažādu produktu skaits
@@ -118,8 +118,8 @@ SelectProductInAndOutWareHouse=Izvēlieties produktu, daudzumu, avota noliktavu
RecordMovement=Ierakstīt transfert
ReceivingForSameOrder=Šī pasūtījuma ienākumi
StockMovementRecorded=Krājumu pārvietošana saglabāta
-RuleForStockAvailability=Rules on stock requirements
+RuleForStockAvailability=Noteikumi krājumu nepieciešamībai
StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
+StockMustBeEnoughForOrder=Krājumiem jābūt pietiekošiem, lai preci/pakalpojum varētu pievienot pasūtījumam
StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
diff --git a/htdocs/langs/lv_LV/users.lang b/htdocs/langs/lv_LV/users.lang
index 8dd3789847950881fe179f9723e8ea5528540eb0..cbd3417f334f80d1edfdca2ed3c17ea441b07af4 100644
--- a/htdocs/langs/lv_LV/users.lang
+++ b/htdocs/langs/lv_LV/users.lang
@@ -1,8 +1,8 @@
# Dolibarr language file - Source file is en_US - users
HRMArea=HRM sadaļa
-UserCard=Lietotāja karte
-ContactCard=Kontaktu karte
-GroupCard=Grupas karte
+UserCard=Lietotāja kartiņa
+ContactCard=Kontaktu kartiņa
+GroupCard=Grupas kartiņa
NoContactCard=Nav kartes vidū kontaktiem
Permission=Atļauja
Permissions=Atļaujas
@@ -63,7 +63,6 @@ ShowGroup=Rādīt grupa
ShowUser=Rādīt lietotāju
NonAffectedUsers=Nav piešķirtis lietotājiem
UserModified=Lietotājs modificēts veiksmīgi
-GroupModified=Grupa modificēta veiksmīgi
PhotoFile=Attēla fails
UserWithDolibarrAccess=Lietotājs ar Dolibarr piekļuvi
ListOfUsersInGroup=Lietotāju saraksts, kas atrodas šajā grupā
@@ -103,7 +102,7 @@ UserDisabled=Lietotājs %s bloķēts
UserEnabled=Lietotājs %s aktivizēts
UserDeleted=Lietotājs %s noņemts
NewGroupCreated=Grupa %s izveidota
-GroupModified=Grupa modificēta veiksmīgi
+GroupModified=Group %s modified
GroupDeleted=Grupa %s noņemta
ConfirmCreateContact=Vai jūs tiešām vēlaties, lai izveidotu Dolibarr kontu par šo kontaktu?
ConfirmCreateLogin=Vai jūs tiešām vēlaties, lai izveidotu Dolibarr kontu ši?
@@ -114,8 +113,10 @@ YourRole=Jūsu lomas
YourQuotaOfUsersIsReached=Jūsu aktīvo lietotāju limits ir sasniegts!
NbOfUsers=Lietotāju sk
DontDowngradeSuperAdmin=Tikai superadmin var pazemināt superadmin
-HierarchicalResponsible=Hierarhiska atbildīga
+HierarchicalResponsible=Uzraugs
HierarchicView=Hierarhiska view
UseTypeFieldToChange=Izmantojiet lauka veids, lai mainītu
OpenIDURL=OpenID URL
LoginUsingOpenID=Izmantojiet OpenID, lai pieteiktos
+WeeklyHours=Nedēļas stundas
+ColorUser=Color of the user
diff --git a/htdocs/langs/lv_LV/withdrawals.lang b/htdocs/langs/lv_LV/withdrawals.lang
index 1b880e82ebbec55d4352d6c7180e146662248780..df6d59bd321cfa98af9977e2132b7e27ce20b733 100644
--- a/htdocs/langs/lv_LV/withdrawals.lang
+++ b/htdocs/langs/lv_LV/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=Saņemšana
LastWithdrawalReceipts=Pēdējās %s abstinences ieņēmumi
WithdrawedBills=Atsauktie rēķini
WithdrawalsLines=Abstinences līnijas
-RequestStandingOrderToTreat=Pieprasījums stāvot pasūtījumus, lai ārstētu
-RequestStandingOrderTreated=Pieprasījums regulārā maksājuma rīkojumu apstrādā
+RequestStandingOrderToTreat=Request for standing orders to process
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=Klientu regulārie maksājumi
CustomerStandingOrder=Klientu regulārais maksājums
NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
@@ -40,15 +41,14 @@ TransMetod=Darījuma veids
Send=Sūtīt
Lines=Lines
StandingOrderReject=Noraidīt
-InvoiceRefused=Rēķins atteikts
WithdrawalRefused=Atsaukšana
WithdrawalRefusedConfirm=Vai jūs tiešām vēlaties, lai ievadītu izdalīšanās noraidījumu sabiedrībai
RefusedData=Noraidījuma datums
RefusedReason=Noraidījuma iemesls
RefusedInvoicing=Rēķinu noraidījumu
NoInvoiceRefused=Nav maksas noraidīšanu
-InvoiceRefused=Rēķins atteikts
-Status=Status
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
+Status=Statuss
StatusUnknown=Nezināms
StatusWaiting=Gaidīšana
StatusTrans=Sūtīt
@@ -76,12 +76,12 @@ WithBankUsingRIB=Attiecībā uz banku kontiem, izmantojot RIB
WithBankUsingBANBIC=Attiecībā uz banku kontiem, izmantojot IBAN / BIC / SWIFT
BankToReceiveWithdraw=Bankas kontu, lai saņemtu atsauc
CreditDate=Kredīts
-WithdrawalFileNotCapable=Nevar radīt izņemšanas kvīti failu jūsu valstī
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
ShowWithdraw=Rādīt izņemšana
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Tomēr, ja rēķins satur vismaz vienu maksājums, kas nav apstrādāts, to nevar noteikt kā apmaksātu.
DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
WithdrawalFile=Izstāšanās fails
-SetToStatusSent=Iestatīts uz statusu "File Sent"
+SetToStatusSent=Nomainīt uz statusu "Fails nosūtīts"
ThisWillAlsoAddPaymentOnInvoice=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
### Notifications
diff --git a/htdocs/langs/mk_MK/accountancy.lang b/htdocs/langs/mk_MK/accountancy.lang
index 8cab9d2b651d75b0721d76fda619e2034e4509b4..39c2732ec29852cf93d41614ed1812c2a4c1ce4f 100644
--- a/htdocs/langs/mk_MK/accountancy.lang
+++ b/htdocs/langs/mk_MK/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts
Validate=Validate
Addanaccount=Add an accounting account
AccountAccounting=Accounting account
-Ventilation=Ventilation
+Ventilation=Breakdown
ToDispatch=To dispatch
Dispatched=Dispatched
-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
TradeMargin=Trade margin
Reports=Reports
ByCustomerInvoice=By invoices customers
@@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger
Bookkeeping=General ledger
AccountBalanceByMonth=Account balance by month
-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
Line=Line
CAHTF=Total purchase supplier HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice
IntoAccount=In the accounting account
Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
+VentilationAuto=Automatic breakdown
Processing=Processing
EndProcessing=The end of processing
@@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account
ACCOUNTING_SEPARATORCSV=Separator CSV
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
@@ -140,14 +140,14 @@ Active=Statement
NewFiscalYear=New fiscal year
-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
TotalVente=Total turnover HT
TotalMarge=Total sales margin
DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
ChangeAccount=Change the accounting account for lines selected by the account:
Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
@@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically
ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang
index e3e30f01dd45fb2c05d3f595e65a403a20a57b5c..b5d84a0aca719247703edbf256ec07a363a655bc 100644
--- a/htdocs/langs/mk_MK/admin.lang
+++ b/htdocs/langs/mk_MK/admin.lang
@@ -437,8 +437,8 @@ Module52Name=Stocks
Module52Desc=Stock management (products)
Module53Name=Services
Module53Desc=Service management
-Module54Name=Contracts
-Module54Desc=Contract and service management
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=Barcodes
Module55Desc=Barcode management
Module56Name=Telephony
@@ -475,8 +475,8 @@ Module320Name=RSS Feed
Module320Desc=Add RSS feed inside Dolibarr screen pages
Module330Name=Bookmarks
Module330Desc=Bookmark management
-Module400Name=Projects
-Module400Desc=Project management inside other modules
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=Webcalendar
Module410Desc=Webcalendar integration
Module500Name=Special expenses (tax, social contributions, dividends)
@@ -484,7 +484,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di
Module510Name=Salaries
Module510Desc=Management of employees salaries and payments
Module600Name=Notifications
-Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Donations
Module700Desc=Donation management
Module1200Name=Mantis
@@ -514,16 +514,16 @@ Module5000Name=Multi-company
Module5000Desc=Allows you to manage multiple companies
Module6000Name=Workflow
Module6000Desc=Workflow management
-Module20000Name=Holidays
-Module20000Desc=Declare and follow employees holidays
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
Module39000Name=Product batch
Module39000Desc=Batch number, eat-by and sell-by date management on products
Module50000Name=PayBox
Module50000Desc=Module to offer an online payment page by credit card with PayBox
Module50100Name=Point of sales
Module50100Desc=Point of sales module
-Module50200Name= Paypal
-Module50200Desc= Module to offer an online payment page by credit card with Paypal
+Module50200Name=Paypal
+Module50200Desc=Module to offer an online payment page by credit card with Paypal
Module50400Name=Accounting (advanced)
Module50400Desc=Accounting management (double parties)
Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=Read standing orders
Permission152=Create/modify a standing orders request
Permission153=Transmission standing orders receipts
Permission154=Credit/refuse standing orders receipts
-Permission161=Read contracts
-Permission162=Create/modify contracts
-Permission163=Activate a service of a contract
-Permission164=Disable a service of a contract
-Permission165=Delete contracts
-Permission171=Read trips
-Permission172=Create/modify trips
-Permission173=Delete trips
-Permission178=Export trips
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Read trips and expenses (own and his subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
Permission180=Read suppliers
Permission181=Read supplier orders
Permission182=Create/modify supplier orders
@@ -671,7 +672,7 @@ Permission300=Read bar codes
Permission301=Create/modify bar codes
Permission302=Delete bar codes
Permission311=Read services
-Permission312=Assign service to contract
+Permission312=Assign service/subscription to contract
Permission331=Read bookmarks
Permission332=Create/modify bookmarks
Permission333=Delete bookmarks
@@ -701,8 +702,8 @@ Permission701=Read donations
Permission702=Create/modify donations
Permission703=Delete donations
Permission1001=Read stocks
-Permission1002=Create/modify stocks
-Permission1003=Delete stocks
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=Read stock movements
Permission1005=Create/modify stock movements
Permission1101=Read delivery orders
@@ -1038,7 +1039,6 @@ YesInSummer=Yes in summer
OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
SuhosinSessionEncrypt=Session storage encrypted by Suhosin
ConditionIsCurrently=Condition is currently %s
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
YouUseBestDriver=You use driver %s that is best driver available currently.
YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by
ModuleCompanyCodePanicum=Return an empty accountancy code.
ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
UseNotifications=Use notifications
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events, to third parties (customers or suppliers) that are configured to. Choice of active notification and targets contacts is made one third party at time.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
ModelModules=Documents templates
DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
WatermarkOnDraft=Watermark on draft document
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=Add delivery date ability
UseOptionLineIfNoQuantity=A line of product/service with a zero amount is considered as an option
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list
ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order
FreeLegalTextOnOrders=Free text on orders
WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
##### Clicktodial #####
ClickToDialSetup=Click To Dial module setup
ClickToDialUrlDesc=Url called when a click on phone picto is done. In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=Intervention numbering models
TemplatePDFInterventions=Intervention card documents models
WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
##### Contracts #####
-ContractsSetup=Contracts module setup
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=Contracts numbering modules
TemplatePDFContracts=Contracts documents models
FreeLegalTextOnContracts=Free text on contracts
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
CacheByServer=Cache by server
CacheByClient=Cache by browser
CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=Products module setup
ServiceSetup=Services module setup
@@ -1382,9 +1384,10 @@ MailingSetup=EMailing module setup
MailingEMailFrom=Sender EMail (From) for emails sent by emailing module
MailingEMailError=Return EMail (Errors-to) for emails with errors
##### Notification #####
-NotificationSetup=Notification bu email module setup
+NotificationSetup=EMail notification module setup
NotificationEMailFrom=Sender EMail (From) for emails sent for notifications
-ListOfAvailableNotifications=List of available notifications (This list depends on activated modules)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
##### Sendings #####
SendingsSetup=Sending module setup
SendingsReceiptModel=Sending receipt model
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe
OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
##### Stock #####
-StockSetup=Configuration module stock
-UserWarehouse=Use user personal stocks
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=Menu deleted
TreeMenu=Tree menus
@@ -1478,11 +1482,14 @@ ClickToDialDesc=This module allows to add an icon after phone numbers. A click o
##### Point Of Sales (CashDesk) #####
CashDesk=Point of sales
CashDeskSetup=Point of sales module setup
-CashDeskThirdPartyForSell=Generic third party to use for sells
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Default account to use to receive cash payments
CashDeskBankAccountForCheque= Default account to use to receive payments by cheque
CashDeskBankAccountForCB= Default account to use to receive payments by credit cards
-CashDeskIdWareHouse=Warehouse to use for sells
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Bookmark module setup
BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Delete fiscal year
ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
Opened=Opened
Closed=Closed
-
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
diff --git a/htdocs/langs/mk_MK/agenda.lang b/htdocs/langs/mk_MK/agenda.lang
index 9b3efc07dabbe9581725281613818cea48764551..1ed4e637d146d23c70eb1cad90469a4841a9678d 100644
--- a/htdocs/langs/mk_MK/agenda.lang
+++ b/htdocs/langs/mk_MK/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= Automatic filling
AgendaAutoActionDesc= Define here events for which you want Dolibarr to create automatically an event in agenda. If nothing is checked (by default), only manual actions will be included in agenda.
AgendaSetupOtherDesc= This page provides options to allow export of your Dolibarr events into an external calendar (thunderbird, google calendar, ...)
AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda.
-ActionsEvents= Events for which Dolibarr will create an action in agenda automatically
-PropalValidatedInDolibarr= Proposal %s validated
-InvoiceValidatedInDolibarr= Invoice %s validated
+ActionsEvents=Events for which Dolibarr will create an action in agenda automatically
+PropalValidatedInDolibarr=Proposal %s validated
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
InvoiceDeleteDolibarr=Invoice %s deleted
OrderValidatedInDolibarr= Order %s validated
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Order %s approved
OrderRefusedInDolibarr=Order %s refused
OrderBackToDraftInDolibarr=Order %s go back to draft status
OrderCanceledInDolibarr=Order %s canceled
-InterventionValidatedInDolibarr=Intervention %s validated
ProposalSentByEMail=Commercial proposal %s sent by EMail
OrderSentByEMail=Customer order %s sent by EMail
InvoiceSentByEMail=Customer invoice %s sent by EMail
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=Supplier order %s sent by EMail
SupplierInvoiceSentByEMail=Supplier invoice %s sent by EMail
ShippingSentByEMail=Shipping %s sent by EMail
ShippingValidated= Shipping %s validated
-InterventionSentByEMail=Intervention %s sent by EMail
-InterventionClassifiedBilled=Intervention %s classified as Billed
NewCompanyToDolibarr= Third party created
DateActionPlannedStart= Planned start date
DateActionPlannedEnd= Planned end date
@@ -70,9 +68,9 @@ DateActionStart= Start date
DateActionEnd= End date
AgendaUrlOptions1=You can also add following parameters to filter output:
AgendaUrlOptions2=<b>login=%s</b> to restrict output to actions created by, assigned to or done by user <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions created by user <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> to restrict output to actions done by user <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
AgendaShowBirthdayEvents=Show birthday's contacts
AgendaHideBirthdayEvents=Hide birthday's contacts
Busy=Busy
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=URL to access .ical file
ExtSiteNoLabel=No Description
WorkingTimeRange=Working time range
WorkingDaysRange=Working days range
-AddEvent=Add event
+AddEvent=Create event
MyAvailability=My availability
diff --git a/htdocs/langs/mk_MK/bills.lang b/htdocs/langs/mk_MK/bills.lang
index 1edd72130768502f868a057917ba530eeb280671..81b7515a8b8c3c3aa8a2d9e46e3fe9ccad263f59 100644
--- a/htdocs/langs/mk_MK/bills.lang
+++ b/htdocs/langs/mk_MK/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Credit note
InvoiceAvoirAsk=Credit note to correct invoice
InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example).
invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
-invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
ReplaceInvoice=Replace invoice %s
ReplacementInvoice=Replacement invoice
ReplacedByInvoice=Replaced by invoice %s
@@ -87,7 +87,7 @@ ClassifyCanceled=Classify 'Abandoned'
ClassifyClosed=Classify 'Closed'
ClassifyUnBilled=Classify 'Unbilled'
CreateBill=Create Invoice
-AddBill=Add invoice or credit note
+AddBill=Create invoice or credit note
AddToDraftInvoices=Add to draft invoice
DeleteBill=Delete invoice
SearchACustomerInvoice=Search for a customer invoice
@@ -99,7 +99,7 @@ DoPaymentBack=Do payment back
ConvertToReduc=Convert into future discount
EnterPaymentReceivedFromCustomer=Enter payment received from customer
EnterPaymentDueToCustomer=Make payment due to customer
-DisabledBecauseRemainderToPayIsZero=Disabled because remainder to pay is zero
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
Amount=Amount
PriceBase=Price base
BillStatus=Invoice status
@@ -137,8 +137,6 @@ BillFrom=From
BillTo=To
ActionsOnBill=Actions on invoice
NewBill=New invoice
-Prélèvements=Standing order
-Prélèvements=Standing order
LastBills=Last %s invoices
LastCustomersBills=Last %s customers invoices
LastSuppliersBills=Last %s suppliers invoices
@@ -156,9 +154,9 @@ ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b> ?
ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned' ?
ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid ?
ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice ?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
@@ -191,9 +189,9 @@ AlreadyPaid=Already paid
AlreadyPaidBack=Already paid back
AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposits)
Abandoned=Abandoned
-RemainderToPay=Remainder to pay
-RemainderToTake=Remainder to take
-RemainderToPayBack=Remainder to pay back
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
Rest=Pending
AmountExpected=Amount claimed
ExcessReceived=Excess received
@@ -219,19 +217,18 @@ NoInvoice=No invoice
ClassifyBill=Classify invoice
SupplierBillsToPay=Suppliers invoices to pay
CustomerBillsUnpaid=Unpaid customers invoices
-DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters
-DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=Non-recoverable
SetConditions=Set payment terms
SetMode=Set payment mode
Billed=Billed
-RepeatableInvoice=Pre-defined invoice
-RepeatableInvoices=Pre-defined invoices
-Repeatable=Pre-defined
-Repeatables=Pre-defined
-ChangeIntoRepeatableInvoice=Convert into pre-defined
-CreateRepeatableInvoice=Create pre-defined invoice
-CreateFromRepeatableInvoice=Create from pre-defined invoice
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines
CustomersInvoicesAndPayments=Customer invoices and payments
ExportDataset_invoice_1=Customer invoices list and invoice's lines
diff --git a/htdocs/langs/mk_MK/categories.lang b/htdocs/langs/mk_MK/categories.lang
index ed61bfc08a61b4e5bfdadecfe7f6a15298afc6e3..22914931db137a565a45daad16b9b04fbd08465b 100644
--- a/htdocs/langs/mk_MK/categories.lang
+++ b/htdocs/langs/mk_MK/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories
CatCusLinks=Links between customers/prospects and categories
CatProdLinks=Links between products/services and categories
CatMemberLinks=Links between members and categories
-CatProdLinks=Links between products/services and categories
-CatCusLinks=Links between customers/prospects and categories
-CatSupLinks=Links between suppliers and categories
DeleteFromCat=Remove from category
DeletePicture=Picture delete
ConfirmDeletePicture=Confirm picture deletion?
@@ -112,3 +109,4 @@ CategoriesSetup=Categories setup
CategorieRecursiv=Link with parent category automatically
CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category
diff --git a/htdocs/langs/mk_MK/compta.lang b/htdocs/langs/mk_MK/compta.lang
index 3929cfde0367b6f5d8dc7945385de4877d9e4759..9fe5eff520d881c617f38aa7d9db675ec18f118a 100644
--- a/htdocs/langs/mk_MK/compta.lang
+++ b/htdocs/langs/mk_MK/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s
SuppliersProductsSellSalesTurnover=The generated turnover by the sales of supplier's products.
CheckReceipt=Check deposit
CheckReceiptShort=Check deposit
+LastCheckReceiptShort=Last %s check receipts
NewCheckReceipt=New discount
NewCheckDeposit=New check deposit
NewCheckDepositOn=Create receipt for deposit on account: %s
diff --git a/htdocs/langs/mk_MK/contracts.lang b/htdocs/langs/mk_MK/contracts.lang
index e5ad112b222db93bedf8e6ded250a39d062215c6..511516dc755e4f3aba2d67e91238426896629cbd 100644
--- a/htdocs/langs/mk_MK/contracts.lang
+++ b/htdocs/langs/mk_MK/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Contracts area
ListOfContracts=List of contracts
-LastContracts=Last %s modified contracts
+LastModifiedContracts=Last %s modified contracts
AllContracts=All contracts
ContractCard=Contract card
ContractStatus=Contract status
@@ -27,7 +27,7 @@ MenuRunningServices=Running services
MenuExpiredServices=Expired services
MenuClosedServices=Closed services
NewContract=New contract
-AddContract=Add contract
+AddContract=Create contract
SearchAContract=Search a contract
DeleteAContract=Delete a contract
CloseAContract=Close a contract
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines
ListOfRunningServices=List of running services
NotActivatedServices=Inactive services (among validated contracts)
BoardNotActivatedServices=Services to activate among validated contracts
-LastContracts=Last %s modified contracts
+LastContracts=Last % contracts
LastActivatedServices=Last %s activated services
LastModifiedServices=Last %s modified services
EditServiceLine=Edit service line
diff --git a/htdocs/langs/mk_MK/cron.lang b/htdocs/langs/mk_MK/cron.lang
index 1be23d72ca326eec0911d33ce575292516014918..195ad43c87c41ae0938fa27745ba14209fbac724 100644
--- a/htdocs/langs/mk_MK/cron.lang
+++ b/htdocs/langs/mk_MK/cron.lang
@@ -1,114 +1,86 @@
# Dolibarr language file - Source file is en_US - cron
-#
# About page
-#
-# About = About
-# CronAbout = About Cron
-# CronAboutPage = Cron about page
-
-#
+About = About
+CronAbout = About Cron
+CronAboutPage = Cron about page
# Right
-#
-# Permission23101 = Read Scheduled task
-# Permission23102 = Create/update Scheduled task
-# Permission23103 = Delete Scheduled task
-# Permission23104 = Execute Scheduled task
-
-#
+Permission23101 = Read Scheduled task
+Permission23102 = Create/update Scheduled task
+Permission23103 = Delete Scheduled task
+Permission23104 = Execute Scheduled task
# Admin
-#
-# CronSetup= Scheduled job management setup
-# URLToLaunchCronJobs=URL to check and launch cron jobs if required
-# OrToLaunchASpecificJob=Or to check and launch a specific job
-# KeyForCronAccess=Security key for URL to launch cron jobs
-# FileToLaunchCronJobs=Command line to launch cron jobs
-# CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes
-# CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
-
-
-#
+CronSetup= Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch cron jobs if required
+OrToLaunchASpecificJob=Or to check and launch a specific job
+KeyForCronAccess=Security key for URL to launch cron jobs
+FileToLaunchCronJobs=Command line to launch cron jobs
+CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
# Menu
-#
-# CronJobs=Scheduled jobs
-# CronListActive= List of active jobs
-# CronListInactive= List of disabled jobs
-# CronListActive= List of active jobs
-
-
-#
+CronJobs=Scheduled jobs
+CronListActive=List of active/scheduled jobs
+CronListInactive=List of disabled jobs
# Page list
-#
-# CronDateLastRun=Last run
-# CronLastOutput=Last run output
-# CronLastResult=Last result code
-# CronListOfCronJobs=List of scheduled jobs
-# CronCommand=Command
-# CronList=Jobs list
-# CronDelete= Delete cron jobs
-# CronConfirmDelete= Are you sure you want to delete this cron job ?
-# CronExecute=Launch job
-# CronConfirmExecute= Are you sure to execute this job now
-# CronInfo= Jobs allow to execute task that have been planned
-# CronWaitingJobs=Wainting jobs
-# CronTask=Job
-# CronNone= None
-# CronDtStart=Start date
-# CronDtEnd=End date
-# CronDtNextLaunch=Next execution
-# CronDtLastLaunch=Last execution
-# CronFrequency=Frequancy
-# CronClass=Classe
-# CronMethod=Method
-# CronModule=Module
-# CronAction=Action
-# CronStatus=Status
-# CronStatusActive=Enabled
-# CronStatusInactive=Disabled
-# CronNoJobs=No jobs registered
-# CronPriority=Priority
-# CronLabel=Description
-# CronNbRun=Nb. launch
-# CronEach=Every
-# JobFinished=Job launched and finished
-
-#
+CronDateLastRun=Last run
+CronLastOutput=Last run output
+CronLastResult=Last result code
+CronListOfCronJobs=List of scheduled jobs
+CronCommand=Command
+CronList=Jobs list
+CronDelete= Delete cron jobs
+CronConfirmDelete= Are you sure you want to delete this cron job ?
+CronExecute=Launch job
+CronConfirmExecute= Are you sure to execute this job now
+CronInfo= Jobs allow to execute task that have been planned
+CronWaitingJobs=Wainting jobs
+CronTask=Job
+CronNone= None
+CronDtStart=Start date
+CronDtEnd=End date
+CronDtNextLaunch=Next execution
+CronDtLastLaunch=Last execution
+CronFrequency=Frequancy
+CronClass=Classe
+CronMethod=Method
+CronModule=Module
+CronAction=Action
+CronStatus=Status
+CronStatusActive=Enabled
+CronStatusInactive=Disabled
+CronNoJobs=No jobs registered
+CronPriority=Priority
+CronLabel=Description
+CronNbRun=Nb. launch
+CronEach=Every
+JobFinished=Job launched and finished
#Page card
-#
-# CronAdd= Add jobs
-# CronHourStart= Start Hour and date of task
-# CronEvery= And execute task each
-# CronObject= Instance/Object to create
-# CronArgs=Parameters
-# CronSaveSucess=Save succesfully
-# CronNote=Comment
-# CronFieldMandatory=Fields %s is mandatory
-# CronErrEndDateStartDt=End date cannot be before start date
-# CronStatusActiveBtn=Enable
-# CronStatusInactiveBtn=Disable
-# CronTaskInactive=This job is disabled
-# CronDtLastResult=Last result date
-# CronId=Id
-# CronClassFile=Classes (filename.class.php)
-# CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-# CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-# CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-# CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is <i>fecth</i>
-# CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-# CronCommandHelp=The system command line to execute.
-
-#
+CronAdd= Add jobs
+CronHourStart= Start Hour and date of task
+CronEvery= And execute task each
+CronObject= Instance/Object to create
+CronArgs=Parameters
+CronSaveSucess=Save succesfully
+CronNote=Comment
+CronFieldMandatory=Fields %s is mandatory
+CronErrEndDateStartDt=End date cannot be before start date
+CronStatusActiveBtn=Enable
+CronStatusInactiveBtn=Disable
+CronTaskInactive=This job is disabled
+CronDtLastResult=Last result date
+CronId=Id
+CronClassFile=Classes (filename.class.php)
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
+CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronCommandHelp=The system command line to execute.
# Info
-#
-# CronInfoPage=Information
-
-
-#
+CronInfoPage=Information
# Common
-#
-# CronType=Task type
-# CronType_method=Call method of a Dolibarr Class
-# CronType_command=Shell command
-# CronMenu=Cron
-# CronCannotLoadClass=Cannot load class %s or object %s
-
-# UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+CronType=Task type
+CronType_method=Call method of a Dolibarr Class
+CronType_command=Shell command
+CronMenu=Cron
+CronCannotLoadClass=Cannot load class %s or object %s
+UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
diff --git a/htdocs/langs/mk_MK/donations.lang b/htdocs/langs/mk_MK/donations.lang
index 66ddea95a5c694d8044c40b7da05319d0b77a530..f7aed91cf81caf0e83e390519642ea1f199670c6 100644
--- a/htdocs/langs/mk_MK/donations.lang
+++ b/htdocs/langs/mk_MK/donations.lang
@@ -4,7 +4,7 @@ Donations=Donations
DonationRef=Donation ref.
Donor=Donor
Donors=Donors
-AddDonation=Add a donation
+AddDonation=Create a donation
NewDonation=New donation
ShowDonation=Show donation
DonationPromise=Gift promise
@@ -31,3 +31,8 @@ DonationRecipient=Donation recipient
ThankYou=Thank You
IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
MinimumAmount=Minimum amount is %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/mk_MK/externalsite.lang b/htdocs/langs/mk_MK/externalsite.lang
index b915c37a5ab8fe3beb5335f7f4ec501a12749c15..da4853df0df086e3040a294cec116c590f4c2e9e 100644
--- a/htdocs/langs/mk_MK/externalsite.lang
+++ b/htdocs/langs/mk_MK/externalsite.lang
@@ -1,4 +1,5 @@
# Dolibarr language file - Source file is en_US - externalsite
-# ExternalSiteSetup=Setup link to external website
-# ExternalSiteURL=External Site URL
-# ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExternalSiteSetup=Setup link to external website
+ExternalSiteURL=External Site URL
+ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/mk_MK/holiday.lang b/htdocs/langs/mk_MK/holiday.lang
index c25abf6449ca2cc97d5dba6340d1530b5ea9c675..f5b87fefb0878c40cc75768a1d1c4bcf4cb80c72 100644
--- a/htdocs/langs/mk_MK/holiday.lang
+++ b/htdocs/langs/mk_MK/holiday.lang
@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
CantCreateCP=You don't have the right to make leave requests.
InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=Update
CantUpdate=You cannot update this leave request.
NoDateDebut=You must select a start date.
NoDateFin=You must select an end date.
-ErrorDureeCP=Your request for holidays does not contain working day.
-TitleValidCP=Approve the request holidays
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
ConfirmValidCP=Are you sure you want to approve the leave request?
DateValidCP=Date approved
TitleToValidCP=Send leave request
ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the request holidays
+TitleRefuseCP=Refuse the leave request
ConfirmRefuseCP=Are you sure you want to refuse the leave request?
NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
+TitleCancelCP=Cancel the leave request
ConfirmCancelCP=Are you sure you want to cancel the leave request?
DetailRefusCP=Reason for refusal
DateRefusCP=Date of refusal
@@ -78,7 +77,7 @@ ActionByCP=Performed by
UserUpdateCP=For the user
PrevSoldeCP=Previous Balance
NewSoldeCP=New Balance
-alreadyCPexist=A request for holidays has already been done on this period.
+alreadyCPexist=A leave request has already been done on this period.
UserName=Name
Employee=Employee
FirstDayOfHoliday=First day of vacation
@@ -88,25 +87,25 @@ ManualUpdate=Manual update
HolidaysCancelation=Leave request cancelation
## Configuration du Module ##
-ConfCP=Configuration of holidays module
+ConfCP=Configuration of leave request module
DescOptionCP=Description of the option
ValueOptionCP=Value
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
UpdateConfCPOK=Updated successfully.
ErrorUpdateConfCP=An error occurred during the update, please try again.
-AddCPforUsers=Please add the balance of holidays of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
Module27130Name= Management of leave requests
Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
TitleOptionEventCP=Settings of leave requets for events
ValidEventCP=Validate
UpdateEventCP=Update events
diff --git a/htdocs/langs/mk_MK/interventions.lang b/htdocs/langs/mk_MK/interventions.lang
index 17641a0ab3e499b2f66a4b4ddd80c46d478ff702..c79da05364e615bb2b234ce4211a373fc94e9168 100644
--- a/htdocs/langs/mk_MK/interventions.lang
+++ b/htdocs/langs/mk_MK/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Intervention
Interventions=Interventions
InterventionCard=Intervention card
NewIntervention=New intervention
-AddIntervention=Add intervention
+AddIntervention=Create intervention
ListOfInterventions=List of interventions
EditIntervention=Edit intervention
ActionsOnFicheInter=Actions on intervention
@@ -30,6 +30,15 @@ StatusInterInvoiced=Billed
RelatedInterventions=Related interventions
ShowIntervention=Show intervention
SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention
TypeContact_fichinter_internal_INTERVENING=Intervening
diff --git a/htdocs/langs/mk_MK/mails.lang b/htdocs/langs/mk_MK/mails.lang
index 98e6dc335eeced95e230de5b5ca5b8f78fc59681..7a2111988228ab02739bad001958aa455eb9013c 100644
--- a/htdocs/langs/mk_MK/mails.lang
+++ b/htdocs/langs/mk_MK/mails.lang
@@ -115,7 +115,7 @@ SentBy=Sent by
MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=Clear list
ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
ToAddRecipientsChooseHere=Add recipients by choosing from the lists
@@ -133,6 +133,9 @@ Notifications=Notifications
NoNotificationsWillBeSent=No email notifications are planned for this event and company
ANotificationsWillBeSent=1 notification will be sent by email
SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification request
-ListOfActiveNotifications=List all active email notification requests
+AddNewNotification=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
ListOfNotificationsDone=List all email notifications sent
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/mk_MK/main.lang b/htdocs/langs/mk_MK/main.lang
index 82e609d8ae6397a9ca540002a546d575680e081e..0c3a3ca751c3a68fe11f5b4a6bf868946fb1eed6 100644
--- a/htdocs/langs/mk_MK/main.lang
+++ b/htdocs/langs/mk_MK/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr
ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'.
ErrorFailedToSaveFile=Error, failed to save file.
-ErrorOnlyPngJpgSupported=Error, only .png and .jpg image format file are supported.
-ErrorImageFormatNotSupported=Your PHP does not support functions to convert images of this format.
SetDate=Set date
SelectDate=Select a date
SeeAlso=See also %s
BackgroundColorByDefault=Default background color
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
NbOfEntries=Nb of entries
GoToWikiHelpPage=Read online help (need Internet access)
@@ -266,6 +266,7 @@ Afternoon=Afternoon
Quadri=Quadri
MonthOfDay=Month of the day
HourShort=H
+MinuteShort=mn
Rate=Rate
UseLocalTax=Include tax
Bytes=Bytes
@@ -340,6 +341,7 @@ FullList=Full list
Statistics=Statistics
OtherStatistics=Other statistics
Status=Status
+Favorite=Favorite
ShortInfo=Info.
Ref=Ref.
RefSupplier=Ref. supplier
@@ -365,6 +367,7 @@ ActionsOnCompany=Events about this third party
ActionsOnMember=Events about this member
NActions=%s events
NActionsLate=%s late
+RequestAlreadyDone=Request already recorded
Filter=Filter
RemoveFilter=Remove filter
ChartGenerated=Chart generated
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Extra attributes setup
URLPhoto=URL of photo/logo
SetLinkToThirdParty=Link to another third party
CreateDraft=Create draft
+SetToDraft=Back to draft
ClickToEdit=Click to edit
ObjectDeleted=Object %s deleted
ByCountry=By country
@@ -678,7 +682,7 @@ ViewPrivateNote=View notes
XMoreLines=%s line(s) hidden
PublicUrl=Public URL
AddBox=Add box
-
+SelectElementAndClickRefresh=Select an element and click Refresh
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/langs/mk_MK/margins.lang b/htdocs/langs/mk_MK/margins.lang
index e8d5fed1af9a379298973a5c33a511cf77ea3706..606d5e5053a25855631a7d6ee61b6c392c1fe32c 100644
--- a/htdocs/langs/mk_MK/margins.lang
+++ b/htdocs/langs/mk_MK/margins.lang
@@ -10,24 +10,18 @@ MarkRate=Mark rate
DisplayMarginRates=Display margin rates
DisplayMarkRates=Display mark rates
InputPrice=Input price
-
margin=Profit margins management
margesSetup=Profit margins management setup
-
MarginDetails=Margin details
-
ProductMargins=Product margins
CustomerMargins=Customer margins
SalesRepresentativeMargins=Sales representative margins
-
ProductService=Product or Service
AllProducts=All products and services
ChooseProduct/Service=Choose product or service
-
StartDate=Start date
EndDate=End date
Launch=Start
-
ForceBuyingPriceIfNull=Force buying price if null
ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0)
MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
@@ -35,16 +29,16 @@ UseDiscountAsProduct=As a product
UseDiscountAsService=As a service
UseDiscountOnTotal=On subtotal
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
-
MARGIN_TYPE=Margin type
MargeBrute=Raw margin
MargeNette=Net margin
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - Cost price
-
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
Charges=Charges
-
AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/mk_MK/orders.lang b/htdocs/langs/mk_MK/orders.lang
index 42444f0ec1c52173f7e7c94b58792d7b03f11de4..6ee9c19fa95f45044b7466cc0fdcbf21819ef13a 100644
--- a/htdocs/langs/mk_MK/orders.lang
+++ b/htdocs/langs/mk_MK/orders.lang
@@ -1,168 +1,162 @@
# Dolibarr language file - Source file is en_US - orders
-# OrdersArea=Customers orders area
-# SuppliersOrdersArea=Suppliers orders area
-# OrderCard=Order card
-# OrderId=Order Id
-# Order=Order
-# Orders=Orders
-# OrderLine=Order line
-# OrderFollow=Follow up
-# OrderDate=Order date
-# OrderToProcess=Order to process
-# NewOrder=New order
-# ToOrder=Make order
-# MakeOrder=Make order
-# SupplierOrder=Supplier order
-# SuppliersOrders=Suppliers orders
-# SuppliersOrdersRunning=Current suppliers orders
-# CustomerOrder=Customer order
-# CustomersOrders=Customer's orders
-# CustomersOrdersRunning=Current customer's orders
-# CustomersOrdersAndOrdersLines=Customer orders and order's lines
-# OrdersToValid=Customer's orders to validate
-# OrdersToBill=Customer's orders delivered
-# OrdersInProcess=Customer's orders in process
-# OrdersToProcess=Customer's orders to process
-# SuppliersOrdersToProcess=Supplier's orders to process
-# StatusOrderCanceledShort=Canceled
-# StatusOrderDraftShort=Draft
-# StatusOrderValidatedShort=Validated
-# StatusOrderSentShort=In process
-# StatusOrderSent=Shipment in process
-# StatusOrderOnProcessShort=Reception
-# StatusOrderProcessedShort=Processed
-# StatusOrderToBillShort=Delivered
-# StatusOrderToBill2Short=To bill
-# StatusOrderApprovedShort=Approved
-# StatusOrderRefusedShort=Refused
-# StatusOrderToProcessShort=To process
-# StatusOrderReceivedPartiallyShort=Partially received
-# StatusOrderReceivedAllShort=Everything received
-# StatusOrderCanceled=Canceled
-# StatusOrderDraft=Draft (needs to be validated)
-# StatusOrderValidated=Validated
-# StatusOrderOnProcess=Waiting to receive
-# StatusOrderProcessed=Processed
-# StatusOrderToBill=Delivered
-# StatusOrderToBill2=To bill
-# StatusOrderApproved=Approved
-# StatusOrderRefused=Refused
-# StatusOrderReceivedPartially=Partially received
-# StatusOrderReceivedAll=Everything received
-# ShippingExist=A shipment exists
-# DraftOrWaitingApproved=Draft or approved not yet ordered
-# DraftOrWaitingShipped=Draft or validated not yet shipped
-# MenuOrdersToBill=Orders delivered
-# MenuOrdersToBill2=Orders to bill
-# SearchOrder=Search order
-# SearchACustomerOrder=Search a customer order
-# ShipProduct=Ship product
-# Discount=Discount
-# CreateOrder=Create Order
-# RefuseOrder=Refuse order
-# ApproveOrder=Accept order
-# ValidateOrder=Validate order
-# UnvalidateOrder=Unvalidate order
-# DeleteOrder=Delete order
-# CancelOrder=Cancel order
-# AddOrder=Add order
-# AddToMyOrders=Add to my orders
-# AddToOtherOrders=Add to other orders
-# AddToDraftOrders=Add to draft order
-# ShowOrder=Show order
-# NoOpenedOrders=No opened orders
-# NoOtherOpenedOrders=No other opened orders
-# NoDraftOrders=No draft orders
-# OtherOrders=Other orders
-# LastOrders=Last %s orders
-# LastModifiedOrders=Last %s modified orders
-# LastClosedOrders=Last %s closed orders
-# AllOrders=All orders
-# NbOfOrders=Number of orders
-# OrdersStatistics=Order's statistics
-# OrdersStatisticsSuppliers=Supplier order's statistics
-# NumberOfOrdersByMonth=Number of orders by month
-# AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
-# ListOfOrders=List of orders
-# CloseOrder=Close order
-# ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed.
-# ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done.
-# ConfirmDeleteOrder=Are you sure you want to delete this order ?
-# ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b> ?
-# ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> to draft status ?
-# ConfirmCancelOrder=Are you sure you want to cancel this order ?
-# ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b> ?
-# GenerateBill=Generate invoice
-# ClassifyShipped=Classify delivered
-# ClassifyBilled=Classify billed
-# ComptaCard=Accountancy card
-# DraftOrders=Draft orders
-# RelatedOrders=Related orders
-# OnProcessOrders=In process orders
-# RefOrder=Ref. order
-# RefCustomerOrder=Ref. customer order
-# CustomerOrder=Customer order
-# RefCustomerOrderShort=Ref. cust. order
-# SendOrderByMail=Send order by mail
-# ActionsOnOrder=Events on order
-# NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
-# OrderMode=Order method
-# AuthorRequest=Request author
-# UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address
-# RunningOrders=Orders on process
-# UserWithApproveOrderGrant=Users granted with "approve orders" permission.
-# PaymentOrderRef=Payment of order %s
-# CloneOrder=Clone order
-# ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b> ?
-# DispatchSupplierOrder=Receiving supplier order %s
+OrdersArea=Customers orders area
+SuppliersOrdersArea=Suppliers orders area
+OrderCard=Order card
+OrderId=Order Id
+Order=Order
+Orders=Orders
+OrderLine=Order line
+OrderFollow=Follow up
+OrderDate=Order date
+OrderToProcess=Order to process
+NewOrder=New order
+ToOrder=Make order
+MakeOrder=Make order
+SupplierOrder=Supplier order
+SuppliersOrders=Suppliers orders
+SuppliersOrdersRunning=Current suppliers orders
+CustomerOrder=Customer order
+CustomersOrders=Customer's orders
+CustomersOrdersRunning=Current customer's orders
+CustomersOrdersAndOrdersLines=Customer orders and order's lines
+OrdersToValid=Customer's orders to validate
+OrdersToBill=Customer's orders delivered
+OrdersInProcess=Customer's orders in process
+OrdersToProcess=Customer's orders to process
+SuppliersOrdersToProcess=Supplier's orders to process
+StatusOrderCanceledShort=Canceled
+StatusOrderDraftShort=Draft
+StatusOrderValidatedShort=Validated
+StatusOrderSentShort=In process
+StatusOrderSent=Shipment in process
+StatusOrderOnProcessShort=Reception
+StatusOrderProcessedShort=Processed
+StatusOrderToBillShort=Delivered
+StatusOrderToBill2Short=To bill
+StatusOrderApprovedShort=Approved
+StatusOrderRefusedShort=Refused
+StatusOrderToProcessShort=To process
+StatusOrderReceivedPartiallyShort=Partially received
+StatusOrderReceivedAllShort=Everything received
+StatusOrderCanceled=Canceled
+StatusOrderDraft=Draft (needs to be validated)
+StatusOrderValidated=Validated
+StatusOrderOnProcess=Waiting to receive
+StatusOrderProcessed=Processed
+StatusOrderToBill=Delivered
+StatusOrderToBill2=To bill
+StatusOrderApproved=Approved
+StatusOrderRefused=Refused
+StatusOrderReceivedPartially=Partially received
+StatusOrderReceivedAll=Everything received
+ShippingExist=A shipment exists
+DraftOrWaitingApproved=Draft or approved not yet ordered
+DraftOrWaitingShipped=Draft or validated not yet shipped
+MenuOrdersToBill=Orders delivered
+MenuOrdersToBill2=Billable orders
+SearchOrder=Search order
+SearchACustomerOrder=Search a customer order
+ShipProduct=Ship product
+Discount=Discount
+CreateOrder=Create Order
+RefuseOrder=Refuse order
+ApproveOrder=Accept order
+ValidateOrder=Validate order
+UnvalidateOrder=Unvalidate order
+DeleteOrder=Delete order
+CancelOrder=Cancel order
+AddOrder=Create order
+AddToMyOrders=Add to my orders
+AddToOtherOrders=Add to other orders
+AddToDraftOrders=Add to draft order
+ShowOrder=Show order
+NoOpenedOrders=No opened orders
+NoOtherOpenedOrders=No other opened orders
+NoDraftOrders=No draft orders
+OtherOrders=Other orders
+LastOrders=Last %s orders
+LastModifiedOrders=Last %s modified orders
+LastClosedOrders=Last %s closed orders
+AllOrders=All orders
+NbOfOrders=Number of orders
+OrdersStatistics=Order's statistics
+OrdersStatisticsSuppliers=Supplier order's statistics
+NumberOfOrdersByMonth=Number of orders by month
+AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
+ListOfOrders=List of orders
+CloseOrder=Close order
+ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed.
+ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done.
+ConfirmDeleteOrder=Are you sure you want to delete this order ?
+ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b> ?
+ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> to draft status ?
+ConfirmCancelOrder=Are you sure you want to cancel this order ?
+ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b> ?
+GenerateBill=Generate invoice
+ClassifyShipped=Classify delivered
+ClassifyBilled=Classify billed
+ComptaCard=Accountancy card
+DraftOrders=Draft orders
+RelatedOrders=Related orders
+OnProcessOrders=In process orders
+RefOrder=Ref. order
+RefCustomerOrder=Ref. customer order
+RefCustomerOrderShort=Ref. cust. order
+SendOrderByMail=Send order by mail
+ActionsOnOrder=Events on order
+NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
+OrderMode=Order method
+AuthorRequest=Request author
+UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address
+RunningOrders=Orders on process
+UserWithApproveOrderGrant=Users granted with "approve orders" permission.
+PaymentOrderRef=Payment of order %s
+CloneOrder=Clone order
+ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b> ?
+DispatchSupplierOrder=Receiving supplier order %s
##### Types de contacts #####
-# TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
-# TypeContact_commande_internal_SHIPPING=Representative following-up shipping
-# TypeContact_commande_external_BILLING=Customer invoice contact
-# TypeContact_commande_external_SHIPPING=Customer shipping contact
-# TypeContact_commande_external_CUSTOMER=Customer contact following-up order
-# TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order
-# TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
-# TypeContact_order_supplier_external_BILLING=Supplier invoice contact
-# TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact
-# TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order
-
-# Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
-# Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
-# Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s'
-# Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s'
-# Error_OrderNotChecked=No orders to invoice selected
-
+TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
+TypeContact_commande_internal_SHIPPING=Representative following-up shipping
+TypeContact_commande_external_BILLING=Customer invoice contact
+TypeContact_commande_external_SHIPPING=Customer shipping contact
+TypeContact_commande_external_CUSTOMER=Customer contact following-up order
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order
+TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
+TypeContact_order_supplier_external_BILLING=Supplier invoice contact
+TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order
+Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
+Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
+Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s'
+Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s'
+Error_OrderNotChecked=No orders to invoice selected
# Sources
-# OrderSource0=Commercial proposal
-# OrderSource1=Internet
-# OrderSource2=Mail campaign
-# OrderSource3=Phone compaign
-# OrderSource4=Fax campaign
-# OrderSource5=Commercial
-# OrderSource6=Store
-# QtyOrdered=Qty ordered
-# AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order
-
+OrderSource0=Commercial proposal
+OrderSource1=Internet
+OrderSource2=Mail campaign
+OrderSource3=Phone compaign
+OrderSource4=Fax campaign
+OrderSource5=Commercial
+OrderSource6=Store
+QtyOrdered=Qty ordered
+AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order
# Documents models
-# PDFEinsteinDescription=A complete order model (logo...)
-# PDFEdisonDescription=A simple order model
-# PDFProformaDescription=A complete proforma invoice (logo…)
+PDFEinsteinDescription=A complete order model (logo...)
+PDFEdisonDescription=A simple order model
+PDFProformaDescription=A complete proforma invoice (logo…)
# Orders modes
-# OrderByMail=Mail
-# OrderByFax=Fax
-# OrderByEMail=EMail
-# OrderByWWW=Online
-# OrderByPhone=Phone
-
-# CreateInvoiceForThisCustomer=Bill orders
-# NoOrdersToInvoice=No orders billable
-# CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-# MenuOrdersToBill2=Orders to bill
-# OrderCreation=Order creation
-# Ordered=Ordered
-# OrderCreated=Your orders have been created
-# OrderFail=An error happened during your orders creation
-# CreateOrders=Create orders
-# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+OrderByMail=Mail
+OrderByFax=Fax
+OrderByEMail=EMail
+OrderByWWW=Online
+OrderByPhone=Phone
+CreateInvoiceForThisCustomer=Bill orders
+NoOrdersToInvoice=No orders billable
+CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
+OrderCreation=Order creation
+Ordered=Ordered
+OrderCreated=Your orders have been created
+OrderFail=An error happened during your orders creation
+CreateOrders=Create orders
+ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
diff --git a/htdocs/langs/mk_MK/oscommerce.lang b/htdocs/langs/mk_MK/oscommerce.lang
deleted file mode 100644
index 42a4a4551b6d42c92c114d1593dbc0f4f53ae4b3..0000000000000000000000000000000000000000
--- a/htdocs/langs/mk_MK/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-# OSCommerce=OS Commerce
-# OSCommerceSetup=OS Commerce module setup
-# OSCommerceSetupSaved=OS Commerce setup saved
-# OSCommerceServer=OS Commerce server host/ip
-# OSCommerceDatabaseName=OS Commerce database name
-# OSCommercePrefix=OS Commerce tables prefix
-# OSCommerceUser=OS Commerce database login
diff --git a/htdocs/langs/mk_MK/other.lang b/htdocs/langs/mk_MK/other.lang
index b56ef2944951b7c0d44d285b1e7a02ad6077a579..889918881838dcbc59b7a031b8af656cec175167 100644
--- a/htdocs/langs/mk_MK/other.lang
+++ b/htdocs/langs/mk_MK/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=Security code
Calendar=Calendar
-AddTrip=Add trip
Tools=Tools
ToolsDesc=This area is dedicated to group miscellaneous tools not available into other menu entries.<br><br>Those tools can be reached from menu on the side.
Birthday=Birthday
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation
Notify_TASK_CREATE=Task created
Notify_TASK_MODIFY=Task modified
Notify_TASK_DELETE=Task deleted
+SeeModuleSetup=See module setup
NbOfAttachedFiles=Number of attached files/documents
TotalSizeOfAttachedFiles=Total size of attached files/documents
MaxSize=Maximum size
@@ -80,6 +80,16 @@ ModifiedBy=Modified by %s
ValidatedBy=Validated by %s
CanceledBy=Canceled by %s
ClosedBy=Closed by %s
+CreatedById=User id who created
+ModifiedById=User id who made last change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made last change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
FileWasRemoved=File %s was removed
DirWasRemoved=Directory %s was removed
FeatureNotYetAvailableShort=Available in a next version
@@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your
##### Calendar common #####
AddCalendarEntry=Add entry in calendar %s
-NewCompanyToDolibarr=Company %s added into Dolibarr
-ContractValidatedInDolibarr=Contract %s validated in Dolibarr
-ContractCanceledInDolibarr=Contract %s canceled in Dolibarr
-ContractClosedInDolibarr=Contract %s closed in Dolibarr
-PropalClosedSignedInDolibarr=Proposal %s signed in Dolibarr
-PropalClosedRefusedInDolibarr=Proposal %s refused in Dolibarr
-PropalValidatedInDolibarr=Proposal %s validated in Dolibarr
-InvoiceValidatedInDolibarr=Invoice %s validated in Dolibarr
-InvoicePaidInDolibarr=Invoice %s changed to paid in Dolibarr
-InvoiceCanceledInDolibarr=Invoice %s canceled in Dolibarr
-PaymentDoneInDolibarr=Payment %s done in Dolibarr
-CustomerPaymentDoneInDolibarr=Customer payment %s done in Dolibarr
-SupplierPaymentDoneInDolibarr=Supplier payment %s done in Dolibarr
-MemberValidatedInDolibarr=Member %s validated in Dolibarr
-MemberResiliatedInDolibarr=Member %s resiliated in Dolibarr
-MemberDeletedInDolibarr=Member %s deleted from Dolibarr
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added in Dolibarr
-ShipmentValidatedInDolibarr=Shipment %s validated in Dolibarr
-ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
##### Export #####
Export=Export
ExportsArea=Exports area
diff --git a/htdocs/langs/mk_MK/paybox.lang b/htdocs/langs/mk_MK/paybox.lang
index b689bb6cebff21b067564cffd144aa4a6aaa2e98..aced32a49440a9ff7a1b1e0279522ff49cec7821 100644
--- a/htdocs/langs/mk_MK/paybox.lang
+++ b/htdocs/langs/mk_MK/paybox.lang
@@ -1,37 +1,40 @@
# Dolibarr language file - Source file is en_US - paybox
-# PayBoxSetup=PayBox module setup
-# PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
-# FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
-# PaymentForm=Payment form
-# WelcomeOnPaymentPage=Welcome on our online payment service
-# ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
-# ThisIsInformationOnPayment=This is information on payment to do
-# ToComplete=To complete
-# YourEMail=Email to receive payment confirmation
-# Creditor=Creditor
-# PaymentCode=Payment code
-# PayBoxDoPayment=Go on payment
-# YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
-# PleaseBePatient=Please, be patient
-# Continue=Next
-# ToOfferALinkForOnlinePayment=URL for %s payment
-# ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
-# ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
-# ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
-# ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
-# ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
-# YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
-# SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> to have payment created automatically when validated by paybox.
-# YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-# YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
-# AccountParameter=Account parameters
-# UsageParameter=Usage parameters
-# InformationToFindParameters=Help to find your %s account information
-# PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment
-# VendorName=Name of vendor
-# CSSUrlForPaymentForm=CSS style sheet url for payment form
-# MessageOK=Message on validated payment return page
-# MessageKO=Message on canceled payment return page
-# NewPayboxPaymentReceived=New Paybox payment received
-# NewPayboxPaymentFailed=New Paybox payment tried but failed
-# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PayBoxSetup=PayBox module setup
+PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
+FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
+PaymentForm=Payment form
+WelcomeOnPaymentPage=Welcome on our online payment service
+ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
+ThisIsInformationOnPayment=This is information on payment to do
+ToComplete=To complete
+YourEMail=Email to receive payment confirmation
+Creditor=Creditor
+PaymentCode=Payment code
+PayBoxDoPayment=Go on payment
+YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
+PleaseBePatient=Please, be patient
+Continue=Next
+ToOfferALinkForOnlinePayment=URL for %s payment
+ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
+ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
+ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
+YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> to have payment created automatically when validated by paybox.
+YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
+YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
+AccountParameter=Account parameters
+UsageParameter=Usage parameters
+InformationToFindParameters=Help to find your %s account information
+PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment
+VendorName=Name of vendor
+CSSUrlForPaymentForm=CSS style sheet url for payment form
+MessageOK=Message on validated payment return page
+MessageKO=Message on canceled payment return page
+NewPayboxPaymentReceived=New Paybox payment received
+NewPayboxPaymentFailed=New Paybox payment tried but failed
+PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/mk_MK/resource.lang b/htdocs/langs/mk_MK/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..d64075dfbf595897a63e3eebf19194d8f71030dd
--- /dev/null
+++ b/htdocs/langs/mk_MK/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
diff --git a/htdocs/langs/mk_MK/sendings.lang b/htdocs/langs/mk_MK/sendings.lang
index 2ae43f3976607147c1e8fc3a41898f572cee9868..f6111bac6841189e50c3c7fb9028962b56e3997e 100644
--- a/htdocs/langs/mk_MK/sendings.lang
+++ b/htdocs/langs/mk_MK/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is do
RelatedShippings=Related shippings
ShipmentLine=Shipment line
CarrierList=List of transporters
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
# Sending methods
SendingMethodCATCH=Catch by customer
diff --git a/htdocs/langs/mk_MK/stocks.lang b/htdocs/langs/mk_MK/stocks.lang
index 5d11b0fd7a0992284856369a2d4b919e56a34453..06c502504e9f19219ba028be8d02fbb55e5f0697 100644
--- a/htdocs/langs/mk_MK/stocks.lang
+++ b/htdocs/langs/mk_MK/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Warehouse label is required
CorrectStock=Correct stock
ListOfWarehouses=List of warehouses
ListOfStockMovements=List of stock movements
-StocksArea=Stocks area
+StocksArea=Warehouses area
Location=Location
LocationSummary=Short name location
NumberOfDifferentProducts=Number of different products
diff --git a/htdocs/langs/mk_MK/users.lang b/htdocs/langs/mk_MK/users.lang
index 0afaab6ad7f7ca7de787d1bad2656917763a3f45..baf209f9d1c7ff7527f6f0237519cac6f683a9e3 100644
--- a/htdocs/langs/mk_MK/users.lang
+++ b/htdocs/langs/mk_MK/users.lang
@@ -63,7 +63,6 @@ ShowGroup=Show group
ShowUser=Show user
NonAffectedUsers=Non assigned users
UserModified=User modified successfully
-GroupModified=Group modified successfully
PhotoFile=Photo file
UserWithDolibarrAccess=User with Dolibarr access
ListOfUsersInGroup=List of users in this group
@@ -103,7 +102,7 @@ UserDisabled=User %s disabled
UserEnabled=User %s activated
UserDeleted=User %s removed
NewGroupCreated=Group %s created
-GroupModified=Group modified successfully
+GroupModified=Group %s modified
GroupDeleted=Group %s removed
ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact ?
ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member ?
@@ -114,8 +113,10 @@ YourRole=Your roles
YourQuotaOfUsersIsReached=Your quota of active users is reached !
NbOfUsers=Nb of users
DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
-HierarchicalResponsible=Hierarchical responsible
+HierarchicalResponsible=Supervisor
HierarchicView=Hierarchical view
UseTypeFieldToChange=Use field Type to change
OpenIDURL=OpenID URL
LoginUsingOpenID=Use OpenID to login
+WeeklyHours=Weekly hours
+ColorUser=Color of the user
diff --git a/htdocs/langs/mk_MK/withdrawals.lang b/htdocs/langs/mk_MK/withdrawals.lang
index 58ac3e252ec59d67ff8d71c394b4c44265bc3add..e433730908416bbfa32c181a580b9e2e7e34717c 100644
--- a/htdocs/langs/mk_MK/withdrawals.lang
+++ b/htdocs/langs/mk_MK/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=Receipt
LastWithdrawalReceipts=Last %s withdrawal receipts
WithdrawedBills=Withdrawn invoices
WithdrawalsLines=Withdrawal lines
-RequestStandingOrderToTreat=Request for standing orders to treat
-RequestStandingOrderTreated=Request for standing orders treated
+RequestStandingOrderToTreat=Request for standing orders to process
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=Customer standing orders
CustomerStandingOrder=Customer standing order
NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
@@ -40,14 +41,13 @@ TransMetod=Transmission method
Send=Send
Lines=Lines
StandingOrderReject=Issue a rejection
-InvoiceRefused=Invoice refused
WithdrawalRefused=Withdrawal refused
WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society
RefusedData=Date of rejection
RefusedReason=Reason for rejection
RefusedInvoicing=Billing the rejection
NoInvoiceRefused=Do not charge the rejection
-InvoiceRefused=Invoice refused
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=Status
StatusUnknown=Unknown
StatusWaiting=Waiting
@@ -76,7 +76,7 @@ WithBankUsingRIB=For bank accounts using RIB
WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
BankToReceiveWithdraw=Bank account to receive withdraws
CreditDate=Credit on
-WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
ShowWithdraw=Show Withdraw
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
diff --git a/htdocs/langs/nb_NO/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang
index 8cab9d2b651d75b0721d76fda619e2034e4509b4..8c7bb031ba0ebff9098273c9a1b45aeea6fce352 100644
--- a/htdocs/langs/nb_NO/accountancy.lang
+++ b/htdocs/langs/nb_NO/accountancy.lang
@@ -1,13 +1,13 @@
# Dolibarr language file - en_US - Accounting Expert
CHARSET=UTF-8
-Accounting=Accounting
-Globalparameters=Global parameters
+Accounting=Regnskap
+Globalparameters=Globale parametre
Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
-Menuaccount=Accounting accounts
+Fiscalyear=Regnskapsår
+Menuaccount=Regnskapskonti
Menuthirdpartyaccount=Thirdparty accounts
-MenuTools=Tools
+MenuTools=Verktøy
ConfigAccountingExpert=Configuration of the module accounting expert
Journaux=Journals
@@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts
Validate=Validate
Addanaccount=Add an accounting account
AccountAccounting=Accounting account
-Ventilation=Ventilation
+Ventilation=Breakdown
ToDispatch=To dispatch
Dispatched=Dispatched
-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
TradeMargin=Trade margin
Reports=Reports
ByCustomerInvoice=By invoices customers
@@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger
Bookkeeping=General ledger
AccountBalanceByMonth=Account balance by month
-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
Line=Line
CAHTF=Total purchase supplier HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice
IntoAccount=In the accounting account
Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
+VentilationAuto=Automatic breakdown
Processing=Processing
EndProcessing=The end of processing
@@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account
ACCOUNTING_SEPARATORCSV=Separator CSV
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
@@ -96,20 +96,20 @@ Doctype=Type of document
Docdate=Date
Docref=Reference
Numerocompte=Account
-Code_tiers=Thirdparty
-Labelcompte=Label account
-Debit=Debit
-Credit=Credit
-Amount=Amount
+Code_tiers=Tredjepart
+Labelcompte=Kontoetikett
+Debit=Debet
+Credit=Kredit
+Amount=Beløp
Sens=Sens
Codejournal=Journal
-DelBookKeeping=Delete the records of the general ledger
+DelBookKeeping=Slett innholdet i hovedboken
-SellsJournal=Sells journal
-PurchasesJournal=Purchases journal
-DescSellsJournal=Sells journal
-DescPurchasesJournal=Purchases journal
+SellsJournal=Salgsjournal
+PurchasesJournal=Innkjøpsjournal
+DescSellsJournal=Salgsjournal
+DescPurchasesJournal=Innkjøpsjournal
BankJournal=Bank journal
DescBankJournal=Bank journal including all the types of payments other than cash
CashJournal=Cash journal
@@ -140,14 +140,14 @@ Active=Statement
NewFiscalYear=New fiscal year
-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
TotalVente=Total turnover HT
TotalMarge=Total sales margin
DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
ChangeAccount=Change the accounting account for lines selected by the account:
Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
@@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically
ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index 89545e80ea02c92cc7eea8af8a34bed9d7d529f5..c84d2eba95a1e7a4143fcbca80e47460455c0cf8 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -52,10 +52,10 @@ ErrorCodeCantContainZero=Koden kan ikke inneholde verdien 0
DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
ConfirmAjax=Bruk bekreftelsesvinduer basert på Ajax
UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectCompany=Use autocompletion fields to choose third parties instead of using a list box.
+UseSearchToSelectCompany=Bruk autofullfør-felt for å velge tredjepart, i stedet for å bruke listeboks.
ActivityStateToSelectCompany= Legg til en filter alternativ for å vise / skjule thirdparties som i dag er i aktivitet eller har opphørt det
UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+UseSearchToSelectContact=Bruk autofullfør-felt for å velge kontakt (i stedet for å bruke listeboks).
SearchFilter=Søkefiltrene alternativer
NumberOfKeyToSearch=NBR tegn til å utløse søk: %s
ViewFullDateActions=Vis fulle datoer i tredje ark
@@ -120,7 +120,7 @@ LanguageBrowserParameter=Parameter %s
LocalisationDolibarrParameters=Språkparametere for Dolibarr
ClientTZ=Tidssone (bruker)
ClientHour=Klienttid (bruker)
-OSTZ=Server OS Time Zone
+OSTZ=Server OS Tidssone
PHPTZ=Tidssone PHP
PHPServerOffsetWithGreenwich=Forskyvning for PHP-server mot Greenwich (sekunder)
ClientOffsetWithGreenwich=Klient / Browser offset bredde Greenwich (sekunder)
@@ -135,7 +135,7 @@ Box=Boks
Boxes=Bokser
MaxNbOfLinesForBoxes=Maks. antall linher for bokser
PositionByDefault=Gjeldende rekkefølge
-Position=Position
+Position=Posisjon
MenusDesc=Menybehandleren avgjør innholdet i de to menyene (horisontal og vertikal menybjelke).
MenusEditorDesc=I menybehandleren kan du stille inn egne menyvalg. Bruk denne med forsiktighet for å unngå at Dolibarr blir ustabil eller at noen menyvalg blit permanent borte.<br>Noen moduler legger til oppføringer i menyene (i meny <b>Alle</b> i de fleste tilfeller). Hvis du har fjernet noen av disse ved en feiltagelse kan du få dem tilbake ved å slå av og slå på modulen igjen.
MenuForUsers=Brukermeny
@@ -145,7 +145,7 @@ SystemInfo=Systeminformasjon
SystemTools=Systemverktøy
SystemToolsArea=Område for systemverktøy
SystemToolsAreaDesc=Dette området gir tilgang til administrasjonsfunksjonene. Bruk menyen til å velge funksjonen du leter etter.
-Purge=Purge
+Purge=Utrenskning
PurgeAreaDesc=Denne siden lar deg slette alle filer opprettet eller lagret av Dolibarr (midlertidige filer eller alle filer i mappen <b>%s</b>). Normalt er det ikke nødvendig å bruke denne funksjonen. Den er laget for brukere som har Dolibarr installert på en delt server, og hvor man ikke har tilgang til å slette filer opprettet av webserveren.
PurgeDeleteLogFile=Slett loggfil <b>%s</b> definert for Syslog modul (ingen risiko for å miste data)
PurgeDeleteTemporaryFiles=Slett alle midlertidige filer (medfører ingen risiko for å miste data)
@@ -295,7 +295,7 @@ DownloadPackageFromWebSite=Last ned pakken fra nettstedet %s.
UnpackPackageInDolibarrRoot=Pakk ut filen i Dolibarrs rotmappe <b>%s</b>
SetupIsReadyForUse=Installasjonen er ferdig og Dolibarr er klar til bruk med den nye modulen.
NotExistsDirect=Alternativ rotkatalog er ikke definert. <br>
-InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirAlt=Etter versjon 3 er det mulig å definere en alternativ rotkatalog. Dette lar deg lagre plug-ins og egendefinerte maler på samme sted.<br>Bare lag en katalog i roten av Dolibarr (f.eks: egendefinert).<br>
InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
YouCanSubmitFile=Velg modul:
CurrentVersion=Dolibarr gjeldende versjon
@@ -306,8 +306,8 @@ GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}<
GenericMaskCodes3=Alle andre tegn i masken vil være intakt. <br> Mellomrom er ikke tillatt. <br>
GenericMaskCodes4a=<u>Eksempel på 99nde %s av tredje part TheCompany gjort 2007-01-31:</u> <br>
GenericMaskCodes4b=<u>Eksempel på tredjeparts opprettet på 2007-03-01:</u> <br>
-GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
+GenericMaskCodes4c=<u>Eksempel på produkt opprettet 2007-03-01:</u><br>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> vil gi <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> vil gi <b>0199-ZZZ/31/XXX</b>
GenericNumRefModelDesc=Gir et egendefinert nummer etter en definert mal.
ServerAvailableOnIPOrPort=Serveren er tilgjengelig på adressen <b>%s</b> på port <b>%s</b>
ServerNotAvailableOnIPOrPort=Serveren er ikke tilgjengelig på adressen <b>%s</b> på port <b>%s</b>
@@ -393,7 +393,7 @@ LinkToTest=Klikkbar link generert for <strong>bruker%s</strong> (klikk telefonnu
KeepEmptyToUseDefault=Hold tomt for å bruke standardverdien
DefaultLink=Standard kobling
ValueOverwrittenByUserSetup=Advarsel, denne verdien kan bli overskrevet av brukerspesifikke oppsett (hver bruker kan sette sitt eget clicktodial url)
-ExternalModule=External module - Installed into directory %s
+ExternalModule=Ekstern modul - Installert i katalog %s
BarcodeInitForThirdparties=Mass barcode init for thirdparties
BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> records on <strong>%s</strong> %s without barcode defined.
@@ -437,8 +437,8 @@ Module52Name=Beholdning
Module52Desc=Behandling av lagerbeholdning
Module53Name=Tjenester
Module53Desc=Behandling av tjenester
-Module54Name=Kontrakter
-Module54Desc=Behandling av kontrakter og tjenester
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=Strekkoder
Module55Desc=Behandling av strekkoder
Module56Name=Telefoni
@@ -475,8 +475,8 @@ Module320Name=RSS nyhetsstrøm
Module320Desc=Legg til RSS nyhetsstrøm på Dolibarrsider
Module330Name=Bookmerker
Module330Desc=Behandling av bokmerker
-Module400Name=Prosjekter
-Module400Desc=Behandling av prosjekter inne i andre moduler
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=Webkalender
Module410Desc=Intergrasjon med webkalender
Module500Name=Spesielle utgifter (skatt, sosiale bidrag, utbytte)
@@ -484,7 +484,7 @@ Module500Desc=Forvaltning av spesielle utgifter som skatt, sosiale bidrag, utbyt
Module510Name=Salaries
Module510Desc=Management of employees salaries and payments
Module600Name=Varselmeldinger
-Module600Desc=Sender beskjeder (med e-post) om Dolibarrhendleser
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Donasjoner
Module700Desc=Behandling av donasjoner
Module1200Name=Mantis
@@ -514,16 +514,16 @@ Module5000Name=Multi-selskap
Module5000Desc=Lar deg administrere flere selskaper
Module6000Name=Workflow
Module6000Desc=Workflow management
-Module20000Name=Ferier
-Module20000Desc=Erklære og følg ansattes ferie
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
Module39000Name=Product batch
Module39000Desc=Batch number, eat-by and sell-by date management on products
Module50000Name=PAYBOX
Module50000Desc=Modul å tilby en online betaling side med kredittkort med PAYBOX
Module50100Name=Kassaapparat
Module50100Desc=Kassaapparatmodul
-Module50200Name= Paypal
-Module50200Desc= Modul å tilby en online betaling side med kredittkort med Paypal
+Module50200Name=Paypal
+Module50200Desc=Modul å tilby en online betaling side med kredittkort med Paypal
Module50400Name=Accounting (advanced)
Module50400Desc=Accounting management (double parties)
Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=Vise åpne ordre
Permission152=Sette opp åpne ordre
Permission153=Vise kvitteringer for stående ordre
Permission154=Kreditt / nekte stående ordre kvitteringer
-Permission161=Vise kontrakter
-Permission162=Lage/endre kontrakter
-Permission163=Aktivere en tjeneste i en kontrakt
-Permission164=Deaktivere en tjeneste i en kontrakt
-Permission165=Slette kontrakter
-Permission171=Les turer
-Permission172=Opprett / endre turer
-Permission173=Slett turer
-Permission178=Eksporter turer
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Read trips and expenses (own and his subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
Permission180=Vise leverandører
Permission181=Vise leverandøreorde
Permission182=Lage/endre leverandørordre
@@ -671,7 +672,7 @@ Permission300=Vise strekkoder
Permission301=Vise/endre strekkoder
Permission302=Slette strekkoder
Permission311=Les tjenester
-Permission312=Tilordne service til kontrakt
+Permission312=Assign service/subscription to contract
Permission331=Vise bokmerker
Permission332=Lage/endre bokmerker
Permission333=Slette bokmerker
@@ -701,8 +702,8 @@ Permission701=Vise donasjoner
Permission702=Lage/endre donasjoner
Permission703=Slette donasjoner
Permission1001=Vise beholdning
-Permission1002=Lage/endre beholdninger
-Permission1003=Slette beholdninger
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=Vise lagerbevegelser
Permission1005=Lage/endre lagerbevegelser
Permission1101=Vise pakksedler
@@ -748,7 +749,7 @@ Permission2802=Bruk FTP-klient i skrivemodus (slette eller laste opp filer)
Permission50101=Bruk Point of salg
Permission50201=Les transaksjoner
Permission50202=Importer transaksjoner
-Permission54001=Print
+Permission54001=Skriv ut
Permission55001=Read polls
Permission55002=Create/modify polls
Permission59001=Read commercial margins
@@ -774,7 +775,7 @@ DictionaryFees=Type of fees
DictionarySendingMethods=Shipping methods
DictionaryStaff=Staff
DictionaryAvailability=Delivery delay
-DictionaryOrderMethods=Ordering methods
+DictionaryOrderMethods=Ordremetoder
DictionarySource=Origin of proposals/orders
DictionaryAccountancyplan=Chart of accounts
DictionaryAccountancysystem=Models for chart of accounts
@@ -1038,7 +1039,6 @@ YesInSummer=Ja i sommer
OnlyFollowingModulesAreOpenedToExternalUsers=Obs, bare følgende moduler er åpnet for eksterne brukere (uansett tillatelse for slike brukere):
SuhosinSessionEncrypt=Session lagring kryptert av Suhosin
ConditionIsCurrently=Tilstand er for øyeblikket %s
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
YouUseBestDriver=You use driver %s that is best driver available currently.
YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by %s followed by thi
ModuleCompanyCodePanicum=Return an empty accountancy code.
ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
UseNotifications=Bruk beskjeder
-NotificationsDesc=Beskjeder lar deg umerket sende automatiske e-poster for noen Dolibarr-hendelser til firmaer som er konfigurert for å motta slike
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
ModelModules=Dokumenter maler
DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
WatermarkOnDraft=Vannmerke på utkast
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=Legg til felt for leveringsdato
UseOptionLineIfNoQuantity=En produkt/tjeneste med med null i kvantum blir betraktet som en valgmulighet
FreeLegalTextOnProposal=Fritekst på tilbud
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=Innstillinger for ordre
OrdersNumberingModules=Nummereringsmodul for ordre
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list
ValidOrderAfterPropalClosed=Ordre krever godkjenning etter at tilbudet er lukket
FreeLegalTextOnOrders=Fritekst på ordre
WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
##### Clicktodial #####
ClickToDialSetup='Click To Dial' modul
ClickToDialUrlDesc=Url som hentes når brukeren trykker på telefonikonet.<br>Full url vil være: URL?login=...&password=...&caller=...&called=phonecalled
@@ -1158,10 +1160,10 @@ FicheinterNumberingModules=Nummereringsmodul for intervensjoner
TemplatePDFInterventions=Intervensjonsmaler
WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
##### Contracts #####
-ContractsSetup=Kontrakter modul oppsett
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=Kontrakter nummerering moduler
TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
+FreeLegalTextOnContracts=Fritekst på kontrakter
WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
##### Members #####
MembersSetup=Innstillnger for medlemsmodul
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
CacheByServer=Cache by server
CacheByClient=Cache by browser
CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=Innstillinger for produktmodul
ServiceSetup=Tjenester modul oppsett
@@ -1382,9 +1384,10 @@ MailingSetup=EMailing module setup
MailingEMailFrom=Sender EMail (From) for emails sent by emailing module
MailingEMailError=Tilbake e-post (Feil-til) for e-post med feil
##### Notification #####
-NotificationSetup=Mailing module setup
+NotificationSetup=EMail notification module setup
NotificationEMailFrom=Sender EMail (From) for emails sent for notifications
-ListOfAvailableNotifications=Liste over tilgjengelige varslinger (Denne listen avhenger aktiverte moduler)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
##### Sendings #####
SendingsSetup=Sending module setup
SendingsReceiptModel=Sending receipt model
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe
OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
##### Stock #####
-StockSetup=Configuration module stock
-UserWarehouse=Use user personal stocks
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=Menyen er slettet
TreeMenu=Tremenyer
@@ -1478,11 +1482,14 @@ ClickToDialDesc=Denne modulen gir et telefonikon etter telefonnummeret til konta
##### Point Of Sales (CashDesk) #####
CashDesk=Point of salg
CashDeskSetup=Instillinger for modulen kassaapparat
-CashDeskThirdPartyForSell=Generisk tredjepart som skal brukes til kontantsalg
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Kassekonto som skal brukes til kontantsalg
CashDeskBankAccountForCheque= Konto som skal brukes til å motta utbetalinger via sjekk
CashDeskBankAccountForCB= Konto som skal brukes til å motta kontant betaling med kredittkort
-CashDeskIdWareHouse=Lager som skal brukes for kontantsalg
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Legg modul oppsett
BookmarkDesc=Denne modulen kan du administrere bokmerker. Du kan også legge til snarveier til noen Dolibarr sider eller externale nettsteder på venstre meny.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Delete fiscal year
ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
Opened=Opened
Closed=Closed
-
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
diff --git a/htdocs/langs/nb_NO/agenda.lang b/htdocs/langs/nb_NO/agenda.lang
index 0d405ccd554fad5367bd84f8a7610e26447d2006..5f9c624b30544d566b67a21681352a95dffea345 100644
--- a/htdocs/langs/nb_NO/agenda.lang
+++ b/htdocs/langs/nb_NO/agenda.lang
@@ -6,11 +6,11 @@ Agenda=Agenda
Agendas=Agendaer
Calendar=Kalender
Calendars=Kalendrer
-LocalAgenda=Internal calendar
-ActionsOwnedBy=Event owned by
+LocalAgenda=Intern kalender
+ActionsOwnedBy=Hendelse tilhører
AffectedTo=Relatert til
DoneBy=Utført av
-Event=Event
+Event=Hendelse
Events=Hendelser
EventsNb=Antall hendelser
MyEvents=Mine hendelser
@@ -23,27 +23,28 @@ MenuToDoActions=Alle åpne handlinger
MenuDoneActions=Alle avsluttede handlinger
MenuToDoMyActions=Mine åpne handlinger
MenuDoneMyActions=Mine avsluttede handlinger
-ListOfEvents=List of events (internal calendar)
+ListOfEvents=Hendelsesliste (intern kalender)
ActionsAskedBy=Handlinger registrert av
ActionsToDoBy=Handlinger relatert til
ActionsDoneBy=Handlinger utført av
-ActionsForUser=Events for user
-ActionsForUsersGroup=Events for all users of group
+ActionsForUser=Hendelser for brukere
+ActionsForUsersGroup=Hendelser for alle brukerene i gruppen
AllMyActions= Alle mine handlinger/oppgaver
AllActions= Alle handlinger/oppgaver
ViewList=Vis liste
ViewCal=Vis kalender
ViewDay=Dagsvisning
ViewWeek=Ukesvisning
-ViewPerUser=Per user view
+ViewPerUser=Visning pr. bruker
ViewWithPredefinedFilters= Vis med forhåndsdefinerte filtere
AutoActions= Automatisk utfylling av agenda
AgendaAutoActionDesc= Her angir du hvilke handlinger du ønsker at Dolibarr automatisk skal registrere i agendaen. Hvis du ikke velger noe (forhåndsinnstilt), vil bare manuelle handlinger bli registrert i agendaen.
AgendaSetupOtherDesc= Her kan du gjøre andre innstillinger i agendamodulen.
AgendaExtSitesDesc=Denne siden lar deg erklære eksterne kilder til kalendere for å se sine arrangementer inn Dolibarr agenda.
-ActionsEvents= Handlinger som Dolibarr automatisk registrerer i agendaen
-PropalValidatedInDolibarr= Tilbud godkjent
-InvoiceValidatedInDolibarr= Faktura godkjent
+ActionsEvents=Handlinger som Dolibarr automatisk registrerer i agendaen
+PropalValidatedInDolibarr=Tilbud godkjent
+InvoiceValidatedInDolibarr=Faktura godkjent
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=Faktura %s gå tilbake til utkast status
InvoiceDeleteDolibarr=Faktura %s slettet
OrderValidatedInDolibarr= Ordre godkjent
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Bestill %s godkjent
OrderRefusedInDolibarr=Ordre %s nektet
OrderBackToDraftInDolibarr=Bestill %s gå tilbake til utkast status
OrderCanceledInDolibarr=Bestill %s kansellert
-InterventionValidatedInDolibarr=Intervensjon %s validert
ProposalSentByEMail=Kommersielle forslag %s på e-post
OrderSentByEMail=Kundeordrer %s på e-post
InvoiceSentByEMail=Faktura %s på e-post
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=Leverandør bestill %s på e-post
SupplierInvoiceSentByEMail=Leverandørfaktura %s på e-post
ShippingSentByEMail=Frakt %s på e-post
ShippingValidated= Shipping %s validert
-InterventionSentByEMail=Intervensjon %s på e-post
-InterventionClassifiedBilled=Intervention %s classified as Billed
NewCompanyToDolibarr= Tredjepart opprettet
DateActionPlannedStart= Planlagt startdato
DateActionPlannedEnd= Planlagt sluttdato
@@ -70,24 +68,24 @@ DateActionStart= Startdato
DateActionEnd= Sluttdato
AgendaUrlOptions1=Du kan også bruke følgende parametere til å filtrere listen:
AgendaUrlOptions2=<b>login=%s</b> for å begrense utvalg til handlinger registrert av, relatert til eller utført av bruker <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> for å begrense utvalg til handlinger registrert av bruker <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
AgendaUrlOptions4=<b>logint=%s</b> for å begrense utvalg til handlinger relatert til bruker <b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> for å begrense utvalg til handlinger utført av bruker <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
AgendaShowBirthdayEvents=Vis fødselsdager
AgendaHideBirthdayEvents=Skjul fødselsdager
Busy=Opptatt
ExportDataset_event1=Liste over agenda hendelser
-DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
-DefaultWorkingHours=Default working hours in day (Example: 9-18)
+DefaultWorkingDays=Standard arbeidsuke (f.eks 1-5, 1-6)
+DefaultWorkingHours=Standard arbeidstid (f.eks 9-18)
# External Sites ical
ExportCal=Eksporter kalender
ExtSites=Importer eksterne kalendere
-ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
+ExtSitesEnableThisTool=Vis eksterne kalendere (definert i global setup) i agenda. Påvirker ikke eksterne kalendere definert av brukere.
ExtSitesNbOfAgenda=Antall kalendere
AgendaExtNb=Kalender nb %s
ExtSiteUrlAgenda=URL tilgang til. ICal-fil
ExtSiteNoLabel=Ingen beskrivelse
-WorkingTimeRange=Working time range
-WorkingDaysRange=Working days range
-AddEvent=Add event
-MyAvailability=My availability
+WorkingTimeRange=Arbeidstid
+WorkingDaysRange=Arbeidsuke
+AddEvent=Create event
+MyAvailability=Min tilgjengelighet
diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang
index 1253d1452554e1da9885152a6ec7120e2bfd4524..aa07946a2169ba926f6ac01ded766961a8f976ef 100644
--- a/htdocs/langs/nb_NO/bills.lang
+++ b/htdocs/langs/nb_NO/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Kreditnota
InvoiceAvoirAsk=Kreditnota for å korriger fektura
InvoiceAvoirDesc=En <b>kreditnota</b> er en negativ faktura som brukes for å løse situasjoner hvor en faktura har et annet beløp enn det som virkelig er betalt (fordi kunden har betalt for lite ved en feil, eller for eksempel ikke ønsker å betale alt fordi han har returnert noen varer.).<br><br>Obs!: Originalfakturaen må allerede være lukket ('betalt' eller 'delbetalt') for at du skal kunne opprette en kreditnota mot den.
invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
-invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
ReplaceInvoice=Erstatt faktura %s
ReplacementInvoice=Erstatningsfaktura
ReplacedByInvoice=Erstattet av faktura %s
@@ -58,7 +58,7 @@ Payment=Betaling
PaymentBack=Betaling tilbake
Payments=Betalinger
PaymentsBack=Betalinger tilbake
-PaidBack=Paid back
+PaidBack=Tilbakebetalt
DatePayment=Betalingsdato
DeletePayment=Slett betaling
ConfirmDeletePayment=Er du sikker på at du vil slette denne betalingen?
@@ -77,7 +77,7 @@ PaymentMode=Betalingsmåte
PaymentConditions=Betalingsbetingelser
PaymentConditionsShort=Betalingsbetingelser
PaymentAmount=Beløp til betaling
-ValidatePayment=Validate payment
+ValidatePayment=Godkjenn betaling
PaymentHigherThanReminderToPay=Betalingen er høyere enn restbeløp
HelpPaymentHigherThanReminderToPay=Oppmerksomhet, er betalingen mengden av en eller flere regninger høyere enn resten til å betale. <br> Endre din oppføring, ellers bekrefte og tenke på å lage en kreditnota av det overskytende mottatt for hver overbetalte fakturaer.
HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm.
@@ -87,7 +87,7 @@ ClassifyCanceled=Merk 'Tapsført'
ClassifyClosed=Merk 'Lukket'
ClassifyUnBilled=Classify 'Unbilled'
CreateBill=Lag faktura
-AddBill=Legg til faktura eller kreditnota
+AddBill=Create invoice or credit note
AddToDraftInvoices=Add to draft invoice
DeleteBill=Slett faktura
SearchACustomerInvoice=Finn kundefaktura
@@ -99,7 +99,7 @@ DoPaymentBack=Utfør tilbakebetaling
ConvertToReduc=Konverter til framtidig rabatt
EnterPaymentReceivedFromCustomer=Legg inn betaling mottatt fra kunde
EnterPaymentDueToCustomer=Lag purring til kunde
-DisabledBecauseRemainderToPayIsZero=Slått av fordi restbeløpet er null
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
Amount=Beløp
PriceBase=Prisgrunnlag
BillStatus=Fakturastatus
@@ -137,8 +137,6 @@ BillFrom=Fra
BillTo=Fakturamottaker
ActionsOnBill=Handlinger på faktura
NewBill=Ny faktura
-Prélèvements=Utestående ordre
-Prélèvements=Utestående ordre
LastBills=Siste %s fakturaer
LastCustomersBills=Siste %s kundefakturaer
LastSuppliersBills=Siste %s kundefakturaer
@@ -156,9 +154,9 @@ ConfirmCancelBill=Er du sikker på at du vil kansellere faktura <b>%s</b> ?
ConfirmCancelBillQuestion=hvorfor vil du tapsføre denne fakturaen?
ConfirmClassifyPaidPartially=Er du sikker på at du vil endre status på faktura <b>%s</b> til betalt?
ConfirmClassifyPaidPartiallyQuestion=Denne fakturaen er ikke fullt ut betalt. Hva er grunnen til at du vil lukke fakturaen?
-ConfirmClassifyPaidPartiallyReasonAvoir=Restbeløpet <b>(%s %s)</b> er rabatt innrømmet fordi betalingen ble gjort før forfall. Jeg ønsker å rette opp MVA med en kreditnota.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Restbeløpet <b>(%s %s)</b> er rabatt innrømmet fordi betalingen ble gjort før forfall. Jeg aksepterer å miste MVA på denne rebatten.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Restebløpet <b>(%s %s)</b> er rabatt innrømmet fordi betalingen ble gjort før forfall. Jeg skriver av MVA på denne rabatten uten kreditnota.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
ConfirmClassifyPaidPartiallyReasonBadCustomer=Dårlig kunde
ConfirmClassifyPaidPartiallyReasonProductReturned=Varer delvis returnert
ConfirmClassifyPaidPartiallyReasonOther=Beløpet tapsføres av en annen årsak
@@ -191,10 +189,10 @@ AlreadyPaid=Allerede betalt
AlreadyPaidBack=Already paid back
AlreadyPaidNoCreditNotesNoDeposits=Allerede betalt (uten kreditt notater og innskudd)
Abandoned=Tapsført
-RemainderToPay=Restbeløp
-RemainderToTake=Restbeløp
-RemainderToPayBack=Remainder to pay back
-Rest=Pending
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
+Rest=Ventende
AmountExpected=Beløp purret
ExcessReceived=Overskytende
EscompteOffered=Rabatt innrømmet (betalt før forfall)
@@ -220,18 +218,17 @@ ClassifyBill=Klassifiser faktura
SupplierBillsToPay=Leverandørfakturaer til betaling
CustomerBillsUnpaid=Ubetalte kundefakturaer
DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
-DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=Non-recoverable
SetConditions=Angi betalingsbetingelser
SetMode=Angi betalingsmodus
Billed=Fakturert
-RepeatableInvoice=Forhåndsdefinert faktura
-RepeatableInvoices=Forhåndsdefinerte fakturaer
-Repeatable=Forhåndsdefinert
-Repeatables=Forhåndsdefinert
-ChangeIntoRepeatableInvoice=Konverter til forhåndsdefinert
-CreateRepeatableInvoice=Opprett forhåndsdefinert faktura
-CreateFromRepeatableInvoice=Opprett fra forhåndsdefinert faktura
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
CustomersInvoicesAndInvoiceLines=Kundefakturaer og fakturalinjer
CustomersInvoicesAndPayments=Kundefakturaer og betalinger
ExportDataset_invoice_1=Oversikt over kundefakturaer og fakturalinjer
@@ -315,9 +312,9 @@ PaymentConditionPT_DELIVERY=Ved levering
PaymentConditionShortPT_ORDER=On order
PaymentConditionPT_ORDER=On order
PaymentConditionShortPT_5050=50-50
-PaymentConditionPT_5050=50%% in advance, 50%% on delivery
-FixAmount=Fix amount
-VarAmount=Variable amount (%% tot.)
+PaymentConditionPT_5050=50%% i forskudd, 50%% ved levering
+FixAmount=Fast beløp
+VarAmount=Variabelt beløp
# PaymentType
PaymentTypeVIR=Bankgiro
PaymentTypeShortVIR=Bankgiro
@@ -367,7 +364,7 @@ LawApplicationPart2=intil de er fullt ut betalt.
LawApplicationPart3=Fakturautsteder forbeholder seg salgspant
LawApplicationPart4=i leverte varer inntil de er betalt i sin helhet.
LimitedLiabilityCompanyCapital=AS med organisajonsnummer
-UseLine=Apply
+UseLine=Legg til
UseDiscount=Bruk rabatt
UseCredit=Bruk kredittkort
UseCreditNoteInInvoicePayment=Rediset betaling med denne kreditnotaen
@@ -394,9 +391,9 @@ PayedByThisPayment=Betales av denne betalingen
ClosePaidInvoicesAutomatically=Klassifisere "betalt" alle standard eller utskifting fakturaer entirely utbetales.
ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
AllCompletelyPayedInvoiceWillBeClosed=Alle faktura uten gjenstår å betale vil bli automatisk stengt for status "betales".
-ToMakePayment=Pay
-ToMakePaymentBack=Pay back
-ListOfYourUnpaidInvoices=List of unpaid invoices
+ToMakePayment=Betal
+ToMakePaymentBack=Tilbakebetal
+ListOfYourUnpaidInvoices=Liste over ubetalte fakturaer
NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
RevenueStamp=Revenue stamp
YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
diff --git a/htdocs/langs/nb_NO/categories.lang b/htdocs/langs/nb_NO/categories.lang
index d272648cfc6fc9dd49f7fb7b5306b15fb39f4fa5..8c593d439f0430f54355c68971ac78a0c6fea30b 100644
--- a/htdocs/langs/nb_NO/categories.lang
+++ b/htdocs/langs/nb_NO/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Koblinger mellom leverandører og kategorier
CatCusLinks=Koblinger mellom kunder / prospekter og kategorier
CatProdLinks=Koblinger mellom produkter / tjenester og kategorier
CatMemberLinks=Koblinger mellom medlemmer og kategorier
-CatProdLinks=Koblinger mellom produkter / tjenester og kategorier
-CatCusLinks=Koblinger mellom kunder / prospekter og kategorier
-CatSupLinks=Koblinger mellom leverandører og kategorier
DeleteFromCat=Fjern fra kategori
DeletePicture=Slette bilde
ConfirmDeletePicture=Bekreft bildesletting?
@@ -111,4 +108,5 @@ ExtraFieldsCategories=Komplementære attributter
CategoriesSetup=Kategori-oppsett
CategorieRecursiv=Link med overordnet kategori automatisk
CategorieRecursivHelp=Hvis aktivert, vil produktet også knyttes til overordnet kategori når du legger inn en underkategori
-AddProductServiceIntoCategory=Add the following product/service
+AddProductServiceIntoCategory=Legg til følgende produkt/tjeneste
+ShowCategory=Show category
diff --git a/htdocs/langs/nb_NO/compta.lang b/htdocs/langs/nb_NO/compta.lang
index 0656184c2816fc25f507269053c39e6c2f0e1b28..98d6fdd4f5f28776eab7711dd8abaa8729af8496 100644
--- a/htdocs/langs/nb_NO/compta.lang
+++ b/htdocs/langs/nb_NO/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Dårlig kunde regnskap koden for %s
SuppliersProductsSellSalesTurnover=Den genererte omsetningen av salg av leverandørens produkter.
CheckReceipt=Sjekk innskudd
CheckReceiptShort=Sjekk innskudd
+LastCheckReceiptShort=Last %s check receipts
NewCheckReceipt=Nye rabatt
NewCheckDeposit=Ny sjekk innskudd
NewCheckDepositOn=Lag kvittering for innskudd på konto: %s
diff --git a/htdocs/langs/nb_NO/contracts.lang b/htdocs/langs/nb_NO/contracts.lang
index 3a686d49669bd03a8f8127771ecbcf2b07e5f286..65aa8892fc363d56977ddaedd73543defe95d92a 100644
--- a/htdocs/langs/nb_NO/contracts.lang
+++ b/htdocs/langs/nb_NO/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Kontraktsområde
ListOfContracts=Oversikt over kontrakter
-LastContracts=Siste %s endrede kontrakter
+LastModifiedContracts=Last %s modified contracts
AllContracts=Alle kontrakter
ContractCard=Kontraktskort
ContractStatus=Kontraktstatus
@@ -27,7 +27,7 @@ MenuRunningServices=Løpende tjenester
MenuExpiredServices=Utløpte tjenester
MenuClosedServices=Lukkede tjenester
NewContract=Ny kontrakt
-AddContract=Legg til kontrakt
+AddContract=Create contract
SearchAContract=Finn kontrakt
DeleteAContract=Slett kontrakt
CloseAContract=Lukk kontrakt
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Oversikt over løpende kontraktslinjer
ListOfRunningServices=Overikt over løpende tjenster
NotActivatedServices=Ikke aktiverte tjenester (blant godkjente kontrakter)
BoardNotActivatedServices=Tjenester til aktivering blant godkjente kontrakter
-LastContracts=Siste %s endrede kontrakter
+LastContracts=Last % contracts
LastActivatedServices=Siste %s aktiverte tjenester
LastModifiedServices=Siste %s endrede tjenester
EditServiceLine=Rediger tjenestelinje
@@ -89,8 +89,8 @@ ListOfServicesToExpireWithDuration=Liste over tjenester som utløper innen %s da
ListOfServicesToExpireWithDurationNeg=Liste over tjenester utløpt fra mer enn %s dager
ListOfServicesToExpire=Liste over utløpende tjenester
NoteListOfYourExpiredServices=Denne listen inneholder kun tjenester av kontrakter for tredjeparter du er koblet til som salgsrepresentant.
-StandardContractsTemplate=Standard contracts template
-ContactNameAndSignature=For %s, name and signature:
+StandardContractsTemplate=Standard kontraktskjema
+ContactNameAndSignature=For %s, navn og signatur:
##### Types de contacts #####
TypeContact_contrat_internal_SALESREPSIGN=Salgsrepresentant som signerer kontrakten
diff --git a/htdocs/langs/nb_NO/cron.lang b/htdocs/langs/nb_NO/cron.lang
index 47d4378cd840330c36210aff3fc843276085f965..2fd21d9c44ba390110b09b8077c48edc0124209c 100644
--- a/htdocs/langs/nb_NO/cron.lang
+++ b/htdocs/langs/nb_NO/cron.lang
@@ -1,114 +1,86 @@
# Dolibarr language file - Source file is en_US - cron
-#
# About page
-#
About = Om
-# CronAbout = About Cron
-# CronAboutPage = Cron about page
-
-#
+CronAbout = About Cron
+CronAboutPage = Cron about page
# Right
-#
-# Permission23101 = Read Scheduled task
-# Permission23102 = Create/update Scheduled task
-# Permission23103 = Delete Scheduled task
-# Permission23104 = Execute Scheduled task
-
-#
+Permission23101 = Read Scheduled task
+Permission23102 = Create/update Scheduled task
+Permission23103 = Delete Scheduled task
+Permission23104 = Execute Scheduled task
# Admin
-#
-# CronSetup= Scheduled job management setup
-# URLToLaunchCronJobs=URL to check and launch cron jobs if required
-# OrToLaunchASpecificJob=Or to check and launch a specific job
-# KeyForCronAccess=Security key for URL to launch cron jobs
-# FileToLaunchCronJobs=Command line to launch cron jobs
-# CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes
-# CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
-
-
-#
+CronSetup= Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch cron jobs if required
+OrToLaunchASpecificJob=Or to check and launch a specific job
+KeyForCronAccess=Security key for URL to launch cron jobs
+FileToLaunchCronJobs=Command line to launch cron jobs
+CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
# Menu
-#
-# CronJobs=Scheduled jobs
-# CronListActive= List of active jobs
-# CronListInactive= List of disabled jobs
-# CronListActive= List of active jobs
-
-
-#
+CronJobs=Scheduled jobs
+CronListActive=List of active/scheduled jobs
+CronListInactive=List of disabled jobs
# Page list
-#
-# CronDateLastRun=Last run
-# CronLastOutput=Last run output
-# CronLastResult=Last result code
-# CronListOfCronJobs=List of scheduled jobs
-# CronCommand=Command
-# CronList=Jobs list
-# CronDelete= Delete cron jobs
-# CronConfirmDelete= Are you sure you want to delete this cron job ?
-# CronExecute=Launch job
-# CronConfirmExecute= Are you sure to execute this job now
-# CronInfo= Jobs allow to execute task that have been planned
-# CronWaitingJobs=Wainting jobs
-# CronTask=Job
+CronDateLastRun=Last run
+CronLastOutput=Last run output
+CronLastResult=Last result code
+CronListOfCronJobs=List of scheduled jobs
+CronCommand=Command
+CronList=Jobs list
+CronDelete= Delete cron jobs
+CronConfirmDelete= Are you sure you want to delete this cron job ?
+CronExecute=Launch job
+CronConfirmExecute= Are you sure to execute this job now
+CronInfo= Jobs allow to execute task that have been planned
+CronWaitingJobs=Wainting jobs
+CronTask=Job
CronNone= Ingen
CronDtStart=Startdato
CronDtEnd=Sluttdato
-# CronDtNextLaunch=Next execution
-# CronDtLastLaunch=Last execution
-# CronFrequency=Frequancy
-# CronClass=Classe
+CronDtNextLaunch=Next execution
+CronDtLastLaunch=Last execution
+CronFrequency=Frequancy
+CronClass=Classe
CronMethod=Metode
CronModule=Modul
-# CronAction=Action
+CronAction=Action
CronStatus=Status
CronStatusActive=Slått på
CronStatusInactive=Slått av
-# CronNoJobs=No jobs registered
+CronNoJobs=No jobs registered
CronPriority=Prioritet
CronLabel=Beskrivelse
-# CronNbRun=Nb. launch
-# CronEach=Every
-# JobFinished=Job launched and finished
-
-#
+CronNbRun=Nb. launch
+CronEach=Every
+JobFinished=Job launched and finished
#Page card
-#
-# CronAdd= Add jobs
-# CronHourStart= Start Hour and date of task
-# CronEvery= And execute task each
-# CronObject= Instance/Object to create
+CronAdd= Add jobs
+CronHourStart= Start Hour and date of task
+CronEvery= And execute task each
+CronObject= Instance/Object to create
CronArgs=Parametere
-# CronSaveSucess=Save succesfully
+CronSaveSucess=Save succesfully
CronNote=Kommentar
-# CronFieldMandatory=Fields %s is mandatory
-# CronErrEndDateStartDt=End date cannot be before start date
-# CronStatusActiveBtn=Enable
+CronFieldMandatory=Fields %s is mandatory
+CronErrEndDateStartDt=End date cannot be before start date
+CronStatusActiveBtn=Enable
CronStatusInactiveBtn=Slå av
-# CronTaskInactive=This job is disabled
-# CronDtLastResult=Last result date
-# CronId=Id
-# CronClassFile=Classes (filename.class.php)
-# CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-# CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-# CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-# CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is <i>fecth</i>
-# CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-# CronCommandHelp=The system command line to execute.
-
-#
+CronTaskInactive=This job is disabled
+CronDtLastResult=Last result date
+CronId=Id
+CronClassFile=Classes (filename.class.php)
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
+CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronCommandHelp=The system command line to execute.
# Info
-#
-# CronInfoPage=Information
-
-
-#
+CronInfoPage=Information
# Common
-#
-# CronType=Task type
-# CronType_method=Call method of a Dolibarr Class
-# CronType_command=Shell command
-# CronMenu=Cron
-# CronCannotLoadClass=Cannot load class %s or object %s
-
-# UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+CronType=Task type
+CronType_method=Call method of a Dolibarr Class
+CronType_command=Shell command
+CronMenu=Cron
+CronCannotLoadClass=Cannot load class %s or object %s
+UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
diff --git a/htdocs/langs/nb_NO/donations.lang b/htdocs/langs/nb_NO/donations.lang
index f3b03e310b5f31d931ffecbb70ea1436c9758cfe..9d2ec5ceac962ccfac05b2f3938121b7876fc847 100644
--- a/htdocs/langs/nb_NO/donations.lang
+++ b/htdocs/langs/nb_NO/donations.lang
@@ -4,7 +4,7 @@ Donations=Donasjoner
DonationRef=Donation ref.
Donor=Giver
Donors=Givere
-AddDonation=Legg til donasjon
+AddDonation=Create a donation
NewDonation=Ny donasjon
ShowDonation=Show donation
DonationPromise=Lovet donasjon
@@ -31,3 +31,8 @@ DonationRecipient=Donation recipient
ThankYou=Thank You
IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
MinimumAmount=Minimum amount is %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/nb_NO/externalsite.lang b/htdocs/langs/nb_NO/externalsite.lang
index 58f2fa9833b04b95c360cfb535206ee31b84229a..a9bb5c5b6b880f5e8deed1929131c51152518688 100644
--- a/htdocs/langs/nb_NO/externalsite.lang
+++ b/htdocs/langs/nb_NO/externalsite.lang
@@ -1,4 +1,5 @@
# Dolibarr language file - Source file is en_US - externalsite
ExternalSiteSetup=Oppsett lenke til ekstern nettside
ExternalSiteURL=Ekstern nettstedadresse
-# ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/nb_NO/holiday.lang b/htdocs/langs/nb_NO/holiday.lang
index b8a8d1195da313f27c7bd2633c3f045402a2d041..77547730107ee1534fdd666bca5b29ed13691d8b 100644
--- a/htdocs/langs/nb_NO/holiday.lang
+++ b/htdocs/langs/nb_NO/holiday.lang
@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
CantCreateCP=You don't have the right to make leave requests.
InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=Oppdater
CantUpdate=You cannot update this leave request.
NoDateDebut=You must select a start date.
NoDateFin=You must select an end date.
-ErrorDureeCP=Your request for holidays does not contain working day.
-TitleValidCP=Approve the request holidays
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
ConfirmValidCP=Are you sure you want to approve the leave request?
DateValidCP=Date approved
TitleToValidCP=Send leave request
ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the request holidays
+TitleRefuseCP=Refuse the leave request
ConfirmRefuseCP=Are you sure you want to refuse the leave request?
NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
+TitleCancelCP=Cancel the leave request
ConfirmCancelCP=Are you sure you want to cancel the leave request?
DetailRefusCP=Reason for refusal
DateRefusCP=Date of refusal
@@ -78,7 +77,7 @@ ActionByCP=Performed by
UserUpdateCP=For the user
PrevSoldeCP=Previous Balance
NewSoldeCP=New Balance
-alreadyCPexist=A request for holidays has already been done on this period.
+alreadyCPexist=A leave request has already been done on this period.
UserName=Navn
Employee=Employee
FirstDayOfHoliday=First day of vacation
@@ -88,25 +87,25 @@ ManualUpdate=Manual update
HolidaysCancelation=Leave request cancelation
## Configuration du Module ##
-ConfCP=Configuration of holidays module
+ConfCP=Configuration of leave request module
DescOptionCP=Description of the option
ValueOptionCP=Verdi
-GroupToValidateCP=Group with the ability to approve vacation
-ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last automatic update of vacation
-UpdateConfCPOK=Updated successfully.
-ErrorUpdateConfCP=An error occurred during the update, please try again.
-AddCPforUsers=Please add the balance of holidays of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
+GroupToValidateCP=Group with the ability to approve leave requests
+ConfirmConfigCP=Valider konfigurasjonen
+LastUpdateCP=Last automatic update of leaves allocation
+UpdateConfCPOK=Vellykket oppdatering.
+ErrorUpdateConfCP=En feil oppsto under oppdatering, vennligst prøv igjen.
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
Module27130Name= Management of leave requests
Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
TitleOptionEventCP=Settings of leave requets for events
ValidEventCP=Godkjenn
UpdateEventCP=Update events
diff --git a/htdocs/langs/nb_NO/interventions.lang b/htdocs/langs/nb_NO/interventions.lang
index 1c7ce9ae2028028f2a0b6b8fbb7e3c7e8819329a..5705c460ca4b2c24e9c8c7603c3342ff237c6e7f 100644
--- a/htdocs/langs/nb_NO/interventions.lang
+++ b/htdocs/langs/nb_NO/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Intervensjon
Interventions=Intervensjoner
InterventionCard=Intervensjonskort
NewIntervention=Ny intervensjon
-AddIntervention=Legg til interensjon
+AddIntervention=Create intervention
ListOfInterventions=Oversikt over intervensjoner
EditIntervention=Rediger intervensjon
ActionsOnFicheInter=Handlinger om inngrep
@@ -30,6 +30,15 @@ StatusInterInvoiced=Fakturert
RelatedInterventions=Relaterte intervensjoner
ShowIntervention=Vis intervensjon
SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Ansvarlig for å følge opp intervensjonen
TypeContact_fichinter_internal_INTERVENING=Tekniker
diff --git a/htdocs/langs/nb_NO/mails.lang b/htdocs/langs/nb_NO/mails.lang
index 630eb5dcee997fe6e361bb2fad1fac44f42b7595..011ac84fb48e8294f97a5a7bff443d48cb59afe0 100644
--- a/htdocs/langs/nb_NO/mails.lang
+++ b/htdocs/langs/nb_NO/mails.lang
@@ -79,7 +79,7 @@ MailtoEMail=Link til e-post
ActivateCheckRead=Tillate å bruke "Avmelding" linken
ActivateCheckReadKey=Key bruk for å kryptere URL bruk for "Les kvittering" og "melder"-funksjonen
EMailSentToNRecipients=E-post sendt til %s mottakere.
-XTargetsAdded=<b>%s</b> recipients added into target list
+XTargetsAdded=<b>%s</b> mottakere lagt til i målliste
EachInvoiceWillBeAttachedToEmail=Et dokument med standard faktura dokumentmal vil bli opprettet og sendt med hver e-post.
MailTopicSendRemindUnpaidInvoices=Påminnelse om faktura %s (%s)
SendRemind=Send påminnelse som e-post
@@ -115,7 +115,7 @@ SentBy=Sendt av
MailingNeedCommand=For sikkerhets skyld sende en e-post er bedre når utføres fra kommandolinjen. Hvis du har en, spør din server administrator å lansere følgende kommando for å sende e-post til alle mottakere:
MailingNeedCommand2=Du kan imidlertid sende dem online ver å sette parameteret MAILING_LIMIT_SENDBYWEB til en verdi tilsvarende den maksimale antalle e-poster du ønsker å sende i en økt.
ConfirmSendingEmailing=Hvis du ikke kan eller foretrekker å sende dem med din nettleser, må du bekrefte at du er sikker på at du vil sende e-post nå fra nettleseren din?
-LimitSendingEmailing=Merk: På linjen sending av emailings er begrenset for sikkerhet og timeout grunner <b>til %s</b> mottakere ved å sende økten.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=Tøm liste
ToClearAllRecipientsClickHere=Trykk på knappen for å tømme mottagerlisten
ToAddRecipientsChooseHere=Velg i listene for å legge til mottagere
@@ -133,6 +133,9 @@ Notifications=Varsler
NoNotificationsWillBeSent=Ingen e-postvarsler er planlagt for denne hendelsen/firmaet
ANotificationsWillBeSent=1 e-postvarsel vil bli sendt med e-post
SomeNotificationsWillBeSent=%s e-postvarsler vil bli sendt med e-post
-AddNewNotification=Slå på en ny varslingsforespørsel
-ListOfActiveNotifications=Vis alle altive varslingsforespørsler
+AddNewNotification=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
ListOfNotificationsDone=List alle e-postmeldinger sendt
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
index c4ba5f792fdb6811d2909d5ec8693db2e31bf4fe..ad3577e67794db121f2cf51101410cf39841d831 100644
--- a/htdocs/langs/nb_NO/main.lang
+++ b/htdocs/langs/nb_NO/main.lang
@@ -1,5 +1,5 @@
# Dolibarr language file - Source file is en_US - main
-DIRECTION=ltr
+DIRECTION=l
# Note for Chinese:
# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
# stsongstdlight or cid0cs are for simplified Chinese
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Fant ikke bruker <b>%s</b> i databasen.
ErrorNoVATRateDefinedForSellerCountry=Feil: Det er ikke definert noen MVA-satser for landet '%s'.
ErrorNoSocialContributionForSellerCountry=Feil, ingen sosiale bidrag type definert for landets %s '.
ErrorFailedToSaveFile=Feil: Klarte ikke å lagre filen.
-ErrorOnlyPngJpgSupported=Feil: Det er kun støtte for bilder i formatene .png og .jpg.
-ErrorImageFormatNotSupported=Din PHP støtter ikke bildekonvertering i dette formatet.
SetDate=Still dato
SelectDate=Velg en dato
SeeAlso=Se også %s
BackgroundColorByDefault=Standard bakgrunnsfarge
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
FileWasNotUploaded=En fil er valgt for feste, men var ennå ikke lastet opp. Klikk på "Legg ved fil" for dette.
NbOfEntries=Nb oppføringer
GoToWikiHelpPage=Les elektronisk hjelp (trenger Internett-tilgang)
@@ -266,6 +266,7 @@ Afternoon=Ettermiddag
Quadri=Quadri
MonthOfDay=Month of the day
HourShort=T
+MinuteShort=mn
Rate=Timesats
UseLocalTax=Inkluderer skatt
Bytes=Bytes
@@ -340,6 +341,7 @@ FullList=Full liste
Statistics=Statistikk
OtherStatistics=Annen statistikk
Status=Status
+Favorite=Favorite
ShortInfo=Info.
Ref=Nummer
RefSupplier=Ref. leverandør
@@ -365,6 +367,7 @@ ActionsOnCompany=Handlinger ifm. denne tredjeparten
ActionsOnMember=Hendelser om dette medlemmet
NActions=%s handlinger
NActionsLate=%s forsinket
+RequestAlreadyDone=Request already recorded
Filter=Filter
RemoveFilter=Fjern filter
ChartGenerated=Graf opprettet
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Ekstra attributter oppsett
URLPhoto=Url av foto / logo
SetLinkToThirdParty=Lenke til en annen tredjepart
CreateDraft=Lag utkast
+SetToDraft=Back to draft
ClickToEdit=Klikk for å redigere
ObjectDeleted=Objekt %s slettet
ByCountry=Etter land
@@ -678,7 +682,7 @@ ViewPrivateNote=Vis notater
XMoreLines=%s linje(r) skjult
PublicUrl=Offentlig URL
AddBox=Add box
-
+SelectElementAndClickRefresh=Select an element and click Refresh
# Week day
Monday=Mandag
Tuesday=Tirsdag
diff --git a/htdocs/langs/nb_NO/margins.lang b/htdocs/langs/nb_NO/margins.lang
index 514969be2592f821c3a24ab33a84d1439e96b140..229f4c06a93376963d48c731694920bb2a5e9bfa 100644
--- a/htdocs/langs/nb_NO/margins.lang
+++ b/htdocs/langs/nb_NO/margins.lang
@@ -38,4 +38,7 @@ BuyingCost=Cost price
UnitCharges=Unit charges
Charges=Charges
AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/nb_NO/orders.lang b/htdocs/langs/nb_NO/orders.lang
index 7cfc760b57238872cf3de55e1bb2d7758b6b3b12..fc6372a3cf443a512146158e1b3f36bb7aedc74a 100644
--- a/htdocs/langs/nb_NO/orders.lang
+++ b/htdocs/langs/nb_NO/orders.lang
@@ -53,7 +53,7 @@ ShippingExist=En forsendelse eksisterer
DraftOrWaitingApproved=Utkast eller godkjent ennå ikke bestilt
DraftOrWaitingShipped=Utkast eller validert ennå ikke levert
MenuOrdersToBill=Ordre levert
-MenuOrdersToBill2=Ordrer å fakturere
+MenuOrdersToBill2=Billable orders
SearchOrder=Søk i ordre
SearchACustomerOrder=Søk etter kundeordre
ShipProduct=Lever produkt
@@ -65,7 +65,7 @@ ValidateOrder=Valider ordre
UnvalidateOrder=Devalider ordre
DeleteOrder=Slett ordre
CancelOrder=Avbryt ordre
-AddOrder=Legg til ordre
+AddOrder=Create order
AddToMyOrders=Legg til mine ordre
AddToOtherOrders=Lagg til andre ordre
AddToDraftOrders=Legg til ordreutkast
@@ -154,7 +154,6 @@ OrderByPhone=Telefon
CreateInvoiceForThisCustomer=Fakturer ordrer
NoOrdersToInvoice=Ingen fakturerbare ordrer
CloseProcessedOrdersAutomatically=Klassifiser alle valgte bestillinger "Behandlet".
-MenuOrdersToBill2=Ordrer å fakturere
OrderCreation=Opprett ordre
Ordered=Bestilt
OrderCreated=Din ordre har blitt opprettet
diff --git a/htdocs/langs/nb_NO/oscommerce.lang b/htdocs/langs/nb_NO/oscommerce.lang
deleted file mode 100644
index 49b04568b79e3f8cf1ce498ac7461890222a6873..0000000000000000000000000000000000000000
--- a/htdocs/langs/nb_NO/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=OS Commerce moduloppsett
-OSCommerceSetupSaved=OS Commerce innstillinger lagret
-OSCommerceServer=OS Commerce server host/ip
-OSCommerceDatabaseName=OS Commerce databasenavn
-OSCommercePrefix=OS Commerce tabellprefix
-OSCommerceUser=OS Commerce databaseinnlogging
diff --git a/htdocs/langs/nb_NO/other.lang b/htdocs/langs/nb_NO/other.lang
index 534b90ca9074dd4ccb7d753c3755c686ce4bf029..d634da4b41f5f3be11dec985e89a033faca8ff9c 100644
--- a/htdocs/langs/nb_NO/other.lang
+++ b/htdocs/langs/nb_NO/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=Sikkerhetskode
Calendar=Kalender
-AddTrip=Legg til reise
Tools=Verktøy
ToolsDesc=Dette området er dedikert til gruppen diverse verktøy ikke er tilgjengelig i andre menyen oppføringer. <br><br> Disse verktøyene kan nås fra menyen på siden.
Birthday=Fødselsdag
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation
Notify_TASK_CREATE=Task created
Notify_TASK_MODIFY=Task modified
Notify_TASK_DELETE=Task deleted
+SeeModuleSetup=See module setup
NbOfAttachedFiles=Antall vedlagte filer/dokumenter
TotalSizeOfAttachedFiles=Total størrelse på vedlagte filer/dokumenter
MaxSize=Maksimal størrelse
@@ -80,6 +80,16 @@ ModifiedBy=Endret av %s
ValidatedBy=Godkjent av %s
CanceledBy=Kansellert av %s
ClosedBy=Luket av %s
+CreatedById=User id who created
+ModifiedById=User id who made last change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made last change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
FileWasRemoved=Filen ble slettet
DirWasRemoved=Mappen ble slettet
FeatureNotYetAvailableShort=Tilgjengelig i en neste versjon
@@ -187,31 +197,32 @@ PleaseBePatient=Vær tålmodig ...
RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
NewKeyIs=This is your new keys to login
NewKeyWillBe=Your new key to login to software will be
-ClickHereToGoTo=Click here to go to %s
+ClickHereToGoTo=Klikk her for å gå til %s
YouMustClickToChange=You must however first click on the following link to validate this password change
ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
##### Calendar common #####
AddCalendarEntry=Legg oppføring til kalender %s
-NewCompanyToDolibarr=Firma %s lagt til Dolibarr
-ContractValidatedInDolibarr=Kontrakt %s godkjent i Dolibarr
-ContractCanceledInDolibarr=Kontrakt %s kansellert i Dolibarr
-ContractClosedInDolibarr=Kontrakt %s lukket i Dolibarr
-PropalClosedSignedInDolibarr=Tilbud %s signert i Dolibarr
-PropalClosedRefusedInDolibarr=Tilbud %s avvist i Dolibarr
-PropalValidatedInDolibarr=Tilbud %s godkjent i Dolibarr
-InvoiceValidatedInDolibarr=Faktura %s godkjent i Dolibarr
-InvoicePaidInDolibarr=Faktura %s satt til betalt i Dolibarr
-InvoiceCanceledInDolibarr=Faktura %s kansellert i Dolibarr
-PaymentDoneInDolibarr=Betaling %s utført i Dolibarr
-CustomerPaymentDoneInDolibarr=Kundebetaling %s utført i Dolibarr
-SupplierPaymentDoneInDolibarr=Leverandørbetaling %s utført i Dolibarr
-MemberValidatedInDolibarr=Medlem %s godkjent i Dolibarr
-MemberResiliatedInDolibarr=Medlem %s resiliated i Dolibarr
-MemberDeletedInDolibarr=Medlem %s slettet fra Dolibarr
-MemberSubscriptionAddedInDolibarr=Medlemskap for %s lagt til i Dolibarr
-ShipmentValidatedInDolibarr=Forsendelse %s validert i Dolibarr
-ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
##### Export #####
Export=Eksport
ExportsArea=Eksportområde
diff --git a/htdocs/langs/nb_NO/paybox.lang b/htdocs/langs/nb_NO/paybox.lang
index 64038c859f4190fcc1a39fe1b69daf0758e44766..0509a95252cb19350c8e771387f98994daaf7dae 100644
--- a/htdocs/langs/nb_NO/paybox.lang
+++ b/htdocs/langs/nb_NO/paybox.lang
@@ -32,6 +32,9 @@ VendorName=Navn på leverandøren
CSSUrlForPaymentForm=CSS-stilark url for betalingsformen
MessageOK=Melding på godkjent betaling retur siden
MessageKO=Melding om avbrutt betaling retur siden
-# NewPayboxPaymentReceived=New Paybox payment received
-# NewPayboxPaymentFailed=New Paybox payment tried but failed
-# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+NewPayboxPaymentReceived=New Paybox payment received
+NewPayboxPaymentFailed=New Paybox payment tried but failed
+PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/nb_NO/resource.lang b/htdocs/langs/nb_NO/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..d64075dfbf595897a63e3eebf19194d8f71030dd
--- /dev/null
+++ b/htdocs/langs/nb_NO/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
diff --git a/htdocs/langs/nb_NO/sendings.lang b/htdocs/langs/nb_NO/sendings.lang
index 0780ba80c9050b452449c44b17d42678753f3525..7c11ec56d1e6f690a75e77d149cf25c93575c063 100644
--- a/htdocs/langs/nb_NO/sendings.lang
+++ b/htdocs/langs/nb_NO/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=For øyeblikket er opprettelsen av en ny forsend
RelatedShippings=Related shippings
ShipmentLine=Shipment line
CarrierList=List of transporters
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
# Sending methods
SendingMethodCATCH=Catch av kunde
diff --git a/htdocs/langs/nb_NO/stocks.lang b/htdocs/langs/nb_NO/stocks.lang
index c6212a737930c12a87d78c03b00f34cdc483476f..401d409e0f12b7b73cebd739f89ecd18138ded0f 100644
--- a/htdocs/langs/nb_NO/stocks.lang
+++ b/htdocs/langs/nb_NO/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=du må angi en merkelapp for lageret
CorrectStock=Riktig beholdning
ListOfWarehouses=Oversikt over lagere
ListOfStockMovements=Oversikt over bevegelser
-StocksArea=Beholdningsområde
+StocksArea=Warehouses area
Location=Lokasjon
LocationSummary=Kort navn på lokasjon
NumberOfDifferentProducts=Number of different products
diff --git a/htdocs/langs/nb_NO/users.lang b/htdocs/langs/nb_NO/users.lang
index 7e2b96ec22608cf2327ad695842539ab396dbf60..f4a5d1800c3c5e590d69015935936f9431ea4a48 100644
--- a/htdocs/langs/nb_NO/users.lang
+++ b/htdocs/langs/nb_NO/users.lang
@@ -63,7 +63,6 @@ ShowGroup=Vis gruppe
ShowUser=Vis bruker
NonAffectedUsers=Ikke berørte brukere
UserModified=Brukeren er endret
-GroupModified=Gruppen er endret
PhotoFile=Bildefil
UserWithDolibarrAccess=Bruker med Dolibarrtilgang
ListOfUsersInGroup=Oversikt over brukere i denne gruppen
@@ -87,7 +86,7 @@ MyInformations=Mine data
ExportDataset_user_1=Dolibarr brukere og egenskaper
DomainUser=Domenebruker %s
Reactivate=Reaktiver
-CreateInternalUserDesc=This form allows you to create an user internal to your company/foundation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+CreateInternalUserDesc=Med dette skjemaet kan du opprette en intern bruker til din bedrift / stiftelse. For å lage en ekstern bruker (kunde, leverandør, osv), bruk knappen 'Lag Dolibarr bruker' fra tredjeparts kontaktkort
InternalExternalDesc=En <b>intern</b> bruker er er en som er en del av firmaet/organisasjonen.<br>En <b>ekstern</b> bruker er en kunde, leverandør eller annen tredjeperson.<br><br>I begge tilfelle styres brukeren av Dolibarr-rettigheter. Dessuten kan eksterne brukere ha en annen menybehandler enn interne brukere (Se Hjem - Instillinger - Visning)
PermissionInheritedFromAGroup=Rettigheter innvilget fordi de er arvet av en brukegruppe.
Inherited=Arvet
@@ -103,7 +102,7 @@ UserDisabled=Brukeren %s er deaktivert
UserEnabled=Brukeren %s er aktivert
UserDeleted=Brukeren %s er fjernet
NewGroupCreated=Gruppen %s er oprettet
-GroupModified=Gruppen er endret
+GroupModified=Group %s modified
GroupDeleted=Gruppen %s er fjernet
ConfirmCreateContact=Er du sikker på at du vil lage en Dolibarr-konto til denne kontaktpersonen?
ConfirmCreateLogin=Er du sikker på at du vil opprette en Dolibarr konto for medlemmet?
@@ -114,8 +113,10 @@ YourRole=Din roller
YourQuotaOfUsersIsReached=Din kvote på aktive brukere er nådd!
NbOfUsers=Nb av brukere
DontDowngradeSuperAdmin=Bare en superadmin kan nedgradere en superadmin
-HierarchicalResponsible=Hierarkisk ansvarlig
+HierarchicalResponsible=Veileder
HierarchicView=Hierarkisk visning
UseTypeFieldToChange=Bruk feltet Type til endring
OpenIDURL=OpenID URL
LoginUsingOpenID=Bruk OpenID til å logge inn
+WeeklyHours=Uketimer
+ColorUser=Color of the user
diff --git a/htdocs/langs/nb_NO/withdrawals.lang b/htdocs/langs/nb_NO/withdrawals.lang
index 0e67a922ea3f42c5d1fd4a377c66a4638d418310..92614725008fb0bf3805122ede40ab6cf94ae2fc 100644
--- a/htdocs/langs/nb_NO/withdrawals.lang
+++ b/htdocs/langs/nb_NO/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=Kvittering
LastWithdrawalReceipts=Siste %s kvitteringer
WithdrawedBills=Betalte fakturaer
WithdrawalsLines=Betalte linjer
-RequestStandingOrderToTreat=Vis utestående ordrer å behandle
-RequestStandingOrderTreated=Vis behandlede utestående ordre
+RequestStandingOrderToTreat=Request for standing orders to process
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=Utestående kundeordre
CustomerStandingOrder=Utestående kundeordre
NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
@@ -40,14 +41,13 @@ TransMetod=Metode Transmission
Send=Send
Lines=Linjer
StandingOrderReject=Utstede en avvise
-InvoiceRefused=Lad avvisningen til kunden
WithdrawalRefused=Uttak Refuseds
WithdrawalRefusedConfirm=Er du sikker på at du vil angi en tilbaketrekning avslag for samfunnet
RefusedData=Dato for avvisning
RefusedReason=Årsak til avslag
RefusedInvoicing=Fakturering avvisningen
NoInvoiceRefused=Ikke lad avvisningen
-InvoiceRefused=Lad avvisningen til kunden
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=Status
StatusUnknown=Ukjent
StatusWaiting=Venter
@@ -76,7 +76,7 @@ WithBankUsingRIB=For bankkontoer bruker RIB
WithBankUsingBANBIC=For bankkontoer bruker IBAN / BIC / SWIFT
BankToReceiveWithdraw=Bankkonto til å motta trekker seg
CreditDate=Kreditt på
-WithdrawalFileNotCapable=Kan ikke generere uttak kvittering fil for ditt land
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
ShowWithdraw=Vis Angrerett
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Men hvis faktura har minst én tilbaketrekning betaling ennå ikke behandlet, vil det ikke bli satt som utbetales å tillate å administrere uttak før.
DoStandingOrdersBeforePayments=Dette faner lar deg for å be om en stående ordre. Når det blir ferdig, kan du skrive inn betaling for å lukke fakturaen.
diff --git a/htdocs/langs/nl_BE/agenda.lang b/htdocs/langs/nl_BE/agenda.lang
index b15ab84156d6ea63c449da8dc21eccc0b8cdd4ff..77fadd7de2851dd78c6a5dc170d61e3c201a5532 100644
--- a/htdocs/langs/nl_BE/agenda.lang
+++ b/htdocs/langs/nl_BE/agenda.lang
@@ -20,4 +20,3 @@ AgendaUrlOptions1=U kan ook de volgende parameters toevoegen voor de uitkomst va
AgendaUrlOptions2=<b>login=%s</b> om de uitkomst van de acties te beperken: gemaakt door, beïnvloed door of gedaan door gebruiker <b>%s</b>
AgendaUrlOptions3=<b>logina=%s</b> om de uitkomst van de acties te beperken: gemaakt door gebruiker <b>%s</b>
AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions affected to user <b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> om de uitkomst van de acties te beperken: gedaan door gebruiker <b>%s</b>
diff --git a/htdocs/langs/nl_BE/bills.lang b/htdocs/langs/nl_BE/bills.lang
index 0b2f6cf3486d772cf917e83fbf99dd9cd6967f44..26c513c1640fe4d4d52989d2debe7d420652f9a0 100644
--- a/htdocs/langs/nl_BE/bills.lang
+++ b/htdocs/langs/nl_BE/bills.lang
@@ -65,7 +65,6 @@ ErrorInvoiceAvoirMustBeNegative=Fout, correctiefactuur moet een negatief bedrag
ErrorInvoiceOfThisTypeMustBePositive=Fout, dit type factuur moet een positief bedrag hebben
ErrorCantCancelIfReplacementInvoiceNotValidated=Fout, kan geen factuur annuleren die is vervangen door een andere factuur die nog in klad status is
BillTo=Aan
-Prélèvements=Domiciliëring
LastCustomersBills=Laatste %s facturen klanten
LastSuppliersBills=Laatste %s facturen leveranciers
DraftBills=Klad facturen
@@ -90,8 +89,6 @@ RemainderToPay=Rest te betalen
RemainderToTake=Rest te ontvangen
SendBillRef=Verstuur factuur %s
SendReminderBillRef=Verstuur factuur %s (herinnering)
-StandingOrders=Standing orders
-StandingOrder=Standing order
NoDraftBills=Geen klad facturen
NoOtherDraftBills=Geen andere klad facturen
RefBill=Factuur ref
@@ -102,7 +99,6 @@ RelatedCommercialProposals=Gerelateerde commerciële voorstellen
MenuToValid=Te valideren
SupplierBillsToPay=Te betalen leveranciers facturen
CustomerBillsUnpaid=Onbetaalde facturen klanten
-DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=Niet recupereerbaar
RepeatableInvoice=Herhaalbare factuur
RepeatableInvoices=Herhaalbare facturen
@@ -147,7 +143,6 @@ BankCode=Bank code
DeskCode=Desk code
Residence=Domiciliering
IBANNumber=IBAN nummer
-BIC=BIC/SWIFT
BICNumber=BIC/SWIFT nummer
RegulatedOn=Regulariseerd op
ChequeNumber=Cheque N°
diff --git a/htdocs/langs/nl_BE/contracts.lang b/htdocs/langs/nl_BE/contracts.lang
index a81cd5f1907971f6c6fb5a0e6f65136e1b8ad2f0..f61136619176d2b00498db62342a422ceab9ba81 100644
--- a/htdocs/langs/nl_BE/contracts.lang
+++ b/htdocs/langs/nl_BE/contracts.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Contracten gebied
ListOfContracts=Lijst van opdrachten
-LastContracts=Laatste %s bewerkte contracten
ContractCard=Contract kaart
ContractStatusDraft=Ontwerp
ServiceStatusLate=Actief, verstreken
@@ -24,6 +23,7 @@ ListOfServices=Lijst van diensten
ListOfRunningContractsLines=Lijst van lopende contract lijnen
ListOfRunningServices=Lijst van actieve diensten
NotActivatedServices=Niet geactiveerde diensten (onder gevalideerde contracten)
+LastContracts=Laatste %s bewerkte contracten
LastActivatedServices=Laatste %s geactiveerde diensten
EditServiceLine=Bewerken service lijn
DateEndReal=Werkelijke einddatum van de dienst
diff --git a/htdocs/langs/nl_BE/install.lang b/htdocs/langs/nl_BE/install.lang
index e8eb624bb3351fd53fb7088750e725fc192250d3..e768ee17942b7fe2e14e727544fb2d883c74daf6 100644
--- a/htdocs/langs/nl_BE/install.lang
+++ b/htdocs/langs/nl_BE/install.lang
@@ -33,7 +33,6 @@ DocumentsDirectory=Directorie om geüploade en gegenereerde documenten op te sla
DolibarrDatabase=Dolibarr Databank
ServerAddressDescription=Naam of IP-adres voor de database server, meestal "localhost" als database server wordt gehost op dezelfde server dan de web-server
ServerPortDescription=Database server poort. Leeg houden als onbekend.
-Login=Inloggen
AdminLogin=Login voor administrator van de Dolibarr database.
PasswordAgain=Bevestig uw wachtwoord een tweede keer
AdminPassword=Wachtwoord voor administrator van de Dolibarr database.
@@ -47,7 +46,6 @@ KeepEmptyIfNoPassword=Laat leeg als gebruiker geen wachtwoord heeft (dit vermijd
SaveConfigurationFile=Opslaan waarden
ConfigurationSaving=Configuratiebestand opslaan
ServerConnection=Server-verbinding
-DatabaseConnection=Database connectie
DatabaseCreation=Database creatie
UserCreation=Gebruiker creëren
CreateDatabaseObjects=Database-objecten creëren
diff --git a/htdocs/langs/nl_BE/main.lang b/htdocs/langs/nl_BE/main.lang
index 135b4dfe88b562a652368481c0e350934bcb5732..e417a4ffc0132ae3accfc193b2f2e1d23dcca6c6 100644
--- a/htdocs/langs/nl_BE/main.lang
+++ b/htdocs/langs/nl_BE/main.lang
@@ -43,8 +43,6 @@ ErrorConfigParameterNotDefined=Parameter <b>%s</b> is niet gedefinieerd binnen D
ErrorCantLoadUserFromDolibarrDatabase=Niet vinden van gebruiker <b>%s</b> in Dolibarr database.
ErrorNoVATRateDefinedForSellerCountry=Fout, geen BTW-tarieven voor land "%s".
ErrorFailedToSaveFile=Fout, mislukt om bestand op te slaan.
-ErrorOnlyPngJpgSupported=Fout, alleen .png en .jpg afbeeldingen worden ondersteund.
-ErrorImageFormatNotSupported=Uw PHP ondersteunt geen functies om foto's van dit formaat te converteren.
RecordSaved=Record opgeslagen
LevelOfFeature=Niveau van de functies
DefinedAndHasThisValue=Omschreven en heeft waarde van
diff --git a/htdocs/langs/nl_BE/oscommerce.lang b/htdocs/langs/nl_BE/oscommerce.lang
deleted file mode 100644
index 10e961b84a2e33e27bc3a973b39c00b910e78eb6..0000000000000000000000000000000000000000
--- a/htdocs/langs/nl_BE/oscommerce.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerceSetup=OSCommerce module setup
-OSCommerceSetupSaved=OSCommerce setup opgeslagen
-OSCommerceServer=OSCommerce server host / ip
diff --git a/htdocs/langs/nl_BE/other.lang b/htdocs/langs/nl_BE/other.lang
index b0d8934fcfca9e1958a718f69ff3af3fa1709f27..592c4f1547e8365a1c1772abde36052dbe235dd7 100644
--- a/htdocs/langs/nl_BE/other.lang
+++ b/htdocs/langs/nl_BE/other.lang
@@ -1,5 +1,4 @@
# Dolibarr language file - Source file is en_US - other
-AddTrip=Verplaatsing toevoegen
BirthdayDate=Datum verjaardag
Notify_FICHINTER_VALIDATE=Valideer interventie
Notify_BILL_VALIDATE=Valideer factuur
diff --git a/htdocs/langs/nl_BE/products.lang b/htdocs/langs/nl_BE/products.lang
index 12ac84fa17f77477e1389e7ca6b4ba64f6c3b6ba..74c92b411509a979e7df8201324eb7537ef6a85d 100644
--- a/htdocs/langs/nl_BE/products.lang
+++ b/htdocs/langs/nl_BE/products.lang
@@ -28,8 +28,6 @@ ProductStatusOnSellShort=In verkoop
ProductStatusNotOnSellShort=NIET in verkoop
UpdatePrice=Update prijs
PublicPrice=Openbare prijs
-ContractStatus=Contract status
-ContractStatusRunning=Actief
ContractStatusOnHold=In wacht
ContractStatusToRun=Een METTRE en service
ErrorProductBadRefOrLabel=Verkeerde waarde voor de referentie-of etiket.
@@ -40,10 +38,7 @@ ProductsArea=Producten gebied
ServicesArea=Diensten gebied
AddToMyProposals=Toevoegen aan mijn voorstellen
AddToOtherProposals=Toevoegen aan andere voorstellen
-AddPhoto=Foto toevoegen
-BuyingPrice=Aankoopprijs
SupplierCard=Leverancierskaart
-CommercialCard=Commerciële kaart
AllWays=Pad naar het vinden van uw product in voorraad
NoCat=Uw product is niet in elke categorie
BarCode=Barcode
@@ -67,8 +62,6 @@ ErrorAssociationIsFatherOfThis=Een van de geselecteerde product is ouder met hui
DeleteProduct=Het verwijderen van een product / dienst
ConfirmDeleteProduct=Weet u zeker dat u dit product/dienst wilt verwijderen?
ProductDeleted=Product / Dienst: %s geschrapt uit de database.
-DeletePicture=Verwijderen van een foto
-ConfirmDeletePicture=Weet u zeker dat u deze foto wilt verwijderen?
ExportDataset_produit_1=Producten en diensten
ConfirmDeleteProductLine=Weet u zeker dat u deze prodcutlijn wilt verwijderen?
NoProductMatching=Geen product / dienst voldoen aan uw criteria
diff --git a/htdocs/langs/nl_BE/users.lang b/htdocs/langs/nl_BE/users.lang
index 46b8398974f079a92723c73dd90252614f07614e..35f0e050fef97933eb13ce63147e03b053f9a34e 100644
--- a/htdocs/langs/nl_BE/users.lang
+++ b/htdocs/langs/nl_BE/users.lang
@@ -32,7 +32,6 @@ ConfirmSendNewPassword=Weet u zeker dat u een nieuw wachtwoord wilt genereren en
LoginNotDefined=Inloggen is niet gedefiniëerd.
NameNotDefined=Naam is niet gedefiniëerd.
ListOfUsers=Lijsten van gebruikers
-Administrator=De administrator
DefaultRights=Standaardtoestemmingen
DefaultRightsDesc=Definiëer hier standaardtoestemmingen die automatisch gegund zijn naar een nieuwe gecreëerde gebruiker.
LastName=Naam
@@ -40,7 +39,6 @@ PasswordChangeRequestSent=Verzoek om wachtwoord te wijzigen van <b>%s</b> naar <
MenuUsersAndGroups=Gebruikers en groepen
LastGroupsCreated=Laatste %s gemaakte groepen
LastUsersCreated=Laatste %s gebruikers gecreëerd
-GroupModified=Groep met succes gewijzigd
NoLogin=Geen login
CreateDolibarrLogin=Maak Dolibarr login
LoginAccountDisableInLdap=Account uitgeschakeld in het domein.
@@ -50,6 +48,7 @@ CreateInternalUserDesc=Dit formulier laat u toe om een interne gebruiker te make
InternalExternalDesc=Een <b>interne</b> gebruiker is een gebruiker die deel uitmaakt van uw bedrijf. <br> Een <b>externe</b> gebruiker is een klant, leverancier of andere. <br><br> In beide gevallen, machtigingen omschrijft de rechten op Dolibarr, ook externe gebruiker kan beschikken over een ander menu manager dan een interne gebruiker (Zie Home - Opstelling - Display)
PermissionInheritedFromAGroup=Toestemming verleend, omdat deze voort komt uit een bepaalde gebruikersgroep.
EventUserModified=Gebruiker %s bewerkt
+GroupModified=Groep met succes gewijzigd
ConfirmCreateThirdParty=Weet u zeker dat u een derde partij wilt maken voor dit lid?
LoginToCreate=Login te creëren
NameToCreate=Naam van derde partij te creëren
diff --git a/htdocs/langs/nl_BE/withdrawals.lang b/htdocs/langs/nl_BE/withdrawals.lang
index da1080465ba46bad13f86e08f2ac074dc075126d..8e0a46c000bdebfa0fdde552d8d905659688c9f4 100644
--- a/htdocs/langs/nl_BE/withdrawals.lang
+++ b/htdocs/langs/nl_BE/withdrawals.lang
@@ -2,8 +2,6 @@
StandingOrdersArea=Permanente opdrachten gebied
CustomersStandingOrdersArea=Klanten permanente opdrachten gebied
NewStandingOrder=Nieuwe doorlopende opdracht
-Withdrawals=Intrekkingen
-Withdrawal=Intrekking
WithdrawalsReceipts=Intrekking van aandelen
WithdrawalReceipt=Intrekking ontvangst
LastWithdrawalReceipts=Last %s intrekking van aandelen
diff --git a/htdocs/langs/nl_NL/accountancy.lang b/htdocs/langs/nl_NL/accountancy.lang
index 8cab9d2b651d75b0721d76fda619e2034e4509b4..39c2732ec29852cf93d41614ed1812c2a4c1ce4f 100644
--- a/htdocs/langs/nl_NL/accountancy.lang
+++ b/htdocs/langs/nl_NL/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts
Validate=Validate
Addanaccount=Add an accounting account
AccountAccounting=Accounting account
-Ventilation=Ventilation
+Ventilation=Breakdown
ToDispatch=To dispatch
Dispatched=Dispatched
-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
TradeMargin=Trade margin
Reports=Reports
ByCustomerInvoice=By invoices customers
@@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger
Bookkeeping=General ledger
AccountBalanceByMonth=Account balance by month
-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
Line=Line
CAHTF=Total purchase supplier HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice
IntoAccount=In the accounting account
Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
+VentilationAuto=Automatic breakdown
Processing=Processing
EndProcessing=The end of processing
@@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account
ACCOUNTING_SEPARATORCSV=Separator CSV
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
@@ -140,14 +140,14 @@ Active=Statement
NewFiscalYear=New fiscal year
-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
TotalVente=Total turnover HT
TotalMarge=Total sales margin
DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
ChangeAccount=Change the accounting account for lines selected by the account:
Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
@@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically
ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index fcf67430b1618ce9de497c0bc44711a04588e410..2594d6c0ff38a172a776bbcf034ae2b17c045fbf 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -437,8 +437,8 @@ Module52Name=Productenvoorraad
Module52Desc=Productenvoorraadbeheer
Module53Name=Diensten
Module53Desc=Dienstenbeheer
-Module54Name=Contracten
-Module54Desc=Contracten- en dienstenbeheer
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=Streepjescodes
Module55Desc=Streepjescodesbeheer
Module56Name=Telefonie
@@ -475,8 +475,8 @@ Module320Name=RSS-feeds
Module320Desc=Voeg een RSS feed toe in de informatieschermen van Dolibarr
Module330Name=Weblinks (Favouriete internetpagina's in het menu weergeven)
Module330Desc=weblinkbeheer
-Module400Name=Projecten
-Module400Desc=Projectenbeheer binnen andere modules
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=Webkalender
Module410Desc=Integratie van een webkalender
Module500Name=Bijzondere uitgaven (BTW, sociale lasten, dividenden)
@@ -484,7 +484,7 @@ Module500Desc=Beheer van diverse uitgaven, zoals belastingen, sociale bijdragen,
Module510Name=Salarissen
Module510Desc=Beheer van de werknemers salarissen en betalingen
Module600Name=Kennisgevingen
-Module600Desc=Stuur kennisgevingen per e-mail van sommige Dolibarr zakelijke gebeurtenisen naar contactpersonen van derde partijen
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Giften
Module700Desc=Donatiebeheer
Module1200Name=Mantis
@@ -514,16 +514,16 @@ Module5000Name=Multi-bedrijf
Module5000Desc=Hiermee kunt meerdere bedrijven beheren in Dolibarr
Module6000Name=Workflow
Module6000Desc=Workflow beheer
-Module20000Name=Verlof
-Module20000Desc=Aanmaken en opvolgen verlof werknemers.
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
Module39000Name=Product batch
Module39000Desc=Batch number, eat-by and sell-by date management on products
Module50000Name=Paybox
Module50000Desc=Module om een online betaling pagina te bieden door creditcard met Paybox
Module50100Name=Verkooppunt
Module50100Desc=Kassamodule
-Module50200Name= Paypal
-Module50200Desc= Module om een online betaling pagina te bieden per credit card met Paypal
+Module50200Name=Paypal
+Module50200Desc=Module om een online betaling pagina te bieden per credit card met Paypal
Module50400Name=Accounting (advanced)
Module50400Desc=Accounting management (double parties)
Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=Bekijk doorlopende opdrachten
Permission152=Creëer / bewerk een doorlopende opdracht verzoek
Permission153=Bekijk doorlopende opdracht ontvangsten
Permission154=Crediteren / afwijzen van uitstaande orderbonnen
-Permission161=Bekijk contracten
-Permission162=Creëren / wijzigen van opdrachten
-Permission163=Activeren van een dienst van een contract
-Permission164=Uitschakelen van een dienst van een contract
-Permission165=Verwijderen contracten
-Permission171=Bekijk verplaatsingen
-Permission172=Creëren / bewerken verplaatsingen
-Permission173=Verwijderen verplaatsingen
-Permission178=Exporteereer verplaatsingen
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Read trips and expenses (own and his subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
Permission180=Bekijk leveranciers
Permission181=Bekijk leverancier opdrachten
Permission182=Creëren / wijzigen leverancier opdrachten
@@ -671,7 +672,7 @@ Permission300=Bekijk streepjescodes
Permission301=Creëren / wijzigen streepjescodes
Permission302=Verwijderen streepjescodes
Permission311=Diensten inzien
-Permission312=Diensten aan het contract toevoegen
+Permission312=Assign service/subscription to contract
Permission331=Bekijk weblinks
Permission332=Creëren / wijzigen weblinks
Permission333=Verwijderen weblinks
@@ -701,8 +702,8 @@ Permission701=Bekijk donaties
Permission702=Creëren / wijzigen donaties
Permission703=Verwijderen donaties
Permission1001=Bekijk voorraden
-Permission1002=Creëren / wijzigen voorraden
-Permission1003=Verwijderen voorraden
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=Bekijk voorraadmutaties
Permission1005=Creëren / wijzigen voorraadmutaties
Permission1101=Bekijk levering opdrachten
@@ -1038,7 +1039,6 @@ YesInSummer=Ja in de zomer
OnlyFollowingModulesAreOpenedToExternalUsers=Let op, alleen volgende modules worden opengesteld voor externe gebruikers (ongeacht de rechten van zulke gebruikers):
SuhosinSessionEncrypt=Session storage encrypted by Suhosin
ConditionIsCurrently=Voorwaarde is momenteel %s
-TestNotPossibleWithCurrentBrowsers=Automatische detectie niet mogelijk
YouUseBestDriver=You use driver %s that is best driver available currently.
YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=Geef een boekhoudkundige code terug opgebouwd uit "401
ModuleCompanyCodePanicum=Geef een lege boekhoudkundige code terug.
ModuleCompanyCodeDigitaria=Boekhoudkundige-code is afhankelijk van derden code. De code bestaat uit het teken "C" in de eerste positie, gevolgd door de eerste 5 tekens van de derden code.
UseNotifications=Gebruik kennisgevingen
-NotificationsDesc=De e-mailkennisgevingenfunctionaliteit stelt u in staat om vooraf ingestelde automatisch e-mails naar derden te versturen.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
ModelModules=Documentensjablonen
DocumentModelOdt=Genereer documenten uit OpenDocuments sjablonen (. ODT of. ODS-bestanden voor OpenOffice, KOffice, TextEdit, ...)
WatermarkOnDraft=Watermerk op conceptdocumenten
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=Voeg mogelijke leverdatum toe
UseOptionLineIfNoQuantity=Product- / dienstregels met een waarde van 0 gebruiken
FreeLegalTextOnProposal=Vrije tekst op Offertes
WatermarkOnDraftProposal=Watermerk op ontwerp offertes (geen indien leeg)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=Opdrachtenbeheerinstellingen
OrdersNumberingModules=Opdrachtennummeringmodules
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Verberg de behandelde of geannuleerde orders in de lijst
ValidOrderAfterPropalClosed=Om de opdracht te valideren na sluiting van de offerte, maakt het mogelijk om (TODO franse vertaling erbij pakken)
FreeLegalTextOnOrders=Vrije tekst op opdrachten
WatermarkOnDraftOrders=Watermerk op ontwerp-orders (geen indien leeg)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
##### Clicktodial #####
ClickToDialSetup='Click-To-Dial' moduleinstellingen
ClickToDialUrlDesc=Aangeroepen URL wanneer er geklikt wordt op een telefoonicoontje. In de URL kunt u 'tags' gebruiken<br><b>__PHONETO__</b> zal vervangen worden met het telefoonnummer dat gebeld moet worden<br><b>__PHONEFROM__</b> zal worden vervangen met het telefoonnummer van de bellende persoon (uw telefoonnummer)<br><b>__LOGIN__</b> zal vervangen worden door uw 'Click-To-Dial'-accountgebruikersnaam (Zoals ingesteld op uw gebruikerskaartdetails<br><b>__PASS__</b> zal vervangen worden door uw "Click-To-Dial"-accountwachtwoord (Zoals ingesteld op uw gebruikerskaartdetails).
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=Interventienummeringsmodules
TemplatePDFInterventions=Interventiekaartdocumentensjablonen
WatermarkOnDraftInterventionCards=Watermerk op interventiekaart documenten (geen indien leeg)
##### Contracts #####
-ContractsSetup=Contracten module setup
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=Contracten nummering modules
TemplatePDFContracts=Modeldocumenten contracten
FreeLegalTextOnContracts=Vrije tekst op contracten
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
CacheByServer=Cache by server
CacheByClient=Cache by browser
CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Automatische detectie niet mogelijk
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=Productenmoduleinstellingen
ServiceSetup=Services module setup
@@ -1382,9 +1384,10 @@ MailingSetup=EMailingmoduleinstellingen
MailingEMailFrom=E-mailafzender (Van) voor e-mails die verstuurd worden door de EMailingmodule
MailingEMailError=Retoure-mailadres (Errors-to) voor e-mails met fouten
##### Notification #####
-NotificationSetup=Moduleinstellingen voor kennisgeving door e-mail
+NotificationSetup=EMail notification module setup
NotificationEMailFrom=E-mailafzender (van) voor e-mails die verstuurd worden voor kennisgevingen
-ListOfAvailableNotifications=Lijst van beschikbare meldingen (Deze lijst is afhankelijk van geactiveerde modules)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
##### Sendings #####
SendingsSetup=Verzendingsmoduleinstellingen
SendingsReceiptModel=Verzendontvangstsjabloon
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=Verbinding met de server '%s' en database '%s' met gebruiker '%
OSCommerceTestKo1=Verbinding met de server '%s' gelukt maar de database '%s' kon niet worden bereikt.
OSCommerceTestKo2=Verbinding met server '%s' met gebruiker '%s' mislukt.
##### Stock #####
-StockSetup=Vooraadmoduleinstellingen
-UserWarehouse=Gebruik persoonlijke voorraden van gebruiker
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=Menu verwijderd
TreeMenu=Menustructuur
@@ -1478,11 +1482,14 @@ ClickToDialDesc=Deze module maakt het mogelijk om een icoontje te tonen achter h
##### Point Of Sales (CashDesk) #####
CashDesk=Verkooppunten
CashDeskSetup=Verkooppuntenmoduleinstellingen
-CashDeskThirdPartyForSell=Algemene Klant te gebruiken bij verkopen
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Te gebruiken rekening voor ontvangst van contacte betalingen
CashDeskBankAccountForCheque= Te gebruiken rekening voor ontvangst van betalingen per cheque
CashDeskBankAccountForCB= Te gebruiken rekening voor ontvangst van betalingen per CreditCard
-CashDeskIdWareHouse=Te gebruiken magazijn voor verkopen
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Weblinkmoduleinstellingen
BookmarkDesc=Deze module maakt het u mogelijk 'weblinks' te beheren. U kunt ook verwijzingen naar elke Dolibarr pagina of externe website in uw linker menu zetten.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Verwijder het boekjaar
ConfirmDeleteFiscalYear=Weet u zeker dat u dit boekjaar wilt verwijderen?
Opened=Geopend
Closed=Gesloten
-
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
Format=Formaat
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
diff --git a/htdocs/langs/nl_NL/agenda.lang b/htdocs/langs/nl_NL/agenda.lang
index 057cd9bdb375fb524c0acaac164e8d74ef84e83c..8c50ac2720c095fcd6f434ef490b4e9c1f93f799 100644
--- a/htdocs/langs/nl_NL/agenda.lang
+++ b/htdocs/langs/nl_NL/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= Automatisch invullen van de agenda
AgendaAutoActionDesc= Stel hier de gebeurtenissen in waarvoor u wilt dat Dolibarr automatische een afspraak in de agenda creëert. Als er niets is aangevinkt (standaard), zullen alleen handmatige acties worden opgenomen in de agenda.
AgendaSetupOtherDesc= Op deze pagina kunt u andere instellingen van de agendamodule instellen.
AgendaExtSitesDesc=Op deze pagina kunt configureren externe agenda.
-ActionsEvents= Gebeurtenissen waarvoor Dolibarr automatisch een item zal maken in de agenda
-PropalValidatedInDolibarr= Voorstel %s gevalideerd
-InvoiceValidatedInDolibarr= Factuur %s gevalideerd
+ActionsEvents=Gebeurtenissen waarvoor Dolibarr automatisch een item zal maken in de agenda
+PropalValidatedInDolibarr=Voorstel %s gevalideerd
+InvoiceValidatedInDolibarr=Factuur %s gevalideerd
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=Factuur %s ga terug naar ontwerp van de status van
InvoiceDeleteDolibarr=Factuur %s verwijderd
OrderValidatedInDolibarr= Opdracht %s gevalideerd
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Bestel %s goedgekeurd
OrderRefusedInDolibarr=Order %s is geweigerd
OrderBackToDraftInDolibarr=Bestel %s terug te gaan naar ontwerp-status
OrderCanceledInDolibarr=Bestel %s geannuleerd
-InterventionValidatedInDolibarr=Interventie %s gevalideerd
ProposalSentByEMail=Offerte %s verzonden per e-mail
OrderSentByEMail=Afnemersopdracht %s verzonden per e-mail
InvoiceSentByEMail=Afnemersfactuur %s verzonden per e-mail
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=Leveranciersopdracht %s verzonden per e-mail
SupplierInvoiceSentByEMail=Leveranciersfactuur %s verzonden per e-mail
ShippingSentByEMail=Verzendkosten %s per e-mail
ShippingValidated= Verzending %s is gevalideerd
-InterventionSentByEMail=Interventie %s per e-mail
-InterventionClassifiedBilled=Interventie %s geclassificeerd als gefactureerd
NewCompanyToDolibarr= Derde aangemaakt
DateActionPlannedStart= Geplande startdatum
DateActionPlannedEnd= Geplande einddatum
@@ -70,9 +68,9 @@ DateActionStart= Startdatum
DateActionEnd= Einddatum
AgendaUrlOptions1=U kunt ook de volgende parameters gebruiken om te filteren:
AgendaUrlOptions2=<b>login=%s</b> om uitvoer van acties gecreëerd door, toegewezen aan of gedaan door gebruiker <b>%s</b> te beperken.
-AgendaUrlOptions3=<b>login=%s</b> om uitvoer van acties gecreëerd door gebruiker <b>%s</b> te beperken.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
AgendaUrlOptions4=<b>login=%s</b> om uitvoer van acties toegewezen aan gebruiker <b>%s</b> te beperken.
-AgendaUrlOptions5=<b>login=%s</b> om uitvoer van acties gedaan door gebruiker <b>%s</b> te beperken.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
AgendaShowBirthdayEvents=Toon verjaardagen van contacten
AgendaHideBirthdayEvents=Verberg verjaardagen van contacten
Busy=Bezig
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=URL aan. Ical bestand te openen
ExtSiteNoLabel=Geen omschrijving
WorkingTimeRange=Working time range
WorkingDaysRange=Working days range
-AddEvent=Add event
+AddEvent=Create event
MyAvailability=My availability
diff --git a/htdocs/langs/nl_NL/bills.lang b/htdocs/langs/nl_NL/bills.lang
index f6e7149a7d20db825b1d123aa5b696c5846d7ba9..2bd991f4276ba7c5f7ab2de74bc2c92565cb967a 100644
--- a/htdocs/langs/nl_NL/bills.lang
+++ b/htdocs/langs/nl_NL/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Creditnota
InvoiceAvoirAsk=Creditnota te corrigeren factuur
InvoiceAvoirDesc=De <b>creditnota</b> is een negatieve factuur die gebruikt wordt wanneer op een factuur het bedrag verschilt van het werkelijk betaalde bedrag (bijvoorbeeld omdat door de afnemer per abuis te veel is betaald of een aantal producten zijn geretouneerd).<br><br>Opmerking: de originele factuur moet worden gesloten (en geclassificeerd als zijnde 'betaald' of 'gedeeltelijk betaald') om een creditnota te kunnen aanmaken.
invoiceAvoirWithLines=Maak Credit Nota met lijnen van de oorsprongkelijke factuur
-invoiceAvoirWithPaymentRestAmount=Maak Creditnota met het bedrag oorspronkelijke factuur betaling
-invoiceAvoirLineWithPaymentRestAmount=Credit Nota bedrag van factuur betaling
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
ReplaceInvoice=Vervangen factuur %s
ReplacementInvoice=Vervangingsfactuur
ReplacedByInvoice=Vervangen door factuur %s
@@ -87,7 +87,7 @@ ClassifyCanceled=Classificeer 'verlaten'
ClassifyClosed=Classificeer 'Gesloten'
ClassifyUnBilled=Classify 'Unbilled'
CreateBill=Creëer Factuur
-AddBill=Toevoegen factuur of creditnota
+AddBill=Create invoice or credit note
AddToDraftInvoices=Toevoegen aan aanmaak factuur
DeleteBill=Verwijderen factuur
SearchACustomerInvoice=Zoek een afnemersfactuur
@@ -99,7 +99,7 @@ DoPaymentBack=Doe een terugbetaling
ConvertToReduc=Omzetten in een toekomstige korting
EnterPaymentReceivedFromCustomer=Voer een ontvangen betaling van afnemer in
EnterPaymentDueToCustomer=Voer een betaling te doen aan afnemer in
-DisabledBecauseRemainderToPayIsZero=Uitgeschakeld omdat restant te betalen gelijk is aan 0 (nul)
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
Amount=Hoeveelheid
PriceBase=Basisprijs
BillStatus=Factuurstatus
@@ -137,8 +137,6 @@ BillFrom=Van
BillTo=Geadresseerd aan
ActionsOnBill=Acties op factuur
NewBill=Nieuwe factuur
-Prélèvements=Doorlopende opdrachten
-Prélèvements=Doorlopende opdrachten
LastBills=Laatste %s facturen
LastCustomersBills=Laatste %s afnemersfacturen
LastSuppliersBills=Laatste %s leveranciersfacturen
@@ -156,9 +154,9 @@ ConfirmCancelBill=Weet u zeker dat u<b>factuur %s</b> wilt annuleren?
ConfirmCancelBillQuestion=Waarom zou u deze rekening als 'verlaten' willen classificeren ?
ConfirmClassifyPaidPartially=Weet u zeker dat u <b>factuur %s</b> naar status betaald wilt wijzigen?
ConfirmClassifyPaidPartiallyQuestion=Deze factuur is nog niet volledig betaald. Wat zijn redenen om deze factuur af te sluiten?
-ConfirmClassifyPaidPartiallyReasonAvoir=Restant te betalen <b>(%s %s)</b> wordt een korting toegekend, omdat de betaling werd gedaan vóór de termijn. Ik regulariseer de BTW met een creditnota.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Restant te betalen <b>(%s %s)</b> wordt een korting toegekend, omdat de betaling werd verricht vóór de termijn. Ik accepteer de verliezen van de BTW op deze korting.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Restant te betalen <b>(%s %s)</b> wordt een korting toegekend, omdat de betaling werd verricht vóór de termijn. Ik vorder de BTW terug van deze korting, zonder een credit nota.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
ConfirmClassifyPaidPartiallyReasonBadCustomer=Slechte afnemer
ConfirmClassifyPaidPartiallyReasonProductReturned=Producten gedeeltelijk teruggegeven
ConfirmClassifyPaidPartiallyReasonOther=Claim verlaten om andere redenen
@@ -191,9 +189,9 @@ AlreadyPaid=Reeds betaald
AlreadyPaidBack=Reeds terugbetaald
AlreadyPaidNoCreditNotesNoDeposits=Reeds betaald (zonder creditnota's en stortingen's)
Abandoned=Verlaten
-RemainderToPay=Nog te betalen
-RemainderToTake=Resterende deel te nemen
-RemainderToPayBack=Herinnering terugbetaling
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
Rest=Hangende
AmountExpected=Gevorderde bedrag
ExcessReceived=Overbetaling
@@ -219,19 +217,18 @@ NoInvoice=Geen factuur
ClassifyBill=Classifiseer factuur
SupplierBillsToPay=Te betalen leveranciersfacturen
CustomerBillsUnpaid=Onbetaalde afnemersfacturen
-DispenseMontantLettres=De schriftelijke facturen via mecanographic procedures zijn vrijgesteld voor de volgorde van letters
-DispenseMontantLettres=De schriftelijke facturen via mecanographic procedures zijn vrijgesteld voor de volgorde van letters
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=Niet-terugvorderbare
SetConditions=Stel betalingsvoorwaarden in
SetMode=Stel betalingswijze in
Billed=Gefactureerd
-RepeatableInvoice=Vooraf gedefinieerde factuur
-RepeatableInvoices=Vooraf gedefinieerde facturen
-Repeatable=Vooraf gedefinieerde
-Repeatables=Vooraf gedefinieerde
-ChangeIntoRepeatableInvoice=Omzetten in vooraf gedefinieerde
-CreateRepeatableInvoice=Creëer vooraf gedefinieerde factuur
-CreateFromRepeatableInvoice=Creëren van vooraf gedefinieerde factuur
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
CustomersInvoicesAndInvoiceLines=Afnemersfacturen en factuurregels
CustomersInvoicesAndPayments=Afnemersfacturen en betalingen
ExportDataset_invoice_1=Afnemersfacturen en factuurregels
diff --git a/htdocs/langs/nl_NL/categories.lang b/htdocs/langs/nl_NL/categories.lang
index 4ae5ae198e1e096ed80f15ca37f80cb17d6d4526..0ff141ea1edb6697525a1cd44f02ce9eda8df729 100644
--- a/htdocs/langs/nl_NL/categories.lang
+++ b/htdocs/langs/nl_NL/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Verbinding tussen leverancier en categorie
CatCusLinks=Verbinding tussen klant/prospect en categorie
CatProdLinks=Verbinding tussen producten/diensten en categorieën
CatMemberLinks=Verbinding tussen leden en categorieën
-CatProdLinks=Verbinding tussen producten/diensten en categorieën
-CatCusLinks=Verbinding tussen klant/prospect en categorie
-CatSupLinks=Verbinding tussen leverancier en categorie
DeleteFromCat=Verwijder uit categorie
DeletePicture=Afbeelding verwijderen
ConfirmDeletePicture=Bevestig verwijderen afbeelding
@@ -111,4 +108,5 @@ ExtraFieldsCategories=Complementaire kenmerken
CategoriesSetup=Opzetten categorieën
CategorieRecursiv=Automatisch linken met bovenliggende categorie
CategorieRecursivHelp=Indien geactiveerd zal het product ook gelinkt worden met de bovenliggende categorie wanneer een subcategorie toegevoegd wordt.
-AddProductServiceIntoCategory=Add the following product/service
+AddProductServiceIntoCategory=Voeg het volgende product/dienst toe
+ShowCategory=Show category
diff --git a/htdocs/langs/nl_NL/compta.lang b/htdocs/langs/nl_NL/compta.lang
index 09c4b6782fcc95645cc866618fc2a2c9d7a9ae29..66c85f33f0e70c47f649b97ad0d8970e5a2deb05 100644
--- a/htdocs/langs/nl_NL/compta.lang
+++ b/htdocs/langs/nl_NL/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Onjuiste boekhoudkundige afnemerscode voor %
SuppliersProductsSellSalesTurnover=De omzet gegenereerd door de verkoop van leveranciersproducten.
CheckReceipt=Controleer stortingen
CheckReceiptShort=Controleer stortingen
+LastCheckReceiptShort=Last %s check receipts
NewCheckReceipt=Nieuwe korting
NewCheckDeposit=Nieuwe chequestorting
NewCheckDepositOn=Creeer een kwitantie voor de storting op rekening: %s
diff --git a/htdocs/langs/nl_NL/contracts.lang b/htdocs/langs/nl_NL/contracts.lang
index d6f6de6bd0ab662767be3843a81f0abe799c9db7..5178ce872a366733bb8c16eb1671bf012f370c60 100644
--- a/htdocs/langs/nl_NL/contracts.lang
+++ b/htdocs/langs/nl_NL/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Contractenoverzicht
ListOfContracts=Contractenlijst
-LastContracts=Laatste % contracten
+LastModifiedContracts=Last %s modified contracts
AllContracts=Alle contracten
ContractCard=Contractendetails
ContractStatus=Contractstatus
@@ -27,7 +27,7 @@ MenuRunningServices=Actieve diensten
MenuExpiredServices=Verlopen diensten
MenuClosedServices=Gesloten diensten
NewContract=Nieuw contract
-AddContract=Contract toevoegen
+AddContract=Create contract
SearchAContract=Zoek een contract
DeleteAContract=Verwijder een contract
CloseAContract=Sluit een contract
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Lijst van de lopende contractregels
ListOfRunningServices=Lijst van lppende diensten
NotActivatedServices=Inactieve diensten (onder gevalideerde contracten)
BoardNotActivatedServices=Diensten te activeren onder gevalideerde contracten
-LastContracts=Laatste % contracten
+LastContracts=Last % contracts
LastActivatedServices=Laatste %s geactiveerd diensten
LastModifiedServices=Laatste %s bewerkte diensten
EditServiceLine=Bewerk dienstenregel
diff --git a/htdocs/langs/nl_NL/cron.lang b/htdocs/langs/nl_NL/cron.lang
index 4b1bcf235a9d13734112cfef55113a1a231286ab..2f63daa41a178e92aee928b70e3594eaf5106d91 100644
--- a/htdocs/langs/nl_NL/cron.lang
+++ b/htdocs/langs/nl_NL/cron.lang
@@ -1,114 +1,86 @@
# Dolibarr language file - Source file is en_US - cron
-#
# About page
-#
About = Over
-# CronAbout = About Cron
-# CronAboutPage = Cron about page
-
-#
+CronAbout = About Cron
+CronAboutPage = Cron about page
# Right
-#
-# Permission23101 = Read Scheduled task
-# Permission23102 = Create/update Scheduled task
-# Permission23103 = Delete Scheduled task
-# Permission23104 = Execute Scheduled task
-
-#
+Permission23101 = Read Scheduled task
+Permission23102 = Create/update Scheduled task
+Permission23103 = Delete Scheduled task
+Permission23104 = Execute Scheduled task
# Admin
-#
-# CronSetup= Scheduled job management setup
-# URLToLaunchCronJobs=URL to check and launch cron jobs if required
-# OrToLaunchASpecificJob=Or to check and launch a specific job
-# KeyForCronAccess=Security key for URL to launch cron jobs
-# FileToLaunchCronJobs=Command line to launch cron jobs
-# CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes
-# CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
-
-
-#
+CronSetup= Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch cron jobs if required
+OrToLaunchASpecificJob=Or to check and launch a specific job
+KeyForCronAccess=Security key for URL to launch cron jobs
+FileToLaunchCronJobs=Command line to launch cron jobs
+CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
# Menu
-#
-# CronJobs=Scheduled jobs
-# CronListActive= List of active jobs
-# CronListInactive= List of disabled jobs
-# CronListActive= List of active jobs
-
-
-#
+CronJobs=Scheduled jobs
+CronListActive=List of active/scheduled jobs
+CronListInactive=List of disabled jobs
# Page list
-#
-# CronDateLastRun=Last run
-# CronLastOutput=Last run output
-# CronLastResult=Last result code
-# CronListOfCronJobs=List of scheduled jobs
-# CronCommand=Command
-# CronList=Jobs list
-# CronDelete= Delete cron jobs
-# CronConfirmDelete= Are you sure you want to delete this cron job ?
-# CronExecute=Launch job
-# CronConfirmExecute= Are you sure to execute this job now
-# CronInfo= Jobs allow to execute task that have been planned
-# CronWaitingJobs=Wainting jobs
-# CronTask=Job
+CronDateLastRun=Last run
+CronLastOutput=Last run output
+CronLastResult=Last result code
+CronListOfCronJobs=List of scheduled jobs
+CronCommand=Command
+CronList=Jobs list
+CronDelete= Delete cron jobs
+CronConfirmDelete= Are you sure you want to delete this cron job ?
+CronExecute=Launch job
+CronConfirmExecute= Are you sure to execute this job now
+CronInfo= Jobs allow to execute task that have been planned
+CronWaitingJobs=Wainting jobs
+CronTask=Job
CronNone= Geen
CronDtStart=Begindatum
CronDtEnd=Einddatum
-# CronDtNextLaunch=Next execution
-# CronDtLastLaunch=Last execution
-# CronFrequency=Frequancy
-# CronClass=Classe
+CronDtNextLaunch=Next execution
+CronDtLastLaunch=Last execution
+CronFrequency=Frequancy
+CronClass=Classe
CronMethod=Methode
CronModule=Module
-# CronAction=Action
+CronAction=Action
CronStatus=Status
CronStatusActive=Ingeschakeld
CronStatusInactive=Uitgeschakeld
-# CronNoJobs=No jobs registered
+CronNoJobs=No jobs registered
CronPriority=Prioriteit
CronLabel=Beschrijving
-# CronNbRun=Nb. launch
-# CronEach=Every
-# JobFinished=Job launched and finished
-
-#
+CronNbRun=Nb. launch
+CronEach=Every
+JobFinished=Job launched and finished
#Page card
-#
-# CronAdd= Add jobs
-# CronHourStart= Start Hour and date of task
-# CronEvery= And execute task each
-# CronObject= Instance/Object to create
+CronAdd= Add jobs
+CronHourStart= Start Hour and date of task
+CronEvery= And execute task each
+CronObject= Instance/Object to create
CronArgs=Instellingen
-# CronSaveSucess=Save succesfully
+CronSaveSucess=Save succesfully
CronNote=Reactie
-# CronFieldMandatory=Fields %s is mandatory
-# CronErrEndDateStartDt=End date cannot be before start date
-# CronStatusActiveBtn=Enable
+CronFieldMandatory=Fields %s is mandatory
+CronErrEndDateStartDt=End date cannot be before start date
+CronStatusActiveBtn=Enable
CronStatusInactiveBtn=Deactiveren
-# CronTaskInactive=This job is disabled
-# CronDtLastResult=Last result date
-# CronId=Id
-# CronClassFile=Classes (filename.class.php)
-# CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-# CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-# CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-# CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is <i>fecth</i>
-# CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-# CronCommandHelp=The system command line to execute.
-
-#
+CronTaskInactive=This job is disabled
+CronDtLastResult=Last result date
+CronId=Id
+CronClassFile=Classes (filename.class.php)
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
+CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronCommandHelp=The system command line to execute.
# Info
-#
-# CronInfoPage=Information
-
-
-#
+CronInfoPage=Information
# Common
-#
-# CronType=Task type
-# CronType_method=Call method of a Dolibarr Class
-# CronType_command=Shell command
-# CronMenu=Cron
-# CronCannotLoadClass=Cannot load class %s or object %s
-
-# UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+CronType=Task type
+CronType_method=Call method of a Dolibarr Class
+CronType_command=Shell command
+CronMenu=Cron
+CronCannotLoadClass=Cannot load class %s or object %s
+UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
diff --git a/htdocs/langs/nl_NL/donations.lang b/htdocs/langs/nl_NL/donations.lang
index 549c18316821ab4695b047a87fa8117a8dbd0a36..c666ad40925c9494839c6c4caf3d48a6fee886de 100644
--- a/htdocs/langs/nl_NL/donations.lang
+++ b/htdocs/langs/nl_NL/donations.lang
@@ -4,7 +4,7 @@ Donations=Donaties
DonationRef=Gift ref.
Donor=Donor
Donors=Donoren
-AddDonation=Een donatie toevoegen
+AddDonation=Create a donation
NewDonation=Nieuwe donatie
ShowDonation=Toon gift
DonationPromise=Donatie toezegging
@@ -31,3 +31,8 @@ DonationRecipient=Gift ontvanger
ThankYou=Dank u
IConfirmDonationReception=De ontvanger verklaart ontvangst als gift van het volgende bedrag
MinimumAmount=Minimum amount is %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/nl_NL/externalsite.lang b/htdocs/langs/nl_NL/externalsite.lang
index 9fdddaacccffefaa04e0695391ab9f267c2b9c87..47a463d99cf9b088a2270f8a30576b7580f86473 100644
--- a/htdocs/langs/nl_NL/externalsite.lang
+++ b/htdocs/langs/nl_NL/externalsite.lang
@@ -2,3 +2,4 @@
ExternalSiteSetup=Setup link naar externe website
ExternalSiteURL=Externe Site URL
ExternalSiteModuleNotComplete=Module ExternalSite werd niet correct geconfigureerd.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/nl_NL/holiday.lang b/htdocs/langs/nl_NL/holiday.lang
index d2e65bbc92e9d594e219088fb696b8300e350181..7986b74bc44ee6950b1cfe7286aa169d587280be 100644
--- a/htdocs/langs/nl_NL/holiday.lang
+++ b/htdocs/langs/nl_NL/holiday.lang
@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
CantCreateCP=You don't have the right to make leave requests.
InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=Update
CantUpdate=You cannot update this leave request.
NoDateDebut=You must select a start date.
NoDateFin=You must select an end date.
-ErrorDureeCP=Your request for holidays does not contain working day.
-TitleValidCP=Approve the request holidays
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
ConfirmValidCP=Are you sure you want to approve the leave request?
DateValidCP=Date approved
TitleToValidCP=Send leave request
ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the request holidays
+TitleRefuseCP=Refuse the leave request
ConfirmRefuseCP=Are you sure you want to refuse the leave request?
NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
+TitleCancelCP=Cancel the leave request
ConfirmCancelCP=Are you sure you want to cancel the leave request?
DetailRefusCP=Reason for refusal
DateRefusCP=Date of refusal
@@ -78,7 +77,7 @@ ActionByCP=Performed by
UserUpdateCP=For the user
PrevSoldeCP=Previous Balance
NewSoldeCP=New Balance
-alreadyCPexist=A request for holidays has already been done on this period.
+alreadyCPexist=A leave request has already been done on this period.
UserName=Achternaam
Employee=Employee
FirstDayOfHoliday=First day of vacation
@@ -88,25 +87,25 @@ ManualUpdate=Manual update
HolidaysCancelation=Leave request cancelation
## Configuration du Module ##
-ConfCP=Configuration of holidays module
+ConfCP=Configuration of leave request module
DescOptionCP=Description of the option
ValueOptionCP=Waardering
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
UpdateConfCPOK=Updated successfully.
ErrorUpdateConfCP=An error occurred during the update, please try again.
-AddCPforUsers=Please add the balance of holidays of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
Module27130Name= Management of leave requests
Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
TitleOptionEventCP=Settings of leave requets for events
ValidEventCP=Valideer
UpdateEventCP=Update events
diff --git a/htdocs/langs/nl_NL/interventions.lang b/htdocs/langs/nl_NL/interventions.lang
index 54609061a5637b5ca20ab3a000e0bb8023a4e6fb..8a77c50fad0a255c60d0913645c5212205c53ee7 100644
--- a/htdocs/langs/nl_NL/interventions.lang
+++ b/htdocs/langs/nl_NL/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Interventie
Interventions=Interventies
InterventionCard=Interventiedetails
NewIntervention=Nieuwe interventie
-AddIntervention=Interventie toevoegen
+AddIntervention=Create intervention
ListOfInterventions=Interventielijst
EditIntervention=Interventie bewerken
ActionsOnFicheInter=Acties bij interventie
@@ -30,6 +30,15 @@ StatusInterInvoiced=Gefactureerd
RelatedInterventions=Interventies
ShowIntervention=Tonen tussenkomst
SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Vertegenwoordiger die de nabehandeling van de interventie doet
TypeContact_fichinter_internal_INTERVENING=Tussenliggende
diff --git a/htdocs/langs/nl_NL/mails.lang b/htdocs/langs/nl_NL/mails.lang
index 74c9d4dd34eac29c64fc16959e3402b0a76b4a86..cdd2ca5a1c3ce01505c5feb0ee02047d2d4cde10 100644
--- a/htdocs/langs/nl_NL/mails.lang
+++ b/htdocs/langs/nl_NL/mails.lang
@@ -115,7 +115,7 @@ SentBy=Verzonden door
MailingNeedCommand=Uit veiligheidsoverwegingen is het sturen van een e-mailing is beter wanneer deze wordt uitgevoerd vanaf de command line. Als je er een hebt, vraagt u uw serverbeheerder om de volgende opdracht te lanceren om de e-mailing sturen naar alle geadresseerden:
MailingNeedCommand2=U kunt ze echter online verzenden door toevoeging van de parameter MAILING_LIMIT_SENDBYWEB met een waarde van het maximaal aantal e-mails dat u wilt verzenden per sessie.
ConfirmSendingEmailing=Als u dit niet kunt of liever verzendt met uw webbrowser, bevestig dat u zeker weet dat u nu wilt de e-mails wilt verzenden vanuit je browser?
-LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=Lijst legen
ToClearAllRecipientsClickHere=Klik hier om de lijst met ontvangers van deze EMailing te legen
ToAddRecipientsChooseHere=Voeg geadresseerden toe door deze uit de lijst te kiezen
@@ -133,6 +133,9 @@ Notifications=Kennisgevingen
NoNotificationsWillBeSent=Er staan geen e-mailkennisgevingen gepland voor dit evenement en bedrijf
ANotificationsWillBeSent=1 kennisgeving zal per e-mail worden verzonden
SomeNotificationsWillBeSent=%s kennisgevingen zullen per e-mail worden verzonden
-AddNewNotification=Activeer een nieuw e-mailkennisgevingsverzoek
-ListOfActiveNotifications=Toon een lijst met alle actieve kennisgevingsverzoeken
+AddNewNotification=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
ListOfNotificationsDone=Toon een lijst van alle verzonden kennisgevingen
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index 6dcb56010e56dd37f49b7f655825c2951f60a23c..40ef7311c4bf50a14085ef536bed9e2354c385e1 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Kan <b>gebruiker %s</b> niet in de Dolibar
ErrorNoVATRateDefinedForSellerCountry=Fout, geen BTW-tarieven voor land '%s'.
ErrorNoSocialContributionForSellerCountry=Fout, geen sociale bijdrage gedefinieerd voor het land '%s'.
ErrorFailedToSaveFile=Fout, bestand opslaan mislukt.
-ErrorOnlyPngJpgSupported=Fout, alleen .png en .jpg-bestandsformaten worden ondersteund.
-ErrorImageFormatNotSupported=Uw PHP biedt geen ondersteuning om afbeeldingen met dit formaat te converteren
SetDate=Stel datum in
SelectDate=Selecteer een datum
SeeAlso=Zie ook %s
BackgroundColorByDefault=Standaard achtergrondkleur
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
FileWasNotUploaded=Een bestand is geselecteerd als bijlage, maar is nog niet geupload. Klik hiervoor op "Bevestig dit bestand".
NbOfEntries=Aantal invoeringen
GoToWikiHelpPage=Bekijk de online hulp (internettoegang vereist)
@@ -266,6 +266,7 @@ Afternoon=Namiddag
Quadri=Trimester
MonthOfDay=Maand van de dag
HourShort=U
+MinuteShort=mn
Rate=Tarief
UseLocalTax=Inclusief btw
Bytes=Bytes
@@ -340,6 +341,7 @@ FullList=Volledig overzicht
Statistics=Statistieken
OtherStatistics=Andere statistieken
Status=Status
+Favorite=Favorite
ShortInfo=Info.
Ref=Referentie
RefSupplier=Leverancierreferentie
@@ -365,6 +367,7 @@ ActionsOnCompany=Acties voor bedrijf
ActionsOnMember=Events over dit lid
NActions=%s acties
NActionsLate=%s is laat
+RequestAlreadyDone=Request already recorded
Filter=Filter
RemoveFilter=Verwijder filter
ChartGenerated=Grafiek gegenereerd
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Extra attributen instellen
URLPhoto=Url van foto / logo
SetLinkToThirdParty=Link naar een andere derde
CreateDraft=Maak een ontwerp
+SetToDraft=Back to draft
ClickToEdit=Klik om te bewerken
ObjectDeleted=Object %s verwijderd
ByCountry=Per land
@@ -678,7 +682,7 @@ ViewPrivateNote=Notities bekijken
XMoreLines=%s regel(s) verborgen
PublicUrl=Openbare URL
AddBox=Add box
-
+SelectElementAndClickRefresh=Select an element and click Refresh
# Week day
Monday=Maandag
Tuesday=Dinsdag
diff --git a/htdocs/langs/nl_NL/margins.lang b/htdocs/langs/nl_NL/margins.lang
index 406c5be4adf0c2243db97c84ceabfa2f0faf6c4a..6429b4ddca9cfcf6e1ec1d7e4a30fd8d4401b302 100644
--- a/htdocs/langs/nl_NL/margins.lang
+++ b/htdocs/langs/nl_NL/margins.lang
@@ -38,4 +38,7 @@ BuyingCost=Kostprijs
UnitCharges=Unit toeslag
Charges=Toeslag
AgentContactType=Contact type used voor commissie
-AgentContactTypeDetails=Definieer het contact type (gelinked op facturen) wordt geassocieerd met commercieel agent
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/nl_NL/orders.lang b/htdocs/langs/nl_NL/orders.lang
index 62f765a628b79eac7b5b608f34de955fae028311..56a94002352477b58c78b77f0759932af6306f50 100644
--- a/htdocs/langs/nl_NL/orders.lang
+++ b/htdocs/langs/nl_NL/orders.lang
@@ -53,7 +53,7 @@ ShippingExist=Een zending bestaat
DraftOrWaitingApproved=Concept of nog niet goedgekeurd
DraftOrWaitingShipped=Concept of nog niet verzonden
MenuOrdersToBill=Te factureren opdrachten
-MenuOrdersToBill2=Te factureren orders
+MenuOrdersToBill2=Billable orders
SearchOrder=Zoekopdracht
SearchACustomerOrder=Zoek een klant bestelling
ShipProduct=Verzend product
@@ -65,7 +65,7 @@ ValidateOrder=Valideer opdracht
UnvalidateOrder=Unvalidate order
DeleteOrder=Verwijder opdracht
CancelOrder=Annuleer opdracht
-AddOrder=Opdracht toevoegen
+AddOrder=Create order
AddToMyOrders=Toevoegen aan mijn opdrachten
AddToOtherOrders=Toevoegen aan andere opdrachten
AddToDraftOrders=Voeg toe aan order in aanmaak
@@ -154,7 +154,6 @@ OrderByPhone=Telefoon
CreateInvoiceForThisCustomer=Factureer orders
NoOrdersToInvoice=Geen te factureren orders
CloseProcessedOrdersAutomatically=Alle geselecteerde orders zijn afgehandeld
-MenuOrdersToBill2=Te factureren orders
OrderCreation=Order aanmaak
Ordered=Besteld
OrderCreated=Je order is aangemaakt
diff --git a/htdocs/langs/nl_NL/oscommerce.lang b/htdocs/langs/nl_NL/oscommerce.lang
deleted file mode 100644
index 1f74f362df8ce691595816213c907abc4f299488..0000000000000000000000000000000000000000
--- a/htdocs/langs/nl_NL/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=OSCommerce module instellen
-OSCommerceSetupSaved=OSCommerce instellingen opgeslagen
-OSCommerceServer=OSCommerce server host / IP
-OSCommerceDatabaseName=OSCommerce databasenaam
-OSCommercePrefix=OSCommerce tabellen voorvoegsel
-OSCommerceUser=OSCommerce database login
diff --git a/htdocs/langs/nl_NL/other.lang b/htdocs/langs/nl_NL/other.lang
index c39446cdb387430844844433dfa9c82cf9357cff..ff034237d4b70a1fe306c57d01f24f752b3bae8d 100644
--- a/htdocs/langs/nl_NL/other.lang
+++ b/htdocs/langs/nl_NL/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=Beveiligingscode
Calendar=Kalender
-AddTrip=Reis toevoegen
Tools=Gereedschap
ToolsDesc=Dit gebied is gewijd aan de groep diverse tools niet beschikbaar zijn in andere menu-items. <br><br> Deze tools kan worden bereikt vanuit het menu aan de zijkant.
Birthday=Verjaardag
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Creatie project
Notify_TASK_CREATE=Taak gemaakt
Notify_TASK_MODIFY=Taak gewijzigd
Notify_TASK_DELETE=Taak verwijderd
+SeeModuleSetup=See module setup
NbOfAttachedFiles=Aantal bijgevoegde bestanden / documenten
TotalSizeOfAttachedFiles=Totale omvang van de bijgevoegde bestanden / documenten
MaxSize=Maximale grootte
@@ -80,6 +80,16 @@ ModifiedBy=Gewijzigd door %s
ValidatedBy=Gevalideerd door %s
CanceledBy=Geannuleerd door %s
ClosedBy=Gesloten door %s
+CreatedById=User id who created
+ModifiedById=User id who made last change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made last change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
FileWasRemoved=Bestand %s is verwijderd
DirWasRemoved=Map %s is verwijderd
FeatureNotYetAvailableShort=Beschikbaar in de volgende versie
@@ -193,25 +203,26 @@ ForgetIfNothing=Als u deze wijziging niet heeft aangevraagd, negeer deze e-mail.
##### Calendar common #####
AddCalendarEntry=Nieuwe vermelding in de agenda %s
-NewCompanyToDolibarr=Bedrijf %s toegevoegd in Dolibarr
-ContractValidatedInDolibarr=Contract %s is gevalideerd in Dolibarr
-ContractCanceledInDolibarr=Contract %s is geannuleerd in Dolibarr
-ContractClosedInDolibarr=Contract %s gesloten in Dolibarr
-PropalClosedSignedInDolibarr=Offerte %s is ondertekend in Dolibarr
-PropalClosedRefusedInDolibarr=Offerte %s is geweigerd Dolibarr
-PropalValidatedInDolibarr=Offerte %s is gevalideerd in Dolibarr
-InvoiceValidatedInDolibarr=Factuur %s is gevalideerd in Dolibarr
-InvoicePaidInDolibarr=Factuur %s gewijzigd in betaald in Dolibarr
-InvoiceCanceledInDolibarr=Factuur %s is geannuleerd in Dolibarr
-PaymentDoneInDolibarr=Betaling %s gedaan in Dolibarr
-CustomerPaymentDoneInDolibarr=Afnemersbetaling %s is verricht in Dolibarr
-SupplierPaymentDoneInDolibarr=Leverancier betaling %s is verricht in Dolibarr
-MemberValidatedInDolibarr=Lid %s is gevalideerd in Dolibarr
-MemberResiliatedInDolibarr=Lid %s is uitgeschreven in Dolibarr
-MemberDeletedInDolibarr=Lid %s verwijderd van Dolibarr
-MemberSubscriptionAddedInDolibarr=Abonnement voor lid %s toegevoegd in Dolibarr
-ShipmentValidatedInDolibarr=Verzending %s gevalideerd in Dolibarr
-ShipmentDeletedInDolibarr=Verzending %s verwijderd van Dolibarr
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
##### Export #####
Export=Export
ExportsArea=Uitvoeroverzicht
diff --git a/htdocs/langs/nl_NL/paybox.lang b/htdocs/langs/nl_NL/paybox.lang
index 1321b2ed02cdd1efd98c9a1f433db64745e3bdbe..1741d04d9310762515162a2dce58dee2d752686a 100644
--- a/htdocs/langs/nl_NL/paybox.lang
+++ b/htdocs/langs/nl_NL/paybox.lang
@@ -32,6 +32,9 @@ VendorName=Verkopersnaam
CSSUrlForPaymentForm=URL van het CSS-stijlbestand voor het betalingsformulier
MessageOK=Bericht opde bevestigingspagina van een gevalideerde betaling
MessageKO=Bericht op de bevestigingspagina van een geannuleerde betaling
-# NewPayboxPaymentReceived=New Paybox payment received
-# NewPayboxPaymentFailed=New Paybox payment tried but failed
-# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+NewPayboxPaymentReceived=New Paybox payment received
+NewPayboxPaymentFailed=New Paybox payment tried but failed
+PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/nl_NL/resource.lang b/htdocs/langs/nl_NL/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..ead6e558dd858c96ce59c228b758260ed8ac01ee
--- /dev/null
+++ b/htdocs/langs/nl_NL/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=Nieuwe resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Verwijder resource
+ConfirmDeleteResourceElement=Bevestig het verwijderen van de resource voor dit element
+NoResourceInDatabase=Geen resource in de database
+NoResourceLinked=Geen gelinkte resource
+
+ResourcePageIndex=Resource lijst
+ResourceSingular=Resource
+ResourceCard=Resource kaart
+AddResource=Creeer een resource
+ResourceFormLabel_ref=Resource naam
+ResourceType=Resource type
+ResourceFormLabel_description=Resource beschrijving
+
+ResourcesLinkedToElement=Resources gekoppeld aan element
+
+ShowResourcePlanning=Toon resource planning
+GotoDate=Ga naar datum
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource met succes gecreeerd
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource met succes gekoppeld
+
+TitleResourceCard=Resource kaart
+ConfirmDeleteResource=Bevestig verwijderen van deze resource
+RessourceSuccessfullyDeleted=Resource met succes verwijderd
+DictionaryResourceType=Type resources
+
+DictionaryEMailTemplates=E-mail modellen
+
+SelectResource=Kies resource
diff --git a/htdocs/langs/nl_NL/sendings.lang b/htdocs/langs/nl_NL/sendings.lang
index eb293581bbfcd3dea2c995141454ca71f992b2f5..bf423135d82166315419f1cfcaa79aaec88103ba 100644
--- a/htdocs/langs/nl_NL/sendings.lang
+++ b/htdocs/langs/nl_NL/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=Op dit moment, is oprichting van een nieuwe zend
RelatedShippings=Aanverwante verzendingen
ShipmentLine=Verzendingslijn
CarrierList=Lijst van transporteurs
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
# Sending methods
SendingMethodCATCH=Afhalen door de afnemer
diff --git a/htdocs/langs/nl_NL/stocks.lang b/htdocs/langs/nl_NL/stocks.lang
index 87fe47e9f56f64d9fe87c84bb2bae0750bbb87f9..f72c7aa88a7fcdacc9322b0e27deb6f49cf1cfbf 100644
--- a/htdocs/langs/nl_NL/stocks.lang
+++ b/htdocs/langs/nl_NL/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Magazijnlable is vereist
CorrectStock=Corrigeer voorraad
ListOfWarehouses=Magazijnenlijst
ListOfStockMovements=Voorraadmutatielijst
-StocksArea=Voorradenoverzicht
+StocksArea=Warehouses area
Location=Locatie
LocationSummary=Korte naam locatie
NumberOfDifferentProducts=Aantal verschillende producten
diff --git a/htdocs/langs/nl_NL/users.lang b/htdocs/langs/nl_NL/users.lang
index 169c8dd231cbcb08116e67f46d8e4d97b996c2d1..4b3028ac6f5c1a1bde20ef7067d70d1283b8ae47 100644
--- a/htdocs/langs/nl_NL/users.lang
+++ b/htdocs/langs/nl_NL/users.lang
@@ -63,7 +63,6 @@ ShowGroup=Toon groep
ShowUser=Toon gebruiker
NonAffectedUsers=Niet betrokken gebruikers
UserModified=Gebruiker met succes gewijzigd
-GroupModified=Groep %s bewerkt
PhotoFile=Foto bestand
UserWithDolibarrAccess=Gebruiker met Dolibarr toegang
ListOfUsersInGroup=Lijst van gebruikers in deze groep
@@ -103,7 +102,7 @@ UserDisabled=Gebruiker %s uitgeschakeld
UserEnabled=Gebruiker %s geactiveerd
UserDeleted=Gebruiker %s verwijderd
NewGroupCreated=Groep %s gemaakt
-GroupModified=Groep %s bewerkt
+GroupModified=Group %s modified
GroupDeleted=Groep %s verwijderd
ConfirmCreateContact=Weet u zeker dat u een Dolibarr account wilt maken voor deze contactpersoon?
ConfirmCreateLogin=Weet u zeker dat u een Dolibarr account wilt maken voor dit lid?
@@ -114,8 +113,10 @@ YourRole=Uw rollen
YourQuotaOfUsersIsReached=Uw quotum van actieve gebruikers is bereikt!
NbOfUsers=Nb van gebruikers
DontDowngradeSuperAdmin=Alleen een superadmin kan downgrade een superadmin
-HierarchicalResponsible=Overste
+HierarchicalResponsible=Supervisor
HierarchicView=Hiërarchisch schema
UseTypeFieldToChange=Gebruik het veld Type om te veranderen
OpenIDURL=OpenID URL
LoginUsingOpenID=Gebruik OpenID om in te loggen
+WeeklyHours=Weekly hours
+ColorUser=Color of the user
diff --git a/htdocs/langs/nl_NL/withdrawals.lang b/htdocs/langs/nl_NL/withdrawals.lang
index ca843a161adec6a34b4967b2502a701a091e040a..152e287db166c2e106280e82971fe75fe02dcc5e 100644
--- a/htdocs/langs/nl_NL/withdrawals.lang
+++ b/htdocs/langs/nl_NL/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=Ontvangst
LastWithdrawalReceipts=Laatste %s terugname ontvangsten
WithdrawedBills=Ingetrokken facturen
WithdrawalsLines=Ingetrokken regels
-RequestStandingOrderToTreat=Verzoek om periodieke overboeking te behandelen
-RequestStandingOrderTreated=Verzoek om behandelde periodieke overboeking
+RequestStandingOrderToTreat=Request for standing orders to process
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=Periodieke overboekingen van afnemer
CustomerStandingOrder=Periodieke overboeking van afnemer
NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
@@ -40,14 +41,13 @@ TransMetod=Transmissiewijze
Send=Verzenden
Lines=Regels
StandingOrderReject=Geef een afwijzing
-InvoiceRefused=Factureer de afwijzing aan de afnemer
WithdrawalRefused=Intrekking afwijzigingen
WithdrawalRefusedConfirm=Weet u zeker dat u een intrekkingsafwijzing wilt invoeren
RefusedData=Datum van de afwijzing
RefusedReason=Reden voor afwijzing
RefusedInvoicing=Facturering van de afwijzing
NoInvoiceRefused=Factureer de afwijzing niet
-InvoiceRefused=Factureer de afwijzing aan de afnemer
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=Status
StatusUnknown=Onbekend
StatusWaiting=Wachtend
@@ -76,7 +76,7 @@ WithBankUsingRIB=Voor bankrekeningen die gebruik maken van RIB
WithBankUsingBANBIC=Voor bankrekeningen die gebruik maken van IBAN / BIC / SWIFT
BankToReceiveWithdraw=Informatie over uw bankrekening waarop intrekkingen moeten worden ontvangen
CreditDate=Crediteer op
-WithdrawalFileNotCapable=Kon geen intrekkingsbewijsbestand creëren voor uw land
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
ShowWithdraw=Toon intrekking
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Echter, als factuur is ten minste een terugtrekking betaling nog niet verwerkt, zal het niet worden ingesteld als betaald om tot terugtrekking te beheren voor.
DoStandingOrdersBeforePayments=Deze tabs kunt u aanvraag voor een permanente opdracht. Zodra het zal worden afgewerkt, kunt u de betaling aan de factuur te sluiten.
diff --git a/htdocs/langs/pl_PL/accountancy.lang b/htdocs/langs/pl_PL/accountancy.lang
index 8cab9d2b651d75b0721d76fda619e2034e4509b4..39c2732ec29852cf93d41614ed1812c2a4c1ce4f 100644
--- a/htdocs/langs/pl_PL/accountancy.lang
+++ b/htdocs/langs/pl_PL/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts
Validate=Validate
Addanaccount=Add an accounting account
AccountAccounting=Accounting account
-Ventilation=Ventilation
+Ventilation=Breakdown
ToDispatch=To dispatch
Dispatched=Dispatched
-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
TradeMargin=Trade margin
Reports=Reports
ByCustomerInvoice=By invoices customers
@@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger
Bookkeeping=General ledger
AccountBalanceByMonth=Account balance by month
-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
Line=Line
CAHTF=Total purchase supplier HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice
IntoAccount=In the accounting account
Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
+VentilationAuto=Automatic breakdown
Processing=Processing
EndProcessing=The end of processing
@@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account
ACCOUNTING_SEPARATORCSV=Separator CSV
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
@@ -140,14 +140,14 @@ Active=Statement
NewFiscalYear=New fiscal year
-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
TotalVente=Total turnover HT
TotalMarge=Total sales margin
DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
ChangeAccount=Change the accounting account for lines selected by the account:
Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
@@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically
ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index ccd8fa8bdd77efbddf636a0eacaa67f5a9c6f43f..359ed17411320335f424c84d0d0f750a17f1bd47 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -437,8 +437,8 @@ Module52Name=Zapasy
Module52Desc=Zapasy zarządzania produktów
Module53Name=Usługi
Module53Desc=Usługi zarządzania
-Module54Name=Kontrakty
-Module54Desc=Zamówienia i usług zarządzania
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=Kody kreskowe
Module55Desc=Kody kreskowe zarządzania
Module56Name=Telefonia
@@ -475,8 +475,8 @@ Module320Name=RSS Feed
Module320Desc=Dodaj kanał RSS Dolibarr wewnątrz ekranu stron
Module330Name=Zakładki
Module330Desc=Zakładki zarządzania
-Module400Name=Projekty
-Module400Desc=Projekty zarządzania wewnątrz inne moduły
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=Webcalendar
Module410Desc=Webcalendar integracji
Module500Name=Special expenses (tax, social contributions, dividends)
@@ -484,7 +484,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di
Module510Name=Salaries
Module510Desc=Management of employees salaries and payments
Module600Name=Powiadomienia
-Module600Desc=Wyślij powiadomienia (przez e-mail) na Dolibarr działalności wydarzenia
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Darowizny
Module700Desc=Darowizny zarządzania
Module1200Name=Mantis
@@ -514,16 +514,16 @@ Module5000Name=Multi-firma
Module5000Desc=Pozwala na zarządzanie wieloma firmami
Module6000Name=Workflow
Module6000Desc=Workflow management
-Module20000Name=Holidays
-Module20000Desc=Declare and follow employees holidays
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
Module39000Name=Product batch
Module39000Desc=Batch number, eat-by and sell-by date management on products
Module50000Name=Paybox
Module50000Desc=Moduł oferują online strony płatności za pomocą karty kredytowej z Paybox
Module50100Name=Kasa
Module50100Desc=Kasa modułu
-Module50200Name= Paypal
-Module50200Desc= Moduł oferują online strony płatności za pomocą karty kredytowej z Paypal
+Module50200Name=Paypal
+Module50200Desc=Moduł oferują online strony płatności za pomocą karty kredytowej z Paypal
Module50400Name=Accounting (advanced)
Module50400Desc=Accounting management (double parties)
Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=Czytaj stałych zleceń
Permission152=Instalacji stałych zleceń
Permission153=Czytaj zlecenia stałe wpływy
Permission154=Karta kredytowa / odmówić zleceń stałych wpływów
-Permission161=Czytaj umów
-Permission162=Tworzenie / zmodyfikować umowy
-Permission163=Aktywacja usługi na podstawie umowy
-Permission164=Wyłączenie usługi na podstawie umowy
-Permission165=Usuń umów
-Permission171=Czytaj wycieczki
-Permission172=Tworzenie / zmodyfikować wycieczki
-Permission173=Usuń wycieczki
-Permission178=Eksport wycieczki
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Read trips and expenses (own and his subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
Permission180=Czytaj dostawców
Permission181=Czytaj dostawcy zamówienia
Permission182=Tworzenie / zmodyfikować dostawcy zamówienia
@@ -671,7 +672,7 @@ Permission300=Odczyt kodów kreskowych
Permission301=Tworzenie / modyfikować kody kreskowe
Permission302=Usuwanie kodów kreskowych
Permission311=Czytaj usług
-Permission312=Przypisz usługę umowy
+Permission312=Assign service/subscription to contract
Permission331=Czytaj zakładek
Permission332=Utwórz / Modyfikuj zakładki
Permission333=Usuwanie zakładki
@@ -701,8 +702,8 @@ Permission701=Czytaj darowizn
Permission702=Tworzenie / zmodyfikować darowizn
Permission703=Usuń darowizn
Permission1001=Czytaj zapasów
-Permission1002=Tworzenie / zmodyfikować zapasów
-Permission1003=Usuń zapasów
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=Czytaj stanie ruchów
Permission1005=Tworzenie / zmodyfikować stanie ruchów
Permission1101=Przeczytaj zamówienia na dostawy
@@ -1038,7 +1039,6 @@ YesInSummer=Yes in summer
OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
SuhosinSessionEncrypt=Session storage encrypted by Suhosin
ConditionIsCurrently=Condition is currently %s
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
YouUseBestDriver=You use driver %s that is best driver available currently.
YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=Zwrócić rachunkowych kod zbudowany przez %s, a nast
ModuleCompanyCodePanicum=Wróć pusty rachunkowych kodu.
ModuleCompanyCodeDigitaria=Księgowość kod zależy od trzeciej kodu. Kod składa się z charakterem "C" na pierwszej pozycji, po którym następuje pierwsze 5 znaków w kodzie strony trzeciej.
UseNotifications=Użyj powiadomień
-NotificationsDesc=Powiadomienia umożliwia automatyczne cichu wysłać mail, w przypadku niektórych Dolibarr wydarzeń, do spółek, które są skonfigurowane do
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
ModelModules=Szablony dokumentów
DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
WatermarkOnDraft=Znak wodny w sprawie projektu dokumentu
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=Dodaj datę dostawy zdolność
UseOptionLineIfNoQuantity=Linia produktów / usług z zerową ilość jest traktowana jako opcja
FreeLegalTextOnProposal=Darmowy tekstu propozycji
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=Zamówienia zarządzania konfiguracją
OrdersNumberingModules=Zamówienia numeracji modules
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list
ValidOrderAfterPropalClosed=Aby zatwierdzić wniosek, aby po bliższa, umożliwia nie krok po tymczasowym porządku
FreeLegalTextOnOrders=Wolny tekst na zamówienie
WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
##### Clicktodial #####
ClickToDialSetup=Kliknij, aby Dial konfiguracji modułu
ClickToDialUrlDesc=Url called when a click on phone picto is done. Dans l'url, vous pouvez utiliser les balises<br><b>__PHONETO__</b> qui sera remplacé par le téléphone de l'appelé<br><b>__PHONEFROM__</b> qui sera remplacé par le téléphone de l'appelant (le votre)<br><b>__LOGIN__</b> qui sera remplacé par votre login clicktodial (défini sur votre fiche utilisateur)<br><b>__PASS__</b> qui sera remplacé par votre mot de passe clicktodial (défini sur votre fiche utilisateur).
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=Interwencja numeracji modules
TemplatePDFInterventions=Interwencja karty wzorów dokumentów
WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
##### Contracts #####
-ContractsSetup=Konfiguracja modułu umowy
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=Kontrakty numerowania modułów
TemplatePDFContracts=Contracts documents models
FreeLegalTextOnContracts=Free text on contracts
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
CacheByServer=Cache by server
CacheByClient=Cache by browser
CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=Produkty konfiguracji modułu
ServiceSetup=Konfiguracja modułu Usługi
@@ -1382,9 +1384,10 @@ MailingSetup=Moduł konfiguracji e-maila
MailingEMailFrom=Nadawca wiadomości e-mail (Z) na e-maile wysyłane przez e-maila modułu
MailingEMailError=Powrót e-mail (Errors-do) na e-maile z błędami
##### Notification #####
-NotificationSetup=Mailing konfiguracji modułu
+NotificationSetup=EMail notification module setup
NotificationEMailFrom=Nadawca wiadomości e-mail (Z) na e-maile wysyłane do powiadomień
-ListOfAvailableNotifications=Lista dostępnych powiadomień (Ta lista zależy od aktywowanych modułów)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
##### Sendings #####
SendingsSetup=Wysyłanie konfiguracji modułu
SendingsReceiptModel=Wysyłanie otrzymania modelu
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=Połączenie do serwera ' %s' w bazie danych " %s" z użytkowni
OSCommerceTestKo1=Połączenie do serwera ' %s' sukces, ale baza danych' %s' nie mógł zostać osiągnięty.
OSCommerceTestKo2=Połączenie do serwera ' %s' z użytkownika' %s' nie powiodło się.
##### Stock #####
-StockSetup=Konfiguracja modułu zapasów
-UserWarehouse=Wykorzystanie zasobów osobowych
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=Menu skreślony
TreeMenu=Drzewo menu
@@ -1478,11 +1482,14 @@ ClickToDialDesc=Moduł ten pozwala dodać ikonę po numer telefonu Dolibarr kont
##### Point Of Sales (CashDesk) #####
CashDesk=Punktów sprzedaży
CashDeskSetup=Kasa konfiguracji modułu
-CashDeskThirdPartyForSell=Generic trzeciej do używania na sprzedaż
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Środki pieniężne na rachunku do korzystania sprzedaje
CashDeskBankAccountForCheque= Chcesz używać do otrzymywania płatności w formie czeku
CashDeskBankAccountForCB= Chcesz używać do przyjmowania płatności gotówkowych za pomocą kart kredytowych
-CashDeskIdWareHouse=Datawarehous użytkownika na sprzedaż
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Zakładka konfiguracji modułu
BookmarkDesc=Moduł ten umożliwia zarządzanie zakładkami. Możesz także dodać skróty do jakichkolwiek Dolibarr strony lub stron internetowych externale po lewej stronie menu.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Delete fiscal year
ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
Opened=Opened
Closed=Closed
-
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
diff --git a/htdocs/langs/pl_PL/agenda.lang b/htdocs/langs/pl_PL/agenda.lang
index c21cd72a6dc13e3b238f8f1bcc559aa294fa4b10..773b9217b9507ccf5bf3d397e6615e67065fccbd 100644
--- a/htdocs/langs/pl_PL/agenda.lang
+++ b/htdocs/langs/pl_PL/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= Automatyczne wypełnianie
AgendaAutoActionDesc= Określ zdarzenia, dla których Dolibarr ma tworzyć automatycznie wpisy w agendzie. Jeżeli nie jest zaznaczone (domyślnie), w agendzie zostaną utworzone wpisy wyłącznie dla działań manualnych.
AgendaSetupOtherDesc= Ta strona zawiera opcje, pozwalające eksportować Twoje zdarzenia Dolibarr do zewnętrznego kalendarza (Thunderbird, Google Calendar, ...)
AgendaExtSitesDesc=Ta strona pozwala zdefiniować zewnętrzne źródła kalendarzy, aby zobaczyć uwzględnić zapisane tam zdarzenia w agendzie Dolibarr.
-ActionsEvents= Zdarzenia, dla których Dolibarr stworzy automatycznie zadania w agendzie
-PropalValidatedInDolibarr= Zatwierdzenie oferty %s
-InvoiceValidatedInDolibarr= Zatwierdzenie faktury %s
+ActionsEvents=Zdarzenia, dla których Dolibarr stworzy automatycznie zadania w agendzie
+PropalValidatedInDolibarr=Zatwierdzenie oferty %s
+InvoiceValidatedInDolibarr=Zatwierdzenie faktury %s
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=Zmiana statusu faktura %s na draft
InvoiceDeleteDolibarr=Usunięcie faktury %s
OrderValidatedInDolibarr= Zatwierdzenie zamówienia %s
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Akceptacja zamówienia %s
OrderRefusedInDolibarr=Order %s refused
OrderBackToDraftInDolibarr=Zmiana statusu zamówienia %s na draft
OrderCanceledInDolibarr=Anulowanie zamówienia %s
-InterventionValidatedInDolibarr=Zatwierdzenie Interwencji %s
ProposalSentByEMail=Oferta %s wysłana e-mailem
OrderSentByEMail=Zamówienie %s Klienta wysłane e-mailem
InvoiceSentByEMail=Faktura %s wysłana e-mailem
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=Zamówienie %s wysłane do dostawcy e-mailem
SupplierInvoiceSentByEMail=Faktura %s wysłana do dostawcy e-mailem
ShippingSentByEMail=Informacje o dostawie %s wysłane e-mailem
ShippingValidated= Shipping %s validated
-InterventionSentByEMail=%s interwencyjne wysłane pocztą
-InterventionClassifiedBilled=Intervention %s classified as Billed
NewCompanyToDolibarr= Stworzono kontrahenta
DateActionPlannedStart= Planowana data rozpoczęcia
DateActionPlannedEnd= Planowana data zakończenia
@@ -70,9 +68,9 @@ DateActionStart= Data rozpoczęcia
DateActionEnd= Data zakończenia
AgendaUrlOptions1=Możesz także dodać następujące parametry do filtr wyjściowy:
AgendaUrlOptions2=<b>login= %s,</b> aby ograniczyć wyjście do działań stworzonych lub przypisanych do <b>użytkownika %s.</b>
-AgendaUrlOptions3=<b>logina=<b>logina= %s,</b> aby ograniczyć wyjście do działań stworzonych przez użytkownika <b %s.</b>
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
AgendaUrlOptions4=<b>logint=%s,</b> aby ograniczyć wyjścia do działań przypisanych do użytkownika <b>%s.</b>
-AgendaUrlOptions5=<b>logind=%s,</b> aby ograniczyć wyjście do działań wykonanych przez użytkownika <b>%s.</b>
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
AgendaShowBirthdayEvents=Pokaż urodziny kontaktów
AgendaHideBirthdayEvents=Ukryj urodzin kontaktów
Busy=Zajęty
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=URL dostępu. Plik iCal
ExtSiteNoLabel=Brak opisu
WorkingTimeRange=Working time range
WorkingDaysRange=Working days range
-AddEvent=Add event
+AddEvent=Create event
MyAvailability=My availability
diff --git a/htdocs/langs/pl_PL/bills.lang b/htdocs/langs/pl_PL/bills.lang
index 4fa8baee43aceb216749092e12e831a8180d27de..cf049d56d8ef09edf58fe3f6c5913fb71b9de613 100644
--- a/htdocs/langs/pl_PL/bills.lang
+++ b/htdocs/langs/pl_PL/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Nota kredytowa
InvoiceAvoirAsk=Kredyt notatkę do skorygowania faktury
InvoiceAvoirDesc=<b>Kredyt notatka</b> jest negatywny faktury wykorzystane do rozwiązania, że na fakturze jest kwota, która różni się od kwoty faktycznie wypłacana (ponieważ klient wypłacana przez pomyłkę zbyt dużo, albo nie będzie wypłacana w całości, ponieważ wrócił niektórych produktów na przykład). <br><br> Uwaga: oryginał faktury musi być już zamknięta ( "wypłata" lub "częściowo wypłacana") w celu umożliwienia stworzenia kredytowej notatkę na jej temat.
invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
-invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
ReplaceInvoice=Wymień faktury %s
ReplacementInvoice=Zastąpienie faktury
ReplacedByInvoice=Otrzymuje fakturę %s
@@ -87,7 +87,7 @@ ClassifyCanceled=Klasyfikacji "Abandoned"
ClassifyClosed=Klasyfikacja "zamkniętych"
ClassifyUnBilled=Classify 'Unbilled'
CreateBill=Utwórz fakturę
-AddBill=Dodaj faktury lub noty uznaniowej
+AddBill=Create invoice or credit note
AddToDraftInvoices=Add to draft invoice
DeleteBill=Usuń faktury
SearchACustomerInvoice=Szukaj klienta faktury
@@ -99,7 +99,7 @@ DoPaymentBack=Czy płatności powrót
ConvertToReduc=Konwersja w przyszłości rabatu
EnterPaymentReceivedFromCustomer=Wprowadź płatności otrzymanych od klienta
EnterPaymentDueToCustomer=Dokonaj płatności do klienta
-DisabledBecauseRemainderToPayIsZero=Niepełnosprawnych, ponieważ pozostały do zapłaty wynosi zero
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
Amount=Ilość
PriceBase=Cena podstawy
BillStatus=Faktura statusu
@@ -137,8 +137,6 @@ BillFrom=Od
BillTo=Bill do
ActionsOnBill=Działania na fakturze
NewBill=Nowe faktury
-Prélèvements=Zlecenie stałe
-Prélèvements=Zlecenie stałe
LastBills=Ostatnia %s faktur
LastCustomersBills=Ostatnia %s odbiorców faktur
LastSuppliersBills=Ostatnia %s dostawców faktur
@@ -156,9 +154,9 @@ ConfirmCancelBill=Czy na pewno chcesz anulować <b>fakturę %s?</b>
ConfirmCancelBillQuestion=Dlaczego chcesz zaklasyfikować tę fakturę "opuszczonych"?
ConfirmClassifyPaidPartially=Czy na pewno chcesz zmienić <b>fakturę %s</b> do statusu wypłatę?
ConfirmClassifyPaidPartiallyQuestion=Niniejsza faktura nie została całkowicie wypłacana. Jakie są powody, aby zamknąć tę fakturę?
-ConfirmClassifyPaidPartiallyReasonAvoir=Pozostająca do zapłaty <b>( %s %s)</b> jest zniżka przyznane płatności, ponieważ został złożony przed terminem. I uregulowania podatku VAT z kredytu notatkę.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Pozostająca do zapłaty <b>( %s %s)</b> jest zniżka przyznane płatności, ponieważ został złożony przed terminem. Przyjmuję do stracenia VAT na ten rabat.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Pozostająca do zapłaty <b>( %s %s)</b> jest zniżka przyznane płatności, ponieważ został złożony przed terminem. Odzyskać VAT od tej zniżki bez kredytu notatkę.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad klienta
ConfirmClassifyPaidPartiallyReasonProductReturned=Produkty częściowo zwrócone
ConfirmClassifyPaidPartiallyReasonOther=Kwota porzucił dla innej przyczyny
@@ -191,9 +189,9 @@ AlreadyPaid=Już paid
AlreadyPaidBack=Already paid back
AlreadyPaidNoCreditNotesNoDeposits=Już wypłacone (bez not kredytowych i depozytów)
Abandoned=Porzucone
-RemainderToPay=Pozostająca do zapłaty
-RemainderToTake=Pozostająca do podjęcia
-RemainderToPayBack=Remainder to pay back
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
Rest=Pending
AmountExpected=Kwota twierdził
ExcessReceived=Trop Peru
@@ -219,19 +217,18 @@ NoInvoice=Nr faktury
ClassifyBill=Klasyfikacja faktury
SupplierBillsToPay=Dostawcy faktur do zapłaty
CustomerBillsUnpaid=Należne wpłaty klientów faktury
-DispenseMontantLettres=Les factures rdiges par procdsmcanographiques sont zrezygnuje de l'arrt en lettres
-DispenseMontantLettres=Les factures rdiges par procdsmcanographiques sont zrezygnuje de l'arrt en lettres
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=Niepodlegające zwrotowi
SetConditions=Ustaw warunki płatności
SetMode=Ustaw tryb płatności
Billed=Billed
-RepeatableInvoice=Predefiniowane faktury
-RepeatableInvoices=Predefiniowane faktur
-Repeatable=Predefiniowane
-Repeatables=Predefiniowane
-ChangeIntoRepeatableInvoice=Konwersja na predefiniowane
-CreateRepeatableInvoice=Tworzenie predefiniowane faktury
-CreateFromRepeatableInvoice=Utwórz z góry określone faktury
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
CustomersInvoicesAndInvoiceLines=Klienta faktury i faktury linii
CustomersInvoicesAndPayments=Klient faktur i płatności
ExportDataset_invoice_1=Klient faktury i faktury listę "linii
diff --git a/htdocs/langs/pl_PL/categories.lang b/htdocs/langs/pl_PL/categories.lang
index 9b86e6485be94fc7a6d72829c66ccdb28d5f55c3..8afe23bd46a2237a7ace13d680287f128e5eb9af 100644
--- a/htdocs/langs/pl_PL/categories.lang
+++ b/htdocs/langs/pl_PL/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories
CatCusLinks=Links between customers/prospects and categories
CatProdLinks=Links between products/services and categories
CatMemberLinks=Links between members and categories
-CatProdLinks=Links between products/services and categories
-CatCusLinks=Links between customers/prospects and categories
-CatSupLinks=Links between suppliers and categories
DeleteFromCat=Remove from category
DeletePicture=Picture delete
ConfirmDeletePicture=Confirm picture deletion?
@@ -112,3 +109,4 @@ CategoriesSetup=Categories setup
CategorieRecursiv=Link with parent category automatically
CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category
diff --git a/htdocs/langs/pl_PL/compta.lang b/htdocs/langs/pl_PL/compta.lang
index e8339bac60dd481e84708dc24f22d404d5906ba4..7d6459d840844d9c4a53aca436721c0c18614835 100644
--- a/htdocs/langs/pl_PL/compta.lang
+++ b/htdocs/langs/pl_PL/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad klienta rachunkowych kod %s
SuppliersProductsSellSalesTurnover=Obrotów generowanych przez sprzedaż dostawców produktów.
CheckReceipt=Sprawdź depozyt
CheckReceiptShort=Sprawdź depozyt
+LastCheckReceiptShort=Last %s check receipts
NewCheckReceipt=Nowe zniżki
NewCheckDeposit=Nowe sprawdzić depozytu
NewCheckDepositOn=Nowe sprawdzić depozytu na konto: %s
diff --git a/htdocs/langs/pl_PL/contracts.lang b/htdocs/langs/pl_PL/contracts.lang
index 3a8c8fb161ecc3f32ea9955a0996d484c79c7c49..634bdf4236136db47900d558941f87fc32caa71e 100644
--- a/htdocs/langs/pl_PL/contracts.lang
+++ b/htdocs/langs/pl_PL/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Zamówienia obszarze
ListOfContracts=Wykaz umów
-LastContracts=Ostatnia %s zmodyfikowane umów
+LastModifiedContracts=Last %s modified contracts
AllContracts=Wszystkie umowy
ContractCard=Zamówienie karty
ContractStatus=Kontrakt statusu
@@ -27,7 +27,7 @@ MenuRunningServices=Uruchamianie usług
MenuExpiredServices=Minął usług
MenuClosedServices=Zamknięte usług
NewContract=Nowe umowy
-AddContract=Dodaj umowy
+AddContract=Create contract
SearchAContract=Szukaj zamówienia
DeleteAContract=Usuń umowy
CloseAContract=Zamknij umowy
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Listę uruchomionych linii zamówienia
ListOfRunningServices=Lista uruchomionych usług
NotActivatedServices=Nie aktywacji usług (wśród zatwierdzonych umów)
BoardNotActivatedServices=Usługi uaktywnić wśród zatwierdzonych umów
-LastContracts=Ostatnia %s zmodyfikowane umów
+LastContracts=Last % contracts
LastActivatedServices=Ostatnia %s aktywacji usługi
LastModifiedServices=Ostatnia %s zmodyfikowane usług
EditServiceLine=Edycja usługa linii
diff --git a/htdocs/langs/pl_PL/cron.lang b/htdocs/langs/pl_PL/cron.lang
index 6abeda4f4aa59b11bf9bdb464629fe2fc599270c..69d99203c3e8c349fe4a412ffd2684d6baa9ccb4 100644
--- a/htdocs/langs/pl_PL/cron.lang
+++ b/htdocs/langs/pl_PL/cron.lang
@@ -1,114 +1,86 @@
# Dolibarr language file - Source file is en_US - cron
-#
# About page
-#
About = O
-# CronAbout = About Cron
-# CronAboutPage = Cron about page
-
-#
+CronAbout = About Cron
+CronAboutPage = Cron about page
# Right
-#
-# Permission23101 = Read Scheduled task
-# Permission23102 = Create/update Scheduled task
-# Permission23103 = Delete Scheduled task
-# Permission23104 = Execute Scheduled task
-
-#
+Permission23101 = Read Scheduled task
+Permission23102 = Create/update Scheduled task
+Permission23103 = Delete Scheduled task
+Permission23104 = Execute Scheduled task
# Admin
-#
-# CronSetup= Scheduled job management setup
-# URLToLaunchCronJobs=URL to check and launch cron jobs if required
-# OrToLaunchASpecificJob=Or to check and launch a specific job
-# KeyForCronAccess=Security key for URL to launch cron jobs
-# FileToLaunchCronJobs=Command line to launch cron jobs
-# CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes
-# CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
-
-
-#
+CronSetup= Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch cron jobs if required
+OrToLaunchASpecificJob=Or to check and launch a specific job
+KeyForCronAccess=Security key for URL to launch cron jobs
+FileToLaunchCronJobs=Command line to launch cron jobs
+CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
# Menu
-#
-# CronJobs=Scheduled jobs
-# CronListActive= List of active jobs
-# CronListInactive= List of disabled jobs
-# CronListActive= List of active jobs
-
-
-#
+CronJobs=Scheduled jobs
+CronListActive=List of active/scheduled jobs
+CronListInactive=List of disabled jobs
# Page list
-#
-# CronDateLastRun=Last run
-# CronLastOutput=Last run output
-# CronLastResult=Last result code
-# CronListOfCronJobs=List of scheduled jobs
-# CronCommand=Command
-# CronList=Jobs list
-# CronDelete= Delete cron jobs
-# CronConfirmDelete= Are you sure you want to delete this cron job ?
-# CronExecute=Launch job
-# CronConfirmExecute= Are you sure to execute this job now
-# CronInfo= Jobs allow to execute task that have been planned
-# CronWaitingJobs=Wainting jobs
-# CronTask=Job
+CronDateLastRun=Last run
+CronLastOutput=Last run output
+CronLastResult=Last result code
+CronListOfCronJobs=List of scheduled jobs
+CronCommand=Command
+CronList=Jobs list
+CronDelete= Delete cron jobs
+CronConfirmDelete= Are you sure you want to delete this cron job ?
+CronExecute=Launch job
+CronConfirmExecute= Are you sure to execute this job now
+CronInfo= Jobs allow to execute task that have been planned
+CronWaitingJobs=Wainting jobs
+CronTask=Job
CronNone= Żaden
CronDtStart=Data rozpoczęcia
CronDtEnd=Data zakończenia
-# CronDtNextLaunch=Next execution
-# CronDtLastLaunch=Last execution
-# CronFrequency=Frequancy
-# CronClass=Classe
+CronDtNextLaunch=Next execution
+CronDtLastLaunch=Last execution
+CronFrequency=Frequancy
+CronClass=Classe
CronMethod=Metoda
CronModule=Moduł
-# CronAction=Action
+CronAction=Action
CronStatus=Status
CronStatusActive=Włączone
CronStatusInactive=Niepełnosprawnych
-# CronNoJobs=No jobs registered
+CronNoJobs=No jobs registered
CronPriority=Priorytet
CronLabel=Opis
-# CronNbRun=Nb. launch
-# CronEach=Every
-# JobFinished=Job launched and finished
-
-#
+CronNbRun=Nb. launch
+CronEach=Every
+JobFinished=Job launched and finished
#Page card
-#
-# CronAdd= Add jobs
-# CronHourStart= Start Hour and date of task
-# CronEvery= And execute task each
-# CronObject= Instance/Object to create
+CronAdd= Add jobs
+CronHourStart= Start Hour and date of task
+CronEvery= And execute task each
+CronObject= Instance/Object to create
CronArgs=Parametry
-# CronSaveSucess=Save succesfully
+CronSaveSucess=Save succesfully
CronNote=Komentarz
-# CronFieldMandatory=Fields %s is mandatory
-# CronErrEndDateStartDt=End date cannot be before start date
-# CronStatusActiveBtn=Enable
+CronFieldMandatory=Fields %s is mandatory
+CronErrEndDateStartDt=End date cannot be before start date
+CronStatusActiveBtn=Enable
CronStatusInactiveBtn=Wyłączyć
-# CronTaskInactive=This job is disabled
-# CronDtLastResult=Last result date
-# CronId=Id
-# CronClassFile=Classes (filename.class.php)
-# CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-# CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-# CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-# CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is <i>fecth</i>
-# CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-# CronCommandHelp=The system command line to execute.
-
-#
+CronTaskInactive=This job is disabled
+CronDtLastResult=Last result date
+CronId=Id
+CronClassFile=Classes (filename.class.php)
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
+CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronCommandHelp=The system command line to execute.
# Info
-#
-# CronInfoPage=Information
-
-
-#
+CronInfoPage=Information
# Common
-#
-# CronType=Task type
-# CronType_method=Call method of a Dolibarr Class
-# CronType_command=Shell command
-# CronMenu=Cron
-# CronCannotLoadClass=Cannot load class %s or object %s
-
-# UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+CronType=Task type
+CronType_method=Call method of a Dolibarr Class
+CronType_command=Shell command
+CronMenu=Cron
+CronCannotLoadClass=Cannot load class %s or object %s
+UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
diff --git a/htdocs/langs/pl_PL/donations.lang b/htdocs/langs/pl_PL/donations.lang
index 8193fe23acb24a6e5e63dbeb61873a679126a17c..2318d3bf19fed77a85199077a6edcdd852138271 100644
--- a/htdocs/langs/pl_PL/donations.lang
+++ b/htdocs/langs/pl_PL/donations.lang
@@ -4,7 +4,7 @@ Donations=Darowizny
DonationRef=Donation ref.
Donor=Donor
Donors=Darczyńcy
-AddDonation=Dodaj darowiznę
+AddDonation=Create a donation
NewDonation=Nowe wpłaty
ShowDonation=Show donation
DonationPromise=Prezent obietnicy
@@ -31,3 +31,8 @@ DonationRecipient=Donation recipient
ThankYou=Thank You
IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
MinimumAmount=Minimum amount is %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/pl_PL/externalsite.lang b/htdocs/langs/pl_PL/externalsite.lang
index e7b2b8625e80d2febbc5629f4303113f518d85f9..35765bf2fd5098db8c54789b19eb183467ac5dd3 100644
--- a/htdocs/langs/pl_PL/externalsite.lang
+++ b/htdocs/langs/pl_PL/externalsite.lang
@@ -2,3 +2,4 @@
ExternalSiteSetup=Skonfiguruj link do zewnętrznej strony internetowej
ExternalSiteURL=Zewnętrzny URL strony
ExternalSiteModuleNotComplete=Moduł zewnętrznej strony internetowej nie został skonfigurowany poprawny
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/pl_PL/holiday.lang b/htdocs/langs/pl_PL/holiday.lang
index 3f09f0c79e9182acce1f44dd239fad6723644a42..bbf13703b825d162143edf8f0618abf33f4d9864 100644
--- a/htdocs/langs/pl_PL/holiday.lang
+++ b/htdocs/langs/pl_PL/holiday.lang
@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
CantCreateCP=You don't have the right to make leave requests.
InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=Uaktualnić
CantUpdate=You cannot update this leave request.
NoDateDebut=You must select a start date.
NoDateFin=You must select an end date.
-ErrorDureeCP=Your request for holidays does not contain working day.
-TitleValidCP=Approve the request holidays
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
ConfirmValidCP=Are you sure you want to approve the leave request?
DateValidCP=Date approved
TitleToValidCP=Send leave request
ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the request holidays
+TitleRefuseCP=Refuse the leave request
ConfirmRefuseCP=Are you sure you want to refuse the leave request?
NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
+TitleCancelCP=Cancel the leave request
ConfirmCancelCP=Are you sure you want to cancel the leave request?
DetailRefusCP=Reason for refusal
DateRefusCP=Date of refusal
@@ -78,7 +77,7 @@ ActionByCP=Performed by
UserUpdateCP=For the user
PrevSoldeCP=Previous Balance
NewSoldeCP=New Balance
-alreadyCPexist=A request for holidays has already been done on this period.
+alreadyCPexist=A leave request has already been done on this period.
UserName=Nazwa użytkownika
Employee=Employee
FirstDayOfHoliday=First day of vacation
@@ -88,25 +87,25 @@ ManualUpdate=Manual update
HolidaysCancelation=Leave request cancelation
## Configuration du Module ##
-ConfCP=Configuration of holidays module
+ConfCP=Configuration of leave request module
DescOptionCP=Description of the option
ValueOptionCP=Wartość
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
UpdateConfCPOK=Updated successfully.
ErrorUpdateConfCP=An error occurred during the update, please try again.
-AddCPforUsers=Please add the balance of holidays of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
Module27130Name= Management of leave requests
Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
TitleOptionEventCP=Settings of leave requets for events
ValidEventCP=Validate
UpdateEventCP=Update events
diff --git a/htdocs/langs/pl_PL/interventions.lang b/htdocs/langs/pl_PL/interventions.lang
index 924ffd5321f259a675de743047a73db8aa8d8c0d..1bd9519089d62b40eaeec7256650f3bfd1a61d43 100644
--- a/htdocs/langs/pl_PL/interventions.lang
+++ b/htdocs/langs/pl_PL/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Interwencja
Interventions=Interwencje
InterventionCard=Interwencja karty
NewIntervention=Nowa interwencja
-AddIntervention=Dodaj interwencji
+AddIntervention=Create intervention
ListOfInterventions=Wykaz interwencji
EditIntervention=Editer interwencji
ActionsOnFicheInter=Działania w zakresie interwencji
@@ -30,6 +30,15 @@ StatusInterInvoiced=Zapowiadane
RelatedInterventions=Podobne interwencje
ShowIntervention=Pokaż interwencji
SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Przedstawiciela w ślad za interwencję
TypeContact_fichinter_internal_INTERVENING=Interwencja
diff --git a/htdocs/langs/pl_PL/mails.lang b/htdocs/langs/pl_PL/mails.lang
index 3785889299f9627c5372f30ef19902804d8abf6f..d1a930134f552656c0be3e7078a543d5460f1355 100644
--- a/htdocs/langs/pl_PL/mails.lang
+++ b/htdocs/langs/pl_PL/mails.lang
@@ -115,7 +115,7 @@ SentBy=Wysłane przez
MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
MailingNeedCommand2=Możesz jednak wysłać je w sieci poprzez dodanie parametru MAILING_LIMIT_SENDBYWEB o wartości max liczba wiadomości e-mail, który chcesz wysłać przez sesji.
ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=Wyczyść listę
ToClearAllRecipientsClickHere=Aby wyczyścić odbiorców tego e-maila na listę, kliknij przycisk
ToAddRecipientsChooseHere=Aby dodać odbiorców, wybierz w tych wykazach
@@ -133,6 +133,9 @@ Notifications=Powiadomienia
NoNotificationsWillBeSent=Brak powiadomień e-mail są planowane dla tego wydarzenia i spółka
ANotificationsWillBeSent=1 zgłoszenie zostanie wysłane pocztą elektroniczną
SomeNotificationsWillBeSent=%s powiadomienia będą wysyłane przez e-mail
-AddNewNotification=Aktywacja nowego zgłoszenia wniosku
-ListOfActiveNotifications=Lista wszystkich aktywnych zgłoszeń wniosków
+AddNewNotification=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
ListOfNotificationsDone=Lista wszystkich powiadomień e-mail wysłany
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index 7cce31efde2866b2709b50ffd12d6d0379b2d7b7..49f64e5b926fdd9a3e7c802b4a3199939dfa22bc 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Nie można znaleźć <b>użytkownika %s</b
ErrorNoVATRateDefinedForSellerCountry=Błąd, nie określono stawki VAT dla kraju " %s".
ErrorNoSocialContributionForSellerCountry=Błąd, nie typ społeczny wkład określone dla kraju "%s".
ErrorFailedToSaveFile=Błąd, nie udało się zapisać pliku.
-ErrorOnlyPngJpgSupported=Błąd tylko. Png i. Obrazu w formacie jpg plików są obsługiwane.
-ErrorImageFormatNotSupported=PHP nie obsługuje funkcje do konwersji obrazów tego formatu.
SetDate=Set date
SelectDate=Select a date
SeeAlso=See also %s
BackgroundColorByDefault=domyślny kolor tła
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
FileWasNotUploaded=Wybraniu pliku do zamocowania, ale jeszcze nie wysłał. Kliknij na "Dołącz plik" w tej sprawie.
NbOfEntries=Uwaga wpisów
GoToWikiHelpPage=Przeczytaj pomoc online (potrzeba dostępu do Internetu)
@@ -266,6 +266,7 @@ Afternoon=Afternoon
Quadri=Quadri
MonthOfDay=Miesiąc dzień
HourShort=O
+MinuteShort=mn
Rate=Tempo
UseLocalTax=Include tax
Bytes=Bajty
@@ -340,6 +341,7 @@ FullList=Pełna lista
Statistics=Statystyki
OtherStatistics=Inne statystyki
Status=Stan
+Favorite=Favorite
ShortInfo=Info.
Ref=Nr ref.
RefSupplier=Nr ref. Dostawca
@@ -365,6 +367,7 @@ ActionsOnCompany=Działania na temat tej osoby trzeciej
ActionsOnMember=Wydarzenia O tego użytkownika
NActions=%s działania
NActionsLate=%s późno
+RequestAlreadyDone=Request already recorded
Filter=Filtr
RemoveFilter=Usuń filtr
ChartGenerated=Wykres generowany
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Dodatkowa konfiguracja atrybutów
URLPhoto=Url zdjęciem / logo
SetLinkToThirdParty=Link do innych stron trzecich
CreateDraft=Utwórz projekt
+SetToDraft=Back to draft
ClickToEdit=Kliknij, aby edytować
ObjectDeleted=%s obiekt usunięty
ByCountry=Według kraju
@@ -678,7 +682,7 @@ ViewPrivateNote=View notes
XMoreLines=%s line(s) hidden
PublicUrl=Public URL
AddBox=Add box
-
+SelectElementAndClickRefresh=Select an element and click Refresh
# Week day
Monday=Poniedziałek
Tuesday=Wtorek
diff --git a/htdocs/langs/pl_PL/margins.lang b/htdocs/langs/pl_PL/margins.lang
index 2c6d1974e703efa5cc7738771708f2930e1e83d8..f8b405f221876f61f45cabbd365bc7c7e95153f1 100644
--- a/htdocs/langs/pl_PL/margins.lang
+++ b/htdocs/langs/pl_PL/margins.lang
@@ -10,24 +10,18 @@ MarkRate=Mark rate
DisplayMarginRates=Display margin rates
DisplayMarkRates=Display mark rates
InputPrice=Input price
-
margin=Profit margins management
margesSetup=Profit margins management setup
-
MarginDetails=Margin details
-
ProductMargins=Product margins
CustomerMargins=Customer margins
SalesRepresentativeMargins=Sales representative margins
-
ProductService=Produkt lub usługa
AllProducts=All products and services
ChooseProduct/Service=Choose product or service
-
StartDate=Data rozpoczęcia
EndDate=Data zakończenia
Launch=Start
-
ForceBuyingPriceIfNull=Force buying price if null
ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0)
MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
@@ -35,16 +29,16 @@ UseDiscountAsProduct=As a product
UseDiscountAsService=As a service
UseDiscountOnTotal=On subtotal
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
-
MARGIN_TYPE=Margin type
MargeBrute=Raw margin
MargeNette=Net margin
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - Cost price
-
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
Charges=Charges
-
AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/pl_PL/orders.lang b/htdocs/langs/pl_PL/orders.lang
index e0b4afbf64f15c2716fe300998f8d99922dcb824..a1caf98c9ddea562c3fa5fbc1cc6b726616626aa 100644
--- a/htdocs/langs/pl_PL/orders.lang
+++ b/htdocs/langs/pl_PL/orders.lang
@@ -2,7 +2,7 @@
OrdersArea=Klienci dziedzinie zamówień
SuppliersOrdersArea=Dostawcy dziedzinie zamówień
OrderCard=Zamów kartę
-# OrderId=Order Id
+OrderId=Order Id
Order=Porządek
Orders=Zamówienia
OrderLine=Zamówienie linii
@@ -28,7 +28,7 @@ StatusOrderCanceledShort=Odwołany
StatusOrderDraftShort=Szkic
StatusOrderValidatedShort=Zatwierdzona
StatusOrderSentShort=W procesie
-# StatusOrderSent=Shipment in process
+StatusOrderSent=Shipment in process
StatusOrderOnProcessShort=Na proces
StatusOrderProcessedShort=Przetworzone
StatusOrderToBillShort=Do rachunku
@@ -53,9 +53,9 @@ ShippingExist=Przesyłka istnieje
DraftOrWaitingApproved=Projekt nie został jeszcze zatwierdzony lub sortowane
DraftOrWaitingShipped=Projekt lub zatwierdzonych jeszcze nie wysłane
MenuOrdersToBill=Zamówienia na rachunku
-# MenuOrdersToBill2=Orders to bill
+MenuOrdersToBill2=Billable orders
SearchOrder=Szukaj celu
-# SearchACustomerOrder=Search a customer order
+SearchACustomerOrder=Search a customer order
ShipProduct=Statek produktu
Discount=Rabat
CreateOrder=Tworzenie Zamówienie
@@ -65,14 +65,14 @@ ValidateOrder=Sprawdź zamówienie
UnvalidateOrder=Unvalidate zamówienie
DeleteOrder=Usuń zamówienie
CancelOrder=Anulować zamówienie
-AddOrder=Dodaj zamówienie
+AddOrder=Create order
AddToMyOrders=Dodaj do mojego zamówienia
AddToOtherOrders=Dodaj do zamówienia
-# AddToDraftOrders=Add to draft order
+AddToDraftOrders=Add to draft order
ShowOrder=Pokaż zamówienie
NoOpenedOrders=Nie otworzył zamówień
NoOtherOpenedOrders=Żadne inne otwarte zamówienia
-# NoDraftOrders=No draft orders
+NoDraftOrders=No draft orders
OtherOrders=Inne zamówienia
LastOrders=Ostatnia %s zamówień
LastModifiedOrders=Ostatnia %s zmodyfikowane zamówień
@@ -82,7 +82,7 @@ NbOfOrders=Liczba zleceń
OrdersStatistics=Zamówienia statystyk
OrdersStatisticsSuppliers=Dostawca zamówień statystyk
NumberOfOrdersByMonth=Liczba zleceń przez miesiąc
-# AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
+AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
ListOfOrders=Lista zamówień
CloseOrder=Zamknij celu
ConfirmCloseOrder=Czy na pewno chcesz zamknąć to zamówienie? Gdy zamówienie jest zamknięta, to może być rozliczone.
@@ -93,7 +93,7 @@ ConfirmUnvalidateOrder=Czy na pewno chcesz przywrócić <b>%s</b> zamówień ze
ConfirmCancelOrder=Czy na pewno chcesz anulować zamówienie?
ConfirmMakeOrder=Czy na pewno chcesz, aby potwierdzić wprowadzone tym celu <b>na %s?</b>
GenerateBill=Generowanie faktur
-# ClassifyShipped=Classify delivered
+ClassifyShipped=Classify delivered
ClassifyBilled=Klasyfikacja "obciążonego"
ComptaCard=Księgowość karty
DraftOrders=Projekt zamówień
@@ -101,7 +101,6 @@ RelatedOrders=Podobne zamówienia
OnProcessOrders=Na proces zamówienia
RefOrder=Nr ref. porządek
RefCustomerOrder=Nr ref. zamówieniem
-CustomerOrder=Zamówieniem
RefCustomerOrderShort=Nr ref. cust. porządek
SendOrderByMail=Wyślij zamówienie pocztą
ActionsOnOrder=Działania mające na celu
@@ -131,9 +130,7 @@ Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Stała COMMANDE_SUPPLIER_ADDON nie zdef
Error_COMMANDE_ADDON_NotDefined=Stała COMMANDE_ADDON nie zdefiniowane
Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Nie można załadować modułu pliku ' %s'
Error_FailedToLoad_COMMANDE_ADDON_File=Nie można załadować modułu pliku ' %s'
-# Error_OrderNotChecked=No orders to invoice selected
-
-
+Error_OrderNotChecked=No orders to invoice selected
# Sources
OrderSource0=Commercial wniosku
OrderSource1=Internet
@@ -144,25 +141,22 @@ OrderSource5=Komercyjne
OrderSource6=Przechowywać
QtyOrdered=Ilosc sortowane
AddDeliveryCostLine=Dodaj dostawy koszt linii wskazujące wagi zamówienia
-
# Documents models
PDFEinsteinDescription=Pełna kolejność modelu (logo. ..)
PDFEdisonDescription=Prosty model celu
-# PDFProformaDescription=A complete proforma invoice (logo…)
+PDFProformaDescription=A complete proforma invoice (logo…)
# Orders modes
OrderByMail=Poczta
OrderByFax=Faks
OrderByEMail=EMail
OrderByWWW=Online
OrderByPhone=Telefon
-
-# CreateInvoiceForThisCustomer=Bill orders
-# NoOrdersToInvoice=No orders billable
-# CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-# MenuOrdersToBill2=Orders to bill
-# OrderCreation=Order creation
-# Ordered=Ordered
-# OrderCreated=Your orders have been created
-# OrderFail=An error happened during your orders creation
-# CreateOrders=Create orders
-# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+CreateInvoiceForThisCustomer=Bill orders
+NoOrdersToInvoice=No orders billable
+CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
+OrderCreation=Order creation
+Ordered=Ordered
+OrderCreated=Your orders have been created
+OrderFail=An error happened during your orders creation
+CreateOrders=Create orders
+ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
diff --git a/htdocs/langs/pl_PL/oscommerce.lang b/htdocs/langs/pl_PL/oscommerce.lang
deleted file mode 100644
index 6cf59eb65c6c43791d0e2cf879da33facff23d1b..0000000000000000000000000000000000000000
--- a/htdocs/langs/pl_PL/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=OS Commerce konfiguracji modułu
-OSCommerceSetupSaved=OS Commerce konfiguracji zapisywane
-OSCommerceServer=OS Commerce Server host / ip
-OSCommerceDatabaseName=OS Handlowa nazwa bazy danych
-OSCommercePrefix=OS Commerce prefiks tabel
-OSCommerceUser=OS Commerce bazy danych logowania
diff --git a/htdocs/langs/pl_PL/other.lang b/htdocs/langs/pl_PL/other.lang
index bb487092ed5575994a82323845ee3f1abd2c0a50..fe2b5107356cef2520e356546233a3c331c6bc95 100644
--- a/htdocs/langs/pl_PL/other.lang
+++ b/htdocs/langs/pl_PL/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=Kod zabezpieczający
Calendar=Kalendarz
-AddTrip=Dodaj podróż
Tools=Narzędzia
ToolsDesc=Obszar ten jest poświęcony grupie różnorodnych nie dostępnych narzędzi do innych pozycji w menu. <br><br> Narzędzia te mogą zostać osiągnięte z menu na stronie.
Birthday=Urodziny
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation
Notify_TASK_CREATE=Task created
Notify_TASK_MODIFY=Task modified
Notify_TASK_DELETE=Task deleted
+SeeModuleSetup=See module setup
NbOfAttachedFiles=Liczba załączonych plików / dokumentów
TotalSizeOfAttachedFiles=Całkowita wielkość załączonych plików / dokumentów
MaxSize=Maksymalny rozmiar
@@ -80,6 +80,16 @@ ModifiedBy=Zmodyfikowane przez %s
ValidatedBy=Zatwierdzona przez %s
CanceledBy=Odwołany przez %s
ClosedBy=Zamknięte przez %s
+CreatedById=User id who created
+ModifiedById=User id who made last change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made last change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
FileWasRemoved=Plik został usunięty
DirWasRemoved=Katalog został usunięty
FeatureNotYetAvailableShort=Dostępne w następnej wersji
@@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your
##### Calendar common #####
AddCalendarEntry=Dodaj wpis w kalendarzu %s
-NewCompanyToDolibarr=Firma %s dodany do Dolibarr
-ContractValidatedInDolibarr=Kontrakt %s zatwierdzone w Dolibarr
-ContractCanceledInDolibarr=Kontrakt %s anulowany w Dolibarr
-ContractClosedInDolibarr=Kontrakt %s zamknięty w Dolibarr
-PropalClosedSignedInDolibarr=Wniosek podpisany w %s Dolibarr
-PropalClosedRefusedInDolibarr=Wniosek %s odmówił w Dolibarr
-PropalValidatedInDolibarr=Wniosek %s zatwierdzone w Dolibarr
-InvoiceValidatedInDolibarr=Faktura %s zatwierdzone w Dolibarr
-InvoicePaidInDolibarr=Faktura %s zmieniono na wypłatę w Dolibarr
-InvoiceCanceledInDolibarr=Faktura %s anulowany w Dolibarr
-PaymentDoneInDolibarr=Płatność dokonana w %s Dolibarr
-CustomerPaymentDoneInDolibarr=Klient płatności %s wykonane w Dolibarr
-SupplierPaymentDoneInDolibarr=Dostawca płatności %s wykonane w Dolibarr
-MemberValidatedInDolibarr=Państwa %s zatwierdzone w Dolibarr
-MemberResiliatedInDolibarr=Państwa %s resiliated w Dolibarr
-MemberDeletedInDolibarr=Państwa %s usuwane z Dolibarr
-MemberSubscriptionAddedInDolibarr=Subskrypcja członek %s dodany w Dolibarr
-ShipmentValidatedInDolibarr=%s wysyłki zatwierdzone w Dolibarr
-ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
##### Export #####
Export=Eksport
ExportsArea=Wywóz obszarze
diff --git a/htdocs/langs/pl_PL/paybox.lang b/htdocs/langs/pl_PL/paybox.lang
index af727252f411e83480ff656daf68053b62fc9a4a..9d629ea7e16d71a09355f40e56b08cb94f9e69eb 100644
--- a/htdocs/langs/pl_PL/paybox.lang
+++ b/htdocs/langs/pl_PL/paybox.lang
@@ -32,6 +32,9 @@ VendorName=Nazwa dostawcy
CSSUrlForPaymentForm=CSS url arkusz dla formy płatności
MessageOK=Wiadomość na zatwierdzonych strony powrót płatności
MessageKO=Wiadomość na odwołana strony powrotnej płatności
-# NewPayboxPaymentReceived=New Paybox payment received
-# NewPayboxPaymentFailed=New Paybox payment tried but failed
-# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+NewPayboxPaymentReceived=New Paybox payment received
+NewPayboxPaymentFailed=New Paybox payment tried but failed
+PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/pl_PL/resource.lang b/htdocs/langs/pl_PL/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..d64075dfbf595897a63e3eebf19194d8f71030dd
--- /dev/null
+++ b/htdocs/langs/pl_PL/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
diff --git a/htdocs/langs/pl_PL/sendings.lang b/htdocs/langs/pl_PL/sendings.lang
index c678dc2b9f9bb72ef32aee054d32b162fcd68113..3ff7b8f5fb70cfb2c7bcdbda4a45f58cc7b67e24 100644
--- a/htdocs/langs/pl_PL/sendings.lang
+++ b/htdocs/langs/pl_PL/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=Na razie utworzenie nowego przesyłki odbywa si
RelatedShippings=Related shippings
ShipmentLine=Shipment line
CarrierList=List of transporters
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
# Sending methods
SendingMethodCATCH=Catch przez klientów
diff --git a/htdocs/langs/pl_PL/stocks.lang b/htdocs/langs/pl_PL/stocks.lang
index 93f24786db7d64b86b43c115b62cb511f04b1ef0..86f5d735d69298301a8710bb04ea944c08423a55 100644
--- a/htdocs/langs/pl_PL/stocks.lang
+++ b/htdocs/langs/pl_PL/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Magazyn etykiecie jest wymagane
CorrectStock=Poprawny stanie
ListOfWarehouses=Lista magazynów
ListOfStockMovements=Wykaz stanu magazynowego
-StocksArea=Zapasy obszarze
+StocksArea=Warehouses area
Location=Lieu
LocationSummary=Nazwa skrócona lokalizacji
NumberOfDifferentProducts=Number of different products
diff --git a/htdocs/langs/pl_PL/users.lang b/htdocs/langs/pl_PL/users.lang
index ef8b60b0f676083a4c2a11299e82b5c834a0d6de..467c34b1af8cb10eadfecd48df353d498195c6e1 100644
--- a/htdocs/langs/pl_PL/users.lang
+++ b/htdocs/langs/pl_PL/users.lang
@@ -63,7 +63,6 @@ ShowGroup=Pokaż grupy
ShowUser=Pokaż użytkownika
NonAffectedUsers=Brak wpływu na użytkowników
UserModified=Użytkownik zmodyfikowano pomyślnie
-GroupModified=Grupa zmodyfikowano pomyślnie
PhotoFile=Plików ze zdjęciami
UserWithDolibarrAccess=Użytkownik z Dolibarr dostępu
ListOfUsersInGroup=Lista użytkowników w tej grupie
@@ -103,7 +102,7 @@ UserDisabled=Użytkownik %s osób niepełnosprawnych
UserEnabled=Użytkownik %s aktywowany
UserDeleted=Użytkownik %s usunięto
NewGroupCreated=Grupa %s tworzone
-GroupModified=Grupa zmodyfikowano pomyślnie
+GroupModified=Group %s modified
GroupDeleted=Grupa %s usunięto
ConfirmCreateContact=Czy na pewno chcesz yu Dolibarr utworzyć konto dla tego kontaktu?
ConfirmCreateLogin=Czy na pewno chcesz, aby utworzyć konto dla tego Dolibarr członkiem?
@@ -114,8 +113,10 @@ YourRole=Swoje role
YourQuotaOfUsersIsReached=Limitu aktywnych użytkowników został osiągnięty!
NbOfUsers=Nb użytkowników
DontDowngradeSuperAdmin=Tylko superadmin niższej wersji superadmin
-HierarchicalResponsible=Hierarchical responsible
+HierarchicalResponsible=Supervisor
HierarchicView=Hierarchical view
UseTypeFieldToChange=Use field Type to change
OpenIDURL=OpenID URL
LoginUsingOpenID=Use OpenID to login
+WeeklyHours=Weekly hours
+ColorUser=Color of the user
diff --git a/htdocs/langs/pl_PL/withdrawals.lang b/htdocs/langs/pl_PL/withdrawals.lang
index 2efd9456102b1413945463c8bfab70f4b74d2ec6..9c6354451a29ca82d4444d65ab079bcc7347ede8 100644
--- a/htdocs/langs/pl_PL/withdrawals.lang
+++ b/htdocs/langs/pl_PL/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=Odbiór
LastWithdrawalReceipts=Ostatnia %s wycofania wpływy
WithdrawedBills=Withdrawed faktur
WithdrawalsLines=Wycofania linie
-RequestStandingOrderToTreat=Wniosek o stałych zleceń w leczeniu
-RequestStandingOrderTreated=Wniosek o stałych zleceń leczonych
+RequestStandingOrderToTreat=Request for standing orders to process
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=Stałych zleceń klienta
CustomerStandingOrder=Klient zlecenie stałe
NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
@@ -40,14 +41,13 @@ TransMetod=Tryb transmisji
Send=Wysłać
Lines=Linie
StandingOrderReject=Problem odrzucenia
-InvoiceRefused=Za odrzucenie klienta
WithdrawalRefused=Wypłaty Refuseds
WithdrawalRefusedConfirm=Czy na pewno chcesz wprowadzić odrzucenie wycofania dla społeczeństwa
RefusedData=Od odrzucenia
RefusedReason=Powodem odrzucenia
RefusedInvoicing=Rozliczeniowych odrzucenia
NoInvoiceRefused=Nie za odrzucenie
-InvoiceRefused=Za odrzucenie klienta
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=Status
StatusUnknown=Nieznany
StatusWaiting=Czekanie
@@ -76,7 +76,7 @@ WithBankUsingRIB=Na rachunkach bankowych z wykorzystaniem RIB
WithBankUsingBANBIC=Na rachunkach bankowych z wykorzystaniem IBAN / BIC / SWIFT
BankToReceiveWithdraw=Konto bankowe do odbioru odstępuje
CreditDate=Kredyt na
-WithdrawalFileNotCapable=Nie można wygenerować plik potwierdzenia wypłaty dla swojego kraju
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
ShowWithdraw=Pokaż Wypłata
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Jeśli jednak faktura nie co najmniej jeden wypłaty płatności jeszcze przetworzone, nie będzie ustawiony jako zapłaci, aby umożliwić zarządzanie wycofanie wcześniej.
DoStandingOrdersBeforePayments=Te karty pozwala z prośbą o zlecenia stałego. Gdy będzie gotowy, możesz wpisać płatność zamknąć faktury.
diff --git a/htdocs/langs/pt_BR/accountancy.lang b/htdocs/langs/pt_BR/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..26dd25027a2142add7a5132773f2dfe8c2caaa8c
--- /dev/null
+++ b/htdocs/langs/pt_BR/accountancy.lang
@@ -0,0 +1,96 @@
+# Dolibarr language file - Source file is en_US - accountancy
+Accounting=Contabilidade
+Globalparameters=Parametros globais
+Fiscalyear=Ano fiscal
+Menuaccount=Contas contábeis
+ConfigAccountingExpert=Configuração do módulo especialista em contabilidade
+Journaux=Jornais
+JournalFinancial=Jornais financeiros
+Exports=Exportações
+Selectmodelcsv=Escolha um modelo de exportação
+Modelcsv_normal=Exportação classica
+Modelcsv_CEGID=Export towards CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Return
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Breakdown
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+Ventilate=Ventilate
+VentilationAuto=Automatic breakdown
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Linhas selecionadas
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+ACCOUNTING_SEPARATORCSV=Separator CSV
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+ACCOUNTING_SELL_JOURNAL=Sell journal
+ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTING_BANK_JOURNAL=Bank journal
+ACCOUNTING_CASH_JOURNAL=Cash journal
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait
+Docref=Referência
+Code_tiers=Cliente/Fornecedor
+Labelcompte=Label account
+Sens=Sens
+Codejournal=Journal
+DelBookKeeping=Delete the records of the general ledger
+BankJournal=Bank journal
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
+CashPayment=Cash Payment
+ThirdPartyAccount=Thirdparty account
+NewAccountingMvt=Nova movimentação
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ListAccounts=List of the accounting accounts
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Active=Statement
+NewFiscalYear=New fiscal year
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+ValidateHistory=Validate Automatically
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
index 1ba5011996d5eecd246235b6aaa71fb6b6c579b0..1211cf13d322a8fb3328ad711cba16a7f96882b5 100644
--- a/htdocs/langs/pt_BR/admin.lang
+++ b/htdocs/langs/pt_BR/admin.lang
@@ -1,13 +1,8 @@
# Dolibarr language file - Source file is en_US - admin
Foundation=Empresa/Instituição
-Version=Versão
VersionProgram=Versão do programa
VersionLastInstall=Versão da instalação inicial
VersionLastUpgrade=Versão da última atualização
-VersionExperimental=Experimental
-VersionDevelopment=Desenvolvimento
-VersionUnknown=Desconhecida
-VersionRecommanded=Recomendada
SessionId=ID da sessao
SessionSaveHandler=Manipulador para salvar sessões.
SessionSavePath=Localizacao da sessao guardada
@@ -32,90 +27,58 @@ InternalUser=Usuário Interno
ExternalUser=Usuário Externo
InternalUsers=Usuários Internos
ExternalUsers=Usuários Externos
-GlobalSetup=Geral
-GUISetup=Layout
SetupArea=Área Configuração
FormToTestFileUploadForm=Formulário para testar upload de arquivo (de acordo com a configuração)
IfModuleEnabled=Nota: Sim só é eficaz se o módulo <b>%s</b> estiver ativado
RemoveLock=Exclua o arquivo <b>%s</ b> se tem permissão da ferramenta de atualização.
RestoreLock=Substituir o arquivo <b>%s</b> e apenas dar direito de ler a esse arquivo, a fim de proibir novas atualizações.
-SecuritySetup=Configuração de Segurança
-ErrorModuleRequirePHPVersion=Erro, este módulo requer uma versão %s ou superior de PHP
ErrorModuleRequireDolibarrVersion=Erro, este módulo requer uma versão %s ou superior do ERP
-ErrorDecimalLargerThanAreForbidden=Erro, as casas decimais superiores a <b>%s</b> não são suportadas.
DictionarySetup=Configuração Dicionário
-Dictionary=Dicionários
ErrorReservedTypeSystemSystemAuto=Valores 'system' e 'systemauto' para o tipo é reservado. Você pode usar "usuário" como valor para adicionar seu próprio registro
ErrorCodeCantContainZero=Código não pode conter valor 0
-DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
+DisableJavascript=Desative as funções de JavaScript e Ajax (Recomendado para deficientes visuais ou navegadores somente texto)
ConfirmAjax=Utilizar os popups de confirmação Ajax
UseSearchToSelectCompanyTooltip=Além disso, se você tem um grande número de terceiros (> 100 000), você pode aumentar a velocidade, definindo COMPANY_DONOTSEARCH_ANYWHERE constante a 1 em Setup-> Outro. Busca, então, ser limitada até o início da string.
UseSearchToSelectCompany=Use campos de completação automática para escolher terceiros em vez de usar uma caixa de listagem.
-ActivityStateToSelectCompany= Adicionar uma opção de filtro para exibir / ocultar thirdparties que estão atualmente em atividade ou deixou de ativar
+ActivityStateToSelectCompany=Adicionar uma opção de filtro para exibir / ocultar thirdparties que estão atualmente em atividade ou deixou de ativar
UseSearchToSelectContactTooltip=Além disso, se você tem um grande número de terceiros (> 100 000), você pode aumentar a velocidade, definindo CONTACT_DONOTSEARCH_ANYWHERE constante a 1 em Setup-> Outro. Busca, então, ser limitada até o início da string.
UseSearchToSelectContact=Use campos de completação automática para escolher de contato (em vez de usar uma caixa de lista).
SearchFilter=Opções de filtro para pesquisa
NumberOfKeyToSearch=Número de caracteres para iniciar a pesquisa: %s
ViewFullDateActions=Ver as datas das ações na totalidade na ficha do fornecedor
-NotAvailableWhenAjaxDisabled=Não está disponível quando o Ajax esta desativado
-JavascriptDisabled=Javascript Desativado
UsePopupCalendar=Utilizar popups para a introdução das datas
UsePreviewTabs=Use guias de visualização
ShowPreview=Ver Preview
-PreviewNotAvailable=Visualização não disponível
ThemeCurrentlyActive=Tema Atualmente Ativo
CurrentTimeZone=Fuso horário PHP (servidor)
MySQLTimeZone=Zona tempo MySql (banco de dados)
TZHasNoEffect=Datas são guardadas e retornadas pelo servidor de banco de dados como se fosse guardados em formato de texto. A zona temporal tem effeito somente quando e usada a UNIX_TIMESTAMP função ( isso não deveria ser usado pelo Dolibarr, portanto o banco de dados TZ não deveria ter effeito, tambem se mudado apos que os dados foram inseridos).
-Space=Área
-Table=Tabela
-Fields=Campos
-Index=Índice
-Mask=Máscara
-NextValue=Próximo Valor
NextValueForInvoices=Próximo Valor (Faturas)
-NextValueForCreditNotes=Próximo Valor (Notas de Entregas)
NextValueForDeposit=Próxima valor (depósito)
NextValueForReplacements=Próxima valor (substituições)
MustBeLowerThanPHPLimit=Observação: Parâmetros PHP limita o tamanho a <b>%s</b> %s de máximo, qualquer que seja o valor deste parâmetros
NoMaxSizeByPHPLimit=Nota: Não há limite definido em sua configuração do PHP
-MaxSizeForUploadedFiles=Tamanho máximo dos documentos a carregar (0 para proibir o carregamento)
UseCaptchaCode=Utilização do Captcha no login
UseAvToScanUploadedFiles=Utilização de um antivírus para scanear os arquivos enviados
-AntiVirusCommand= Caminho completo para o comando de antivírus
-AntiVirusCommandExample= Exemplo de Comando: c: \\ Program Files (x86) \\ ClamWin \\ bin \\ clamscan.exe <br> Exemplo de Mexilhão: / usr / bin / clamscan
-AntiVirusParam= Mais parâmetros na linha de comando
-AntiVirusParamExample= Exemplo de Parametro de Comando: - database = "C: \\ Program Files (x86) \\ lib ClamWin \\"
-ComptaSetup=Configuração do Módulo Contabilidade
+AntiVirusCommandExample=Exemplo de Comando: c: \\ Program Files (x86) \\ ClamWin \\ bin \\ clamscan.exe <br> Exemplo de Mexilhão: / usr / bin / clamscan
+AntiVirusParam=Mais parâmetros na linha de comando
+AntiVirusParamExample=Exemplo de Parametro de Comando: - database = "C: \\ Program Files (x86) \\ lib ClamWin \\"
UserSetup=Configuração e Administração dos Usuário
MenuSetup=Configuração do gerenciamento de menu
MenuLimits=Limites e Precisão
-MenuIdParent=Id do menu pai
-DetailMenuIdParent=ID do menu pai (0 para um menu superior)
DetailPosition=Número de ordem para a posição do menu
PersonalizedMenusNotSupported=Menus personalizados não são suportados
-AllMenus=Todos
NotConfigured=Modulo nao configurado
-Setup=Configuração do Sistema
Activation=Ativação
-Active=Ativo
SetupShort=Configuracao
-OtherOptions=Outras Opções
OtherSetup=Outras configuracoes
-CurrentValueSeparatorDecimal=Separador decimal
CurrentValueSeparatorThousand=Separador milhar
Destination=Destino
IdModule=Módulo ID
IdPermissions=Permissão ID
-Modules=Módulos
ModulesCommon=Módulos Principais
-ModulesOther=Outros módulos
ModulesInterfaces=Módulos de interface
ModulesSpecial=Módulos muito específico
-ParameterInDolibarr=Variável %s
-LanguageParameter=Variável idioma %s
-LanguageBrowserParameter=Variável %s
-LocalisationDolibarrParameters=Parâmetros de localização
ClientTZ=Fuso horário do cliente (usuário).
ClientHour=Horário do cliente (usuário)
OSTZ=Fuso horário do sistema operacional do servidor
@@ -129,16 +92,13 @@ CompanyHour=Horário na empresa (empresa principal)
CurrentSessionTimeOut=Tempo limite da sessão atual
YouCanEditPHPTZ=Para definir um fuso horário diferente PHP (não obrigatório), você pode tentar adicionar um arquivo. Htacces com uma linha como esta "SetEnv TZ Europa / Paris"
OSEnv=OS Ambiente
-Box=Caixa
-Boxes=Caixas
MaxNbOfLinesForBoxes=Numero de linhas máximo para as caixas
PositionByDefault=Posição por padrao
-Position=Ordem
+Position=Posição
MenusDesc=Os configuradores do menu definem o conteúdo das 2 barras de menus (a barra horizontal e a barra vertical). É possível atribuir configuradores diferentes segundo o usuário seja interno ou externo.
MenusEditorDesc=O editor de menus permite definir entradas personalizadas nos menus. Deve utilizar com prudência sobe pena de colocar o ERP numa situação instável sendo necessário uma reinstalação para encontrar um menu coerente.
MenuForUsers=menu para os usuarios
LangFile=Arquivo .lang
-System=Sistema
SystemInfo=Informações de Sistema
SystemTools=Ferramentas do Sistema
SystemToolsArea=Área de ferramentas do sistema
@@ -156,7 +116,6 @@ ConfirmPurgeAuditEvents=Tem a certeza que pretende limpar a lista de eventos de
NewBackup=Novo Backup
GenerateBackup=Gerar Backup
Backup=Backup
-Restore=Restaurar
RunCommandSummary=A cópia será executada pelo seguinte comando
RunCommandSummaryToLaunch=O backup pode ser executado com o seguinte comando
WebServerMustHavePermissionForCommand=Seu servidor deve ter permissoes para executar esta ordem
@@ -164,50 +123,33 @@ BackupResult=Resultado do Backup
BackupFileSuccessfullyCreated=Arquivo de Backup gerado corretamente
YouCanDownloadBackupFile=Pode ser feito o download dos arquivos gerados
NoBackupFileAvailable=Nenhum Backup Disponivel
-ExportMethod=Método de exportação
-ImportMethod=Método de importação
ToBuildBackupFileClickHere=Para criar uma cópia, clique <a href="%s">here</a>.
ImportMySqlDesc=Para importar um backup, deve usar o mysql e na linha de comando seguinte:
ImportPostgreSqlDesc=Para importar um arquivo de backup, você deve utilizar o pg_restore através do prompt de comando:
ImportMySqlCommand=%s %s < meuArquivobackup.sql
ImportPostgreSqlCommand=%s %s meuarquivodebackup.sql
FileNameToGenerate=Nome do arquivo a gerar
-Compression=Compressão
CommandsToDisableForeignKeysForImport=Comando para desativar as chave estrangeira para a importação
CommandsToDisableForeignKeysForImportWarning=Obrigatório se você quer ser capaz de restaurar o despejo sql mais tarde
ExportCompatibility=Compatibilidade do arquivo de exportação gerado
-MySqlExportParameters=Parâmetros da exportação MySql
-PostgreSqlExportParameters= Parâmetros de exportação do PostgreSQL
+PostgreSqlExportParameters=Parâmetros de exportação do PostgreSQL
UseTransactionnalMode=Utilizar o modo transacional
-FullPathToMysqldumpCommand=Rota completa do comando mysqldump
-FullPathToPostgreSQLdumpCommand=Caminho completo para o comando pg_dump
-ExportOptions=Opções de exportação
+FullPathToPostgreSQLdumpCommand=Caminho completo para o comando pg_dump
AddDropDatabase=Adicionar comando DROP DATABASE
AddDropTable=Adicionar comando DROP TABLE
-ExportStructure=Estrutura
-Datas=Dados
-NameColumn=Nome das colunas
ExtendedInsert=Instruções INSERT estendidas
NoLockBeforeInsert=Sem comandos de bloqueio em torno INSERIR
-DelayedInsert=Adições com atraso
EncodeBinariesInHexa=Codificar os campos binários em hexadecimal
IgnoreDuplicateRecords=Ignorar erros de registros duplicados(INSERT IGNORE)
-Yes=Sim
-No=Não
-AutoDetectLang=Autodetecção (navegador)
FeatureDisabledInDemo=Opção desabilitada em mode demonstracao
-Rights=Permissões
BoxesDesc=As caixas são zonas de informação reduzidas que se mostram em algumas páginas. Voce pode escolher entre mostrar as caixas ou nao selecionando a opcao desejada e clicando em 'Ativar', ou clicando na lixeira para desativá-lo.
OnlyActiveElementsAreShown=Somente elementos de <a href="%s"> habilitado módulos </ a> são mostrados.
ModulesDesc=Os módulos do ERP definem as Funcionalidades disponíveis na aplicação. Alguns módulos requerem direitos que deverão indicar-se nos Usuários para que possam acessar ás suas Funcionalidades.
-ModulesInterfaceDesc=Os módulos de interface são módulos que permitem vincular o ERP com sistemas, aplicações ou serviços externos.
-ModulesSpecialDesc=Os módulos especiais são módulos de uso específico ou menos corrente que os módulos normais.
ModulesJobDesc=Os módulos mpresariais permitem uma pré-configuração simplificada do ERP para um negocio especifico.
ModulesMarketPlaceDesc=Voce pode encontrar mais modulos para download em sites externos na internet
ModulesMarketPlaces=Mais módulos
DoliStoreDesc=DoliStore, Pagina oficial para modulos externos do Dolibarr ERP/CRM.
WebSiteDesc=Você pode pesquisar para encontrar mais módulos em Provedores de sites
-URL=Link
BoxesAvailable=Caixas disponíveis
BoxesActivated=Caixas ativadas
ActivateOn=Ative em
@@ -216,8 +158,6 @@ SourceFile=Arquivo origem
AutomaticIfJavascriptDisabled=Automático se Javascript está desativado
AvailableOnlyIfJavascriptNotDisabled=Disponível somente se Javascript esta ativado
AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponível somente se Javascript e Ajax estão ativados
-Required=Requerido
-Security=Segurança
Passwords=Senhas
DoNotStoreClearPassword=Nao salve senhas faceis no banco de dados mas salvar senhas criptografadas(Ativacao recomendada)
MainDbPasswordFileConfEncrypted=Encriptar a senha da base em arquivo conf.php(Ativacao Recomendada)
@@ -226,13 +166,11 @@ InstrucToClearPass=Para ter a senha codificada na conf.php </ b> file <b>, subst
ProtectAndEncryptPdfFiles=Proteção e encriptação dos pdf gerados(Ativado não recomendado, quebra geração pdf massa)
ProtectAndEncryptPdfFilesDesc=A proteção de um documento pdf deixa o documento livre para leitura e para impressão a qualquer leitor de PDF. Ao contrário, a modificação e a cópia resultam impossível.
Feature=Caracteristica
-DolibarrLicense=Licença
DolibarrProjectLeader=Lider de projeto
Developpers=Programadores/contribuidores
OtherDeveloppers=Outros Programadores/contribuidores
OfficialWebSite=Site oficial do Dolibarr
OfficialWebSiteFr=site web oficial falado/escrito em francês
-OfficialWiki=Wiki ERP
OfficialDemo=Demo online ERP
OfficialMarketPlace=Loja Oficial para módulos / addons externos
OfficialWebHostingService=Serviços de hospedagem web referenciados (Hospedagem em nuvem)
@@ -246,47 +184,34 @@ CurrentTopMenuHandler=Manipulador de menu superior atual
CurrentLeftMenuHandler=Manipulador de menu à esquerda atual
CurrentMenuHandler=Manipulador do menu atual
CurrentSmartphoneMenuHandler=Manipular do Menu Smartphone Atual
-MeasuringUnit=Unidade de medida
-Emails=E-Mails
EMailsSetup=configuração E-Mails
EMailsDesc=Esta página permite substituir os parâmetros PHP relacionados com o envio de correios eletrônicos. Na maioria dos casos como UNIX/Linux, os parâmetros PHP estão corretos e esta página é inútil.
MAIN_MAIL_SMTP_PORT=Porta do servidor SMTP (Por default no php.ini: <b>%s</b>)
MAIN_MAIL_SMTP_SERVER=Nome host ou ip do servidor SMTP (Por padrao em php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Porta do servidor SMTP (Não definido em PHP em sistemas de tipo Unix)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Nome servidor ou ip do servidor SMTP (Não definido em PHP em sistemas de tipo Unix)
MAIN_MAIL_EMAIL_FROM=E-Mail do emissor para envios E-Mail automáticos (Por padrao no php.ini: <b>%s</b>)
MAIN_MAIL_ERRORS_TO=Remetente de e-mail utilizado para retornar emails enviados com erros
-MAIN_MAIL_AUTOCOPY_TO= Enviar sistematicamente uma cópia oculta de todos os emails enviados para
+MAIN_MAIL_AUTOCOPY_TO=Enviar sistematicamente uma cópia oculta de todos os emails enviados para
+MAIN_MAIL_AUTOCOPY_PROPOSAL_TO=Enviar sistematicamente uma cópia carbono oculta de propostas enviadas por email para
+MAIN_MAIL_AUTOCOPY_ORDER_TO=Enviar sistematicamente uma cópia carbono oculta de ordens enviadas por email para
+MAIN_MAIL_AUTOCOPY_INVOICE_TO=Enviar sistematicamente uma cópia carbono oculta da fatura enviada por e-mails para
MAIN_DISABLE_ALL_MAILS=Desativar globalmente todo o envio de correios eletrônicos (para modo de testes)
MAIN_MAIL_SENDMODE=Método de envio de e-mails
-MAIN_MAIL_SMTPS_ID=ID SMTP para autenticação SMTP
-MAIN_MAIL_SMTPS_PW=Password SMTP para autenticação SMTP
-MAIN_MAIL_EMAIL_TLS= Usar encryptacao TLS(SSL)
+MAIN_MAIL_EMAIL_TLS=Usar encryptacao TLS(SSL)
MAIN_DISABLE_ALL_SMS=Desabilitar todos os envios de SMS(para testes ou demonstracoes)
MAIN_SMS_SENDMODE=Método para envio de SMS
MAIN_MAIL_SMS_FROM=Número padrão para envio de SMS
FeatureNotAvailableOnLinux=Funcionalidade não disponível em sistemas Unix. Teste parâmetros sendmail localmente.
SubmitTranslation=Se a tradução para esse idioma não estiver completa ou você encontrar erros, você pode corrigir isso através da edição de arquivos no diretório <b> langs /% s </ b> e enviar arquivos modificados no forum www.dolibarr.org.
-ModuleSetup=Configuração do módulo
-ModulesSetup=Configuração dos módulos
-ModuleFamilyBase=Sistema
ModuleFamilyCrm=Administração cliente (CRM)
ModuleFamilyProducts=Administração produtos
-ModuleFamilyHr=Recursos Humanos
ModuleFamilyProjects=Projetos/Trabalho cooperativo
-ModuleFamilyOther=Outro
-ModuleFamilyTechnic=Módulos ferramentas do sistema
-ModuleFamilyExperimental=Módulos testes
-ModuleFamilyFinancial=Módulos financeiros (Contabilidade/Tesouraria)
ModuleFamilyECM=Gerenciamento de Conteúdo Eletrônico (ECM)
MenuHandlers=Configuradores menu
MenuAdmin=Editor menu
DoNotUseInProduction=Não utilizar em produção
ThisIsProcessToFollow=Está aqui o procedimento a seguir:
-StepNb=Passo %s
FindPackageFromWebSite=Encontre um pacote que oferece recurso desejado (por exemplo, no site oficial % s).
DownloadPackageFromWebSite=Descarregar o pacote
-UnpackPackageInDolibarrRoot=Descompactar o pacote na pasta raiz do ERP <b>%s</b>
SetupIsReadyForUse=A Instalação está finalizada e o ERP está liberada para usar com o novo componente
NotExistsDirect=O diretório alternativo para o root não foi definido
InfDirAlt=Desde a versão 3, é possível definir um diretorio root alternativo. Esta funcoa permitepermite que você armazene, no mesmo lugar, plug-ins e templates personalizados <br> apenas crie um diretório na raiz do Dolibarr. (Por exemplo: custom) <br>
@@ -305,7 +230,6 @@ GenericMaskCodes5=<b>ABC {yy} {mm} - {000000}</b> dará <b>ABC0701-000099</b> <b
GenericNumRefModelDesc=Devolve um número criado na linha em uma máscara definida.
ServerAvailableOnIPOrPort=Servidor disponível não endereço <b>%s</b> na porta <b>%s</b>
ServerNotAvailableOnIPOrPort=Servidor não disponível não endereço <b>%s</b> na Porta <b>%s</b>
-DoTestServerAvailability=Teste de conectividade com o servidor
DoTestSend=Teste envio
DoTestSendHTML=Teste envio HTML
ErrorCantUseRazIfNoYearInMask=Erro, não pode usar a opção para redefinir @ contador a cada ano se sequência {yy} ou {aaaa} não está na máscara.
@@ -313,7 +237,7 @@ ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Erro, não se pode usar opção
UMask=Parâmetro UMask de novos arquivos em Unix/Linux/BSD.
UMaskExplanation=Este parâmetro determina os direitos dos arquivos criados não servidor do ERP (durante o carregamento, por Exemplo).<br>Este deve ter o valor octal (por Exemplo, 0666 significa leitura / escrita para todos).<br>Este parâmetro não tem nenhum efeito sobre um servidor Windows.
SeeWikiForAllTeam=Veja o wiki para mais detalhes de todos os autores e da sua organização
-UseACacheDelay= Atraso para a resposta cache em segundos (0 ou vazio para nenhum cache)
+UseACacheDelay=Atraso para a resposta cache em segundos (0 ou vazio para nenhum cache)
DisableLinkToHelpCenter=Esconde link <b> Precisa ajuda ou suporte </b>" na página de login
DisableLinkToHelp=Esconde link "<b>%s Ajuda online </b>" no menu esquerdo
AddCRIfTooLong=Não há envolvimento automático, por isso, se linha está fora da página em documentos, porque por muito tempo, você deve adicionar-se os retornos de carro no testar área.
@@ -328,7 +252,6 @@ ListOfDirectoriesForModelGenODT=Lista de diretórios contendo modelos de arquivo
NumberOfModelFilesFound=Números de arquivos de modelos ODT/ODS encontrados neste diretório
ExampleOfDirectoriesForModelGen=Exemplos de sintaxe:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
FollowingSubstitutionKeysCanBeUsed=Para saber como criar seu documento seu modelo de documento odt, antes de armazená-lo naquele diretório, leia a documentação wiki
-FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
FirstnameNamePosition=Posição do Nome/Sobrenome
DescWeather=As imagens a seguir será mostrado no painel quando o número de ações final atingir os seguintes valores:
KeyForWebServicesAccess=A chave para usar Web Services (parâmetro "dolibarrkey" em webservices)
@@ -341,14 +264,12 @@ SmsTestMessage=Mensagem de teste a partir de __ para __ PHONEFROM__ PHONETO__
ModuleMustBeEnabledFirst=Módulo deve ser ativado antes de usar este recurso.
SecurityToken=Chave para URLs seguras
NoSmsEngine=No SMS gerente disponível remetente. Gerente de SMS do remetente não são instalados com a distribuição padrão (porque depende de um fornecedor externo), mas você pode encontrar em alguns.
-PDF=PDF
PDFDesc=Você pode definir cada uma das opções globais relacionadas com a geração de PDF
PDFAddressForging=Regras de estabelecimento de caixas de endereço
HideAnyVATInformationOnPDF=Esconder todas as informações relativas ao IVA em PDF gerados
HideDescOnPDF=Esconder descrição dos produtos em PDF gerados
HideRefOnPDF=Esconder ref. dos produtos em PDF gerados
HideDetailsOnPDF=Ocultar artigos linhas detalhes sobre PDF gerado
-Library=Biblioteca
UrlGenerationParameters=Parâmetros para proteger URLs
SecurityTokenIsUnique=Use um parâmetro SecureKey exclusivo para cada URL
EnterRefToBuildUrl=Digite referência para o objeto
@@ -357,32 +278,22 @@ ButtonHideUnauthorized=Ocultar botões para ações não autorizadas em vez de m
OldVATRates=Taxa de VAt anterior
NewVATRates=Nova taxa do VAT
PriceBaseTypeToChange=Modificar sobre os preços com valor de referência de base definida em
-MassConvert=Inicie a conversão em massa
-String=Cadeia
-TextLong=Texto longo
-Int=Número inteiro
+MassConvert=Inicie a conversão em massa
Float=Flutuar
-DateAndTime=Data e hora
-Unique=Único
Boolean=Booleano (Caixa de seleção)
-ExtrafieldPhone = Telefone
-ExtrafieldPrice = Preço
-ExtrafieldMail = Email
-ExtrafieldSelect = Selecionar lista
-ExtrafieldSelectList = Selecione da tabela
-ExtrafieldSeparator=Separador
+ExtrafieldSelect =Selecionar lista
+ExtrafieldSelectList =Selecione da tabela
ExtrafieldCheckBox=Caixa de seleção
ExtrafieldRadio=Botão de opção
ExtrafieldParamHelpselect=Lista de parâmetros tem que ser como chave, valor por exemplo: 1, valor1 2, valor2 < 3, value3 ... A fim de ter a lista dependendo outro: 1, valor1 | parent_list_code: parent_key 2, valor2 | parent_list_code: parent_key
ExtrafieldParamHelpcheckbox=Lista de parâmetros tem que ser como chave, valor <br><br> por exemplo: <br> 1, valor1 <br> 2, valor2 <br> 3, value3 <br> ...
-ExtrafieldParamHelpradio=Lista de parâmetros tem que ser como chave, valor por exemplo: 1, valor 2, valor2 1 3, value3 ...
+ExtrafieldParamHelpradio=Lista de parâmetros tem que ser como chave, valor por exemplo: 1, valor 2, valor2 1 3, value3 ...
ExtrafieldParamHelpsellist=Lista Parâmetros vem de uma tabela <br> Sintaxe: table_name: label_field: id_field :: filtro <br> Exemplo: c_typent: libelle: id :: filtro <br><br> filtro pode ser um teste simples (por exemplo, ativo = 1) para exibir apenas o valor ativo <br> se você deseja filtrar extrafields usar syntaxt extra.fieldcode = ... (onde código de campo é o código de extrafield) <br><br> A fim de ter a lista dependendo outro: <br> c_typent: libelle: id: parent_list_code | parent_column: Filtro
LibraryToBuildPDF=Biblioteca utilizada para criar o PDF
WarningUsingFPDF=Atenção: Seu <b>conf.php</b> contém <b>dolibarr_pdf_force_fpdf</b> directiva <b>= 1.</b> Isto significa que você usar a biblioteca FPDF para gerar arquivos PDF. Esta biblioteca é velho e não suporta um monte de recursos (Unicode, a transparência da imagem, cirílicos, árabes e asiáticos, ...), por isso podem ocorrer erros durante a geração de PDF. <br> Para resolver isso e ter um apoio total de geração de PDF, faça o download <a href="http://www.tcpdf.org/" target="_blank">da biblioteca TCPDF</a> , em seguida, comentar ou remover a linha <b>$ dolibarr_pdf_force_fpdf = 1,</b> e adicione ao invés <b>$ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir'</b>
LocalTaxDesc=Alguns países aplicam 2 ou 3 impostos sobre cada linha de nota fiscal. Se este for o caso, escolha o tipo de segundo e terceiro imposto e sua taxa. Tipos possíveis são: <br> 1: impostos locais, aplicar sobre produtos e serviços, sem IVA (IVA não é aplicado sobre o imposto local) <br> 2: impostos locais, aplicar sobre produtos e serviços antes de IVA (IVA é calculado sobre o montante + localtax) <br> 3: impostos locais, aplicar em produtos sem IVA (IVA não é aplicado sobre o imposto local) <br> 4: impostos locais, aplicadas aos produtos antes de IVA (IVA é calculado sobre o montante + localtax) <br> 5: impostos locais, aplicar em serviços sem IVA (IVA não é aplicado sobre o imposto local) <br> 6: impostos locais, aplicar em serviços antes de IVA (IVA é calculado sobre o montante + localtax)
SMS=Mensagem de texto
LinkToTestClickToDial=Digite um número de telefone para ligar para mostrar um link para testar a url ClickToDial para o <strong>usuário% s</strong>
-RefreshPhoneLink=Atualizar link
LinkToTest=Link clicável gerado para o <strong>usuário% s</strong> (clique número de telefone para testar)
KeepEmptyToUseDefault=Manter em branco para usar o valor padrão
DefaultLink=Link padrão
@@ -397,91 +308,51 @@ ConfirmEraseAllCurrentBarCode=Tem certeza de que deseja apagar todos os valores
AllBarcodeReset=Todos os valores de código de barras foram removidas
NoBarcodeNumberingTemplateDefined=Nenhum modelo de numeração de código de barras habilitado para configuração do módulo de código de barras.
NoRecordWithoutBarcodeDefined=Sem registro, sem valor de código de barras definido.
-
-# Modules
Module0Name=Usuários e Grupos
Module0Desc=Administração de Usuários e Grupos
Module1Name=Fornecedores
Module1Desc=Administração de Fornecedores (Empresas, Particulares) e Contatos
-Module2Name=Comercial
Module2Desc=Administração comercial
-Module10Name=Contabilidade
Module10Desc=Administração simples da Contabilidade (repartição das receitas e pagamentos)
-Module20Name=Orçamentos
Module20Desc=Administração de Orçamentos/Propostas comerciais
-Module22Name=E-Mailings
Module22Desc=Administração e envio de E-Mails massivos
-Module23Name= Energia
-Module23Desc= Acompanhamento do consumo de energias
-Module25Name=Pedidos de clientes
+Module23Desc=Acompanhamento do consumo de energias
Module25Desc=Administração de pedidos de clientes
Module30Name=Faturas e Recibos
Module30Desc=Administração de faturas e recibos de clientes. Administração de faturas de Fornecedores
-Module40Name=Fornecedores
Module40Desc=Administração de Fornecedores
-Module42Name=Syslog
-Module42Desc=Utilização de logs (syslog)
-Module49Name=Editores
Module49Desc=Administração de Editores
-Module50Name=Produtos
Module50Desc=Administração de produtos
Module51Name=Correspondência em massa
Module51Desc=Gestão de correspondência do massa
Module52Name=Estoques de produtos
Module52Desc=Administração de estoques de produtos
-Module53Name=Serviços
Module53Desc=Administração de serviços
-Module54Name=Contratos
-Module54Desc=Administração de contratos
Module55Name=Códigos de barra
Module55Desc=Administração dos códigos de barra
Module56Name=Telefonia
Module56Desc=Administração da telefonia
Module57Name=Débitos Diretos
Module57Desc=Administração de débitos diretos e créditos bancários
-Module58Name=ClickToDial
-Module58Desc=Integração com ClickToDial
-Module59Name=Bookmark4u
Module59Desc=Adicione função para gerar uma conta Bookmark4u desde uma conta do ERP
-Module70Name=Intervenções
Module70Desc=Administração de Intervenções
Module75Name=Notas de despesas e deslocamentos
Module75Desc=Administração das notas de despesas e deslocamentos
-Module80Name=Expedições
Module80Desc=Administração de Expedições e Recepções
-Module85Name=Bancos e Caixas
Module85Desc=Administração das contas financeiras de tipo contas bancarias, postais o efetivo
Module100Name=Site externo
Module100Desc=Este módulo inclui um web site ou página externa em menus Dolibarr e vê-lo em um quadro Dolibarr
Module105Name=Mailman e SPIP
Module105Desc=Mailman ou interface SPIP para o módulo membro
-Module200Name=LDAP
Module200Desc=sincronização com um anuário LDAP
-Module210Name=PostNuke
-Module210Desc=Integração com PostNuke
-Module240Name=Exportações de dados
-Module240Desc=Ferramenta de exportação de dados do ERP (com assistente)
-Module250Name=Importação de dados
-Module250Desc=Ferramenta de Importação de dados do ERP (com assistente)
-Module310Name=Membros
Module310Desc=Administração de Membros de uma associação
-Module320Name=Ligações RSS
-Module320Desc=Criação de ligações de informação RSS nas janelas do ERP
-Module330Name=Favoritos
Module330Desc=Administração de Favoritos
-Module400Name=Projetos
-Module400Desc=Administração dos projetos nos outros módulos
-Module410Name=Webcalendar
Module410Desc=Interface com calendário Webcalendar
Module500Name=Despesas especiais (impostos, contribuições sociais, dividendos)
Module500Desc=Gestão de despesas especiais, como impostos, contribuição social, dividendos e salários
-Module510Name=Salários
Module510Desc=Gestão de funcionários salários e pagamentos
-Module600Name=Notificações
-Module600Desc=Envio de Notificações (por correio eletrônico) sobre os eventos de trabalho Dolibarr
-Module700Name=Bolsas
+Module600Desc=Enviar notificação via EMail para terceiros sobre algums eventos do Dolibarr ( configurado para cada terceiro)
Module700Desc=Administração de Bolsas
-Module1200Name=Mantis
Module1200Desc=Interface com o sistema de seguimento de incidências Mantis
Module1400Name=Contabilidade
Module1400Desc=Gestão de Contabilidade (partes duplas)
@@ -489,40 +360,33 @@ Module1780Name=Categorias
Module1780Desc=Administração de categorias (produtos, Fornecedores e clientes)
Module2000Name=Editor WYSIWYG
Module2000Desc=Permitir editar alguma área de texto usando um editor avançado
-Module2300Name=Cron
Module2300Desc=Gerenciamento de tarefas agendadas
-Module2400Name=Agenda
Module2400Desc=Administração da agenda e das ações
Module2500Name=Administração Eletrônica de Documentos
-Module2500Desc=Permite administrar uma base de documentos
Module2600Name=Webservices
Module2600Desc=Ativar o servidor de serviços web Dolibarr
Module2700Name=Sobrescrito
Module2700Desc=Usar o serviço on-line Gravatar (www.gravatar.com) para mostrar fotos de usuários / membros (que se encontra com os seus e-mails). Precisa de um acesso à Internet
Module2800Desc=Cliente de FTP
-Module2900Name=GeoIPMaxmind
Module2900Desc=GeoIP Maxmind conversões capacidades
-Module3100Name=Skype
Module3100Desc=Adicionar um botão do Skype no cartão de adeptos / terceiros / contatos
Module5000Name=Multi-Empresa
Module5000Desc=Permite-lhe gerenciar várias empresas
-Module6000Name=Fluxo de Trabalho
Module6000Desc=Gestão de fluxo de trabalho
-Module20000Name=Ferias
-Module20000Desc=Declare e siga funcionários de férias
+Module20000Name=Sair da configuração de pedidos
+Module39000Name=Lote de produto
+Module39000Desc=Número do lote, para gestão da data de validade para venda dos produtos
Module50000Name=PayBox
Module50000Desc=Módulo para oferecer uma página de pagamento on-line por cartão de crédito com PayBox
-Module50100Name=Caixa
Module50100Desc=Caixa registradora
-Module50200Name= Paypal
-Module50200Desc= Módulo para oferecer uma página de pagamento on-line por cartão de crédito com Paypal
-Module54000Name=PrintIPP
+Module50200Desc=Módulo para oferecer uma página de pagamento on-line por cartão de crédito com Paypal
+Module50400Name=Contabilidade (avançada)
+Module50400Desc=Gestão de Contabilidade (partes duplas)
Module54000Desc=Imprimir via Cups IPP Impressora.
Module55000Name=Abrir Enquete
Module55000Desc=Módulo para fazer pesquisas on-line (como Doodle, Studs, Rdvz ...)
Module59000Name=Margems
Module59000Desc=Módulo para gerenciar as margens
-Module60000Name=Comissões
Module60000Desc=Módulo para gerenciar comissões
Module150010Name=Número do lote, de comer por data e data de validade
Module150010Desc=Número do lote, prazo de validade de venda gestão de data para o produto
@@ -533,104 +397,35 @@ Permission14=Confirmar faturas
Permission15=Enviar faturas por correio
Permission16=Emitir pagamentos de faturas
Permission19=Eliminar faturas
-Permission21=Consultar Orçamentos
-Permission22=Criar/Modificar Orçamentos
-Permission24=Confirmar Orçamentos
-Permission25=Enviar os Orçamentos
-Permission26=Fechar Orçamentos
-Permission27=Eliminar Orçamentos
-Permission28=Exportação propostas comerciais
-Permission31=Consultar produtos/serviços
-Permission32=Criar/Modificar produtos/serviços
-Permission34=Eliminar produtos/serviços
-Permission36=Exportar produtos/serviços
-Permission38=Exportar Produtos
Permission41=Consultar projetos
Permission42=Criar/Modificar projetos
Permission44=Eliminar projetos
-Permission61=Consultar Intervenções
-Permission62=Criar/Modificar Intervenções
-Permission64=Eliminar Intervenções
-Permission67=Exportar Intervenções
-Permission71=Consultar Membros
-Permission72=Criar/Modificar Membros
-Permission74=Eliminar Membros
-Permission75=Configurar tipos e atributos dos Membros
-Permission76=Exportar Bolsas
-Permission78=Consultar honorários
-Permission79=Criar/Modificar honorários
-Permission81=Consultar pedidos de clientes
-Permission82=Criar/Modificar pedidos de clientes
-Permission84=Confirmar pedidos de clientes
-Permission86=Enviar pedidos de clientes
-Permission87=Fechar pedidos de clientes
-Permission88=Anular pedidos de clientes
-Permission89=Eliminar pedidos de clientes
Permission91=Consultar Impostos e ICMS
Permission92=Criar/Modificar Impostos e ICMS
Permission93=Eliminar Impostos e ICMS
-Permission94=Exportar Impostos Sociais
-Permission95=Consultar balanços e resultados
-Permission101=Consultar Expedições
-Permission102=Criar/Modificar Expedições
-Permission104=Confirmar Expedições
Permission106=Envios de exportação
-Permission109=Eliminar Expedições
-Permission111=Consultar contas financeiras (contas bancarias, caixas)
Permission112=Criar/Modificar quantidade/eliminar registros bancários
Permission113=Configurar contas financeiras (criar, controlar as categorias)
Permission114=Exportar transações e registros bancários
Permission115=Exportar transações e extratos
Permission116=Captar transferências entre contas
Permission117=Gerenciar envio de cheques
-Permission121=Consultar empresas
-Permission122=Criar/Modificar empresas
-Permission125=Eliminar empresas
-Permission126=Exportar as empresas
Permission141=Leia projetos (também privado não estou em contato para)
Permission142=Criar / modificar projetos (também privado não estou em contato para)
Permission144=Excluir projetos (também privado não estou em contato para)
Permission146=Consultar Prestadores
-Permission147=Consultar Estados
Permission151=Consultar Débitos Diretos
Permission152=Configurar Débitos Diretos
Permission153=Consultar Débitos Diretos
Permission154=Crédito / recusar ordens permanentes recibos
-Permission161=Consultar contratos de serviço
-Permission162=Criar/Modificar contratos de serviço
-Permission163=Ativar os serviços de um contrato
-Permission164=Desativar os serviços de um contrato
-Permission165=Eliminar contratos
-Permission171=Criar/Modificar Deslocamento
-Permission172=Eliminar Deslocamento
-Permission173=apagar viagens
-Permission178=Exportar Deslocamento
-Permission180=Consultar Fornecedores
-Permission181=Consultar pedidos a Fornecedores
-Permission182=Criar/Modificar pedidos a Fornecedores
-Permission183=Confirmar pedidos a Fornecedores
-Permission184=Aprovar pedidos a Fornecedores
-Permission185=Enviar pedidos a Fornecedores
-Permission186=Receber pedidos de Fornecedores
-Permission187=Fechar pedidos a Fornecedores
-Permission188=Anular pedidos a Fornecedores
-Permission192=Criar Linhas
-Permission193=Cancelar Linhas
+Permission172=Criar/Modificar viagens e gastos
+Permission173=Remover viagens e gastos
+Permission178=Exportar viagens e gastos
Permission194=Consultar Linhas da Lagura de Banda
-Permission202=Criar Ligações ADSL
-Permission203=Ordem das ligações encomendadas
-Permission204=Comprar Ligações
Permission205=Gerenciar Ligações
-Permission206=Consultar Ligações
-Permission211=Ler Telefone
-Permission212=Comprar Linhas
Permission213=Ativar Linha
-Permission214=Configurar Telefone
-Permission215=Configurar Fornecedores
-Permission221=Consultar E-Mails
Permission222=Criar/Modificar E-Mails (assunto, destinatários, etc.)
Permission223=Confirmar E-Mails (permite o envio)
-Permission229=Eliminar E-Mails
Permission237=Exibir os destinatários e as informações
Permission238=Envio manual de e-mails
Permission239=Deletar e-mail após o envio
@@ -639,7 +434,6 @@ Permission242=Criar/Modificar categorias
Permission243=Eliminar categorias
Permission244=Ver conteúdo de categorias ocultas
Permission251=Consultar Outros Usuário, grupos e permissões
-PermissionAdvanced251=Leia outros usuários
Permission252=Criar/Modificar outros usuário, grupos e permissões
Permission253=Modificar a senha de outros usuário
PermissionAdvanced253=Criar ou modificar usuários internos ou externos e suas permissões
@@ -647,28 +441,15 @@ Permission254=Eliminar ou desativar outros usuário
Permission255=Criar/Modificar a sua propia informação de usuário
Permission256=Modificar a sua propia senha
Permission262=Consultar todas as empresas (somente Usuários internos. Os externos estão limitados a eles mesmos)
-Permission271=Ler CA
Permission272=Ler Faturas
Permission273=Emitir Fatura
Permission281=Consultar contatos
Permission282=Criar/Modificar contatos
Permission283=Eliminar contatos
Permission286=Exportar os contatos
-Permission291=Consultar Tarifas
-Permission292=Permissões das Tarifas
-Permission293=Modificar Fornecedor de Tarifas
-Permission300=Consultar códigos de barra
-Permission301=Criar/Modificar códigos de barra
-Permission302=Eliminar código de barras
-Permission311=Consultar Serviços
-Permission312=Assinalar Serviço ao Contrato
-Permission331=Consultar Favoritos
-Permission332=Criar/Modificar Favoritos
-Permission333=Eliminar Favoritos
Permission341=Ler suas próprias permissões
Permission342=Criar ou modificar informações do próprio usuário
Permission343=Modificar sua senha
-Permission344=Modificar suas próprias permissões
Permission351=Ler grupos
Permission352=Ler permissões do grupo
Permission353=Criar ou modificar grupos
@@ -682,7 +463,6 @@ Permission510=Leia Salários
Permission512=Criar / modificar salários
Permission514=Excluir salários
Permission517=Salários de exportação
-Permission531=Ler serviços
Permission532=Criar ou modificar serviços
Permission534=Excluir serviços
Permission536=Visualizar ou gerenciar serviços ocultos
@@ -691,24 +471,12 @@ Permission701=Criar/Modificar Bolsas
Permission702=Eliminar Bolsas
Permission703=Excluir doações
Permission1001=Consultar estoques
-Permission1002=Criar/Modificar estoques
-Permission1003=Eliminar estoques
Permission1004=Consultar movimentos de estoque
Permission1005=Criar/Modificar movimentos de estoque
Permission1101=Consultar ordens de envio
Permission1102=criar/modificar ordens de envio
Permission1104=Confirmar ordem de envio
Permission1109=Eliminar ordem de envio
-Permission1181=Consultar Fornecedores
-Permission1182=Consultar pedidos a Fornecedores
-Permission1183=Criar pedidos a Fornecedores
-Permission1184=Confirmar pedidos a Fornecedores
-Permission1185=Aprovar pedidos a Fornecedores
-Permission1186=Enviar pedidos a Fornecedores
-Permission1187=Receber pedidos de Fornecedores
-Permission1188=Fechar pedidos a Fornecedores
-Permission1201=Obter resultado de uma exportação
-Permission1202=Criar/Modificar Exportações
Permission1231=Consultar faturas de Fornecedores
Permission1232=Criar faturas de Fornecedores
Permission1233=Confirmar faturas de Fornecedores
@@ -719,10 +487,9 @@ Permission1237=Pedidos a fornecedores Export e seus detalhes
Permission1251=Execute as importações em massa de dados externos para o banco de dados (carga de dados)
Permission1321=Exportar faturas a clientes, atributos e cobranças
Permission1421=Exportar faturas de clientes e atributos
-Permission23001 = Ler tarefa agendada
-Permission23002 = Criar/atualizar tarefa agendada
-Permission23003 = Apagar tarefa agendada
-Permission23004 = Executar tarefa agendada
+Permission23001 =Ler tarefa agendada
+Permission23002 =Criar/atualizar tarefa agendada
+Permission23003 =Apagar tarefa agendada
Permission2401=Ler ações (eventos ou tarefas) vinculadas na sua conta
Permission2402=Criar/Modificar/Eliminar ações (eventos ou tarefas) vinculadas na sua conta
Permission2403=Consultar ações (acontecimientos ou tarefas) de outros
@@ -731,12 +498,10 @@ Permission2412=Criar / modificar ações (eventos ou tarefas) de outros
Permission2413=Excluir ações (eventos ou tarefas) de outros
Permission2501=Enviar ou eliminar documentos
Permission2502=Baixar documentos
-Permission2503=Enviar ou excluir documentos
Permission2515=Configuração de diretorios de documentos
Permission2801=Use cliente FTP em modo de leitura (navegar e baixar apenas)
Permission2802=Use o cliente FTP no modo de escrita (apagar ou fazer upload de arquivos)
Permission50101=Usar ponto de vendas
-Permission50201=Leia transações
Permission50202=Importar transacções
Permission54001=Impressão
Permission55001=Leia urnas
@@ -747,9 +512,6 @@ DictionaryCompanyType=Tipo de clientes
DictionaryCompanyJuridicalType=Tipos jurídicos de thirdparties
DictionaryProspectLevel=Nível potencial Prospect
DictionaryCanton=Estado / cantões
-DictionaryRegion=Regiões
-DictionaryCountry=Países
-DictionaryCurrency=Moedas
DictionaryCivility=Título Civilidade
DictionaryActions=Tipo de eventos da agenda
DictionarySocialContributions=Contribuições Sociais tipos
@@ -760,16 +522,13 @@ DictionaryPaymentModes=Modos de pagamento
DictionaryTypeContact=Tipos Contato / Endereço
DictionaryEcotaxe=Ecotaxa (REEE)
DictionaryPaperFormat=Formatos de papel
-DictionaryFees=Tipo de taxas
DictionarySendingMethods=Métodos do transporte
DictionaryStaff=Pessoal
-DictionaryAvailability=Atraso na entrega
DictionaryOrderMethods=Métodos de compra
DictionarySource=Origem das propostas / ordens
DictionaryAccountancyplan=Plano de contas
DictionaryAccountancysystem=Modelos para o plano de contas
SetupSaved=configuração guardada
-BackToModuleList=Voltar à lista de módulos
BackToDictionaryList=Voltar para a lista de dicionários
VATReceivedOnly=Impostos especiais não faturaveis
VATManagement=Administração ICMS
@@ -777,32 +536,25 @@ VATIsUsedDesc=o tipo de ICMS proposto por default em criações de Orçamentos,
VATIsNotUsedDesc=o tipo de ICMS proposto por default é 0. Este é o caso de associações, particulares o algunas pequenhas sociedades.
VATIsUsedExampleFR=em Francia, se trata das sociedades u organismos que eligen um regime fiscal general (General simplificado o General normal), regime ao qual se declara o ICMS.
VATIsNotUsedExampleFR=em Francia, se trata de associações exentas de ICMS o sociedades, organismos o profesiones liberales que han eligedo o regime fiscal de módulos (ICMS em franquicia), pagando um ICMS em franquicia sem fazer declaração de ICMS. Esta elecção hace aparecer a anotação "IVA não aplicable - art-293B do CGI" em faturas.
-##### Local Taxes #####
LTRate=Rata
LocalTax1IsUsed=Utilize segundo imposto
LocalTax1IsNotUsed=Não use o segundo imposto
LocalTax1IsUsedDesc=Use um segundo tipo de impostos (excepto o IVA)
LocalTax1IsNotUsedDesc=Não use outro tipo de impostos (excepto o IVA)
LocalTax1Management=Segundo tipo de imposto
-LocalTax1IsUsedExample=
-LocalTax1IsNotUsedExample=
LocalTax2IsUsed=Use terceiro imposto
LocalTax2IsNotUsed=Não use terceiro imposto
LocalTax2IsUsedDesc=Use um terceiro tipo de impostos (excepto o VAT)
LocalTax2IsNotUsedDesc=Não use outro tipo de impostos (excepto o VAT)
LocalTax2Management=Terceiro tipo de imposto
-LocalTax2IsUsedExample=
-LocalTax2IsNotUsedExample=
-LocalTax1ManagementES= RE Gestão
-LocalTax1IsUsedDescES= A taxa de RE por padrão ao criar perspectivas, notas fiscais, ordens etc seguir a regra padrão ativo: <br> Se te comprador não está sujeito a RE, RP por default = 0. Fim da regra. <br> Se o comprador está sujeito a RE então o RE por padrão. Fim da regra. <br>
-LocalTax1IsNotUsedDescES= Por padrão, o RE proposto é 0. Fim da regra.
-LocalTax1IsUsedExampleES= Na Espanha, eles são profissionais sujeitos a algumas seções específicas do IAE espanhol.
-LocalTax1IsNotUsedExampleES= Na Espanha, eles são profissionais e sociedades e sujeito a determinadas seções do IAE espanhol.
-LocalTax2ManagementES= Gestão IRPF
-LocalTax2IsUsedDescES= A taxa de RE por padrão ao criar perspectivas, notas fiscais, ordens etc seguir a regra padrão ativo: <br> Se o vendedor não está sujeito a IRPF, então IRPF por default = 0. Fim da regra. <br> Se o vendedor é submetido a IRPF, em seguida, o IRPF por padrão. Fim da regra. <br>
-LocalTax2IsNotUsedDescES= Por padrão, o IRPF proposta é 0. Fim da regra.
-LocalTax2IsUsedExampleES= Na Espanha, freelancers e profissionais independentes que prestam serviços e empresas que escolheram o sistema fiscal de módulos.
-LocalTax2IsNotUsedExampleES= Na Espanha, eles são bussines não sujeitas ao regime fiscal dos módulos.
+LocalTax1IsUsedDescES=A taxa de RE por padrão ao criar perspectivas, notas fiscais, ordens etc seguir a regra padrão ativo: <br> Se te comprador não está sujeito a RE, RP por default = 0. Fim da regra. <br> Se o comprador está sujeito a RE então o RE por padrão. Fim da regra. <br>
+LocalTax1IsUsedExampleES=Na Espanha, eles são profissionais sujeitos a algumas seções específicas do IAE espanhol.
+LocalTax1IsNotUsedExampleES=Na Espanha, eles são profissionais e sociedades e sujeito a determinadas seções do IAE espanhol.
+LocalTax2ManagementES=Gestão IRPF
+LocalTax2IsUsedDescES=A taxa de RE por padrão ao criar perspectivas, notas fiscais, ordens etc seguir a regra padrão ativo: <br> Se o vendedor não está sujeito a IRPF, então IRPF por default = 0. Fim da regra. <br> Se o vendedor é submetido a IRPF, em seguida, o IRPF por padrão. Fim da regra. <br>
+LocalTax2IsNotUsedDescES=Por padrão, o IRPF proposta é 0. Fim da regra.
+LocalTax2IsUsedExampleES=Na Espanha, freelancers e profissionais independentes que prestam serviços e empresas que escolheram o sistema fiscal de módulos.
+LocalTax2IsNotUsedExampleES=Na Espanha, eles são bussines não sujeitas ao regime fiscal dos módulos.
CalcLocaltax=Relatorio
CalcLocaltax1ES=Vendas - Compras
CalcLocaltax1Desc=Relatorios de taxas locais são calculados pela differença entre taxas locais de venda e taxas locais de compra
@@ -810,92 +562,41 @@ CalcLocaltax2ES=Compras
CalcLocaltax2Desc=Relatorio de taxas locais e o total de taxas locais nas compras
CalcLocaltax3ES=Vendas
CalcLocaltax3Desc=Relatorio de taxas locais e o total de taxas locais de vendas
-LabelUsedByDefault=Etiqueta que se utilizará se não se encontra tradução para este código
-LabelOnDocuments=Etiqueta sobre documentos
NbOfDays=N� de Dias
-AtEndOfMonth=No Fim de Mês
-Offset=Deslocado
AlwaysActive=Sempre Ativo
UpdateRequired=Parâmetros sistema necessita de uma atualização. Para atualizar click em <a href
-Upgrade=Atualização
MenuUpgrade=Atualização / Estender
-AddExtensionThemeModuleOrOther=Ajustar extensão (tema, módulo, etc.)
-WebServer=Servidor web
-DocumentRootServer=Pasta raiz das páginas web
DataRootServer=Pasta raiz dos arquivos de dados
-IP=IP
-Port=Porta
-VirtualServerName=Nome do servidor virtual
-AllParameters=Todos os parâmetros
-OS=SO
-PhpEnv=Env
-PhpModules=Módulos
-PhpConf=Conf
-PhpWebLink=link Web-PHP
-Pear=Pear
PearPackages=pacotes Pear
Browser=Navegador
-Server=Servidor
-Database=Base de dados
-DatabaseServer=Hospedeiro do banco de dados
-DatabaseName=Nome da base de dados
-DatabasePort=Porta da base de dados
DatabaseUser=Usuário de banco de dados
DatabasePassword=Senha de banco de dados
DatabaseConfiguration=configuração da base de dados
-Tables=Tabelas
-TableName=Nome da tabela
-TableLineFormat=Formato linhas
NbOfRecord=N� Reg.
-Constraints=Constrangimentos
-ConstraintsType=Tipo de constrangimento
ConstraintsToShowOrNotEntry=Constrangimento para mostrar não menu de entrada
-AllMustBeOk=Todos devem ser controlados
-Host=Servidor
-DriverType=Tipo de driver
SummarySystem=Resumo da informação de sistemas ERP
SummaryConst=Lista de todos os parâmetros de configuração dolibarr
SystemUpdate=Atualização do sistema
SystemSuccessfulyUpdate=a sua sistema atualizou-se corretamente
-MenuCompanySetup=Empresa/Instituição
MenuNewUser=Novo Usuário
MenuTopManager=Administração do menu superior
MenuLeftManager=Administração do menu esquerdo
-MenuManager=Administração do menu
-MenuSmartphoneManager=Gestor de menu Smartphone
DefaultMenuTopManager=Administração do menu superior
DefaultMenuLeftManager=Administração do menu esquerdo
-DefaultMenuManager= Gestor de menu padrão
-DefaultMenuSmartphoneManager=Gestor de menu Smartphone
Skin=Tema Visual
DefaultSkin=Tema visual por default
MaxSizeList=Longuitude máxima de listados
DefaultMaxSizeList=Longuitude máxima de listados por default
-MessageOfDay=Mensagem do día
-MessageLogin=Mensagem do login
-PermanentLeftSearchForm=Zona de pesquisa permanente do menu esquerdo
DefaultLanguage=Idioma por default a utilizar (código idioma)
EnableMultilangInterface=Ativar interface Multi Idioma
EnableShowLogo=Mostrar logotipo no menu à esquerda
SystemSuccessfulyUpdated=a sua sitema está atualizado
-CompanyInfo=Informação da Empresa/Instituição
-CompanyIds=Identificação regulamentação
-CompanyName=Nome/Razão social
-CompanyAddress=Morada
-CompanyZip=Código Postal
CompanyTown=Município
-CompanyCountry=País
-CompanyCurrency=Moeda principal
Logo=Logotipo
-DoNotShow=Não mostrar
DoNotSuggestPaymentMode=Não sugerenciar
NoActiveBankAccountDefined=Nenhuma conta bancaria ativa definida
-OwnerOfBankAccount=Titular da conta %s
BankModuleNotActive=O módulo de contas bancarias não se encontra ativado
ShowBugTrackLink=Mostrar link "Senhalar um bug"
-ShowWorkBoard=Mostrar painel de informação na página principal
-Alerts=Alertas
-Delays=Prazos
DelayBeforeWarning=Prazo antes de alerta
DelaysBeforeWarning=Prazos antes de alerta
DelaysOfToleranceBeforeWarning=Prazos de tolerância antes de alerta
@@ -914,22 +615,17 @@ Delays_MAIN_DELAY_MEMBERS=Tolerância de atraso (em dias) antes de alerta sobre
Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerância de atraso (em dias) antes de alerta para cheques depósito para fazer
SetupDescription1=Todas as opções desta área de configuração são opções que permitem configurar a Dolibarr antes de começar a sua utilização.
SetupDescription2=Os 2 Passos indispensáveis da configuração são as 2 primeiras do menu esquerdo: a configuração da empresa/Instituição e a configuração dos módulos:
-SetupDescription3=A configuração <b>Empresa/Instituição</b> a administrar é requerida já que se utiliza a informação para a introdução de dados na maioria das janelas, em inserciones, ou para modificar o comportamento de Dolibarr (como, por Exemplo, das funções que dependem do seu país).
SetupDescription4=A configuração <b>Módulos</b> é indispensável já que Dolibarr não é um ERP/CRM monolítico, é um conjunto de módulos mais ou menos independente. Depois de ativar os módulos que lhe interessem verificar as suas funcionalidades nos menus de Dolibarr.
SetupDescription5=Outros itens do menu gerenciar parâmetros opcionais.
-EventsSetup=Configuração do registo de eventos
-LogEvents=Auditoría da segurança de eventos
-Audit=Auditoría
InfoDolibarr=Infos Dolibarr
-InfoBrowser=Infos Browser
+InfoBrowser=Infos Navegador
InfoOS=Informações do sistema operacional
InfoWebServer=Informações do Web Server
InfoDatabase=Informações da base de dados
InfoPHP=Informações do PHP
InfoPerf=Infos performances
-BrowserName=Browser name
-BrowserOS=Browser OS
-ListEvents=Auditoría de eventos
+BrowserName=Nome do navegador
+BrowserOS=Navegador OS
ListOfSecurityEvents=Listado de eventos de segurança Dolibarr
SecurityEventsPurged=Os eventos de segurança expurgados
LogEventDesc=Pode ativar o registo de eventos de segurança Dolibarr aqui. os administradores podem ver o seu conteúdo a travé de menu <b>ferramentas do sistema - Auditoria</b>.Atenção, esta característica pode consumir uma gran quantidade de dados na base de dados.
@@ -959,13 +655,12 @@ MAIN_MAX_DECIMALS_UNIT=Casas decimais máximas para os preços unitários
MAIN_MAX_DECIMALS_TOT=Casas decimais máximas para os preços totais
MAIN_MAX_DECIMALS_SHOWN=Casas decimais máximas para os valores mostrados em janela (Colocar <b>...</b> depois do máximo quer ver <b>...</b> quando o número se trunque à mostrar em janela)
MAIN_DISABLE_PDF_COMPRESSION=Utilizar a compressão PDF para os Arquivos PDF gerados
-MAIN_ROUNDING_RULE_TOT= Tamanho da faixa de arredondamento (para os países raros em que o arredondamento é feito em outra coisa do que base 10)
+MAIN_ROUNDING_RULE_TOT=Tamanho da faixa de arredondamento (para os países raros em que o arredondamento é feito em outra coisa do que base 10)
UnitPriceOfProduct=Preço líquido unitário de um produto
TotalPriceAfterRounding=Preço total (imposto net / cuba / manhã) após arredondamento
ParameterActiveForNextInputOnly=parâmetro efetivo somente a partir das próximas sessões
NoEventOrNoAuditSetup=não são registrado eventos de segurança. Esto pode ser normal sim a auditoría não ha sido habilitado na página "configuração->segurança->auditoría".
NoEventFoundWithCriteria=não são encontrado eventos de segurança para tais criterios de pesquisa.
-SeeLocalSendMailSetup=Ver a configuração local de sendmail
BackupDesc=Para realizar uma Cópia de segurança completa de Dolibarr, voçê deve:
BackupDesc2=* Guardar o conteúdo da pasta de documentos (<b>%s</b>) que contém todos os Arquivos enviados o gerados (em um zip, por Exemplo).
BackupDesc3=* Guardar o conteúdo de a sua base de dados em um Arquivo de despejo. Para ele pode utilizar o assistente a continuação.
@@ -976,9 +671,8 @@ RestoreDesc=Para restaurar uma Cópia de segurança de Dolibarr, voçê deve:
RestoreDesc2=* Tomar o Arquivo (Arquivo zip, por Exemplo) da pasta dos documentos e Descompactá-lo na pasta dos documentos de uma Nova Instalação de Dolibarr diretorio o na pasta dos documentos desta Instalação (<b>%s</b>).
RestoreDesc3=* Recargar o Arquivo de despejo guardado na base de dados de uma Nova Instalação de Dolibarr o desta Instalação. Atenção, uma vez realizada a Restaurar, deverá utilizar um login/senha de administrador existente ao momento da Cópia de segurança para conectarse. Para restaurar a base de dados na Instalação atual, pode utilizar o assistente a continuação.
RestoreMySQL=importar do MySQL
-ForcedToByAModule= Esta regra é forçado a por um módulo ativado
+ForcedToByAModule=Esta regra é forçado a por um módulo ativado
PreviousDumpFiles=Arquivos de despejo de backup de banco de dados disponível
-WeekStartOnDay=Primeiro dia da semana
RunningUpdateProcessMayBeRequired=A execução do processo de atualização parece ser exigido (Programas versão difere da versão do banco de dado)
YouMustRunCommandFromCommandLineAfterLoginToUser=Você deve executar este comando a partir da linha de comando após o login a um shell com o usuário ou você deve adicionar-W opção no final da linha de comando para fornece a senha.
YourPHPDoesNotHaveSSLSupport=Funções SSL não disponíveis no seu PHP
@@ -992,43 +686,30 @@ MenuUseLayout=Faça cardápio compativel vertical (opção javascript não deve
MAIN_DISABLE_METEO=Desativar vista meteo
TestLoginToAPI=Testar Acesso ao API
ProxyDesc=Algumas características do Dolibarr precisa ter um acesso à Internet ao trabalho. Defina aqui os parâmetros para isso. Se o servidor Dolibarr está atrás de um servidor proxy, esses parâmetros diz Dolibarr como acessar Internet através dele.
-ExternalAccess=Acesso externo
MAIN_PROXY_USE=Usar um servidor proxy (caso contrário, o acesso direto a internet)
MAIN_PROXY_HOST=Nome / Endereço do servidor proxy
MAIN_PROXY_PORT=Porto de servidor proxy
MAIN_PROXY_USER=Entre para usar o servidor proxy
-MAIN_PROXY_PASS=Senha para usar o servidor proxy
DefineHereComplementaryAttributes=Defina aqui todos os atributos, não já disponíveis por padrão, e que pretende ser apoiada por.
-ExtraFields=Atributos complementares
-ExtraFieldsLines=Atributos complementares (linhas)
ExtraFieldsThirdParties=Atributos complementares (clientes)
ExtraFieldsContacts=Atributos complementares (contato / endereço)
-ExtraFieldsMember=Atributos complementares (membro)
-ExtraFieldsMemberType=Atributos complementares (tipo de membro)
ExtraFieldsCustomerOrders=Atributos complementares (ordens)
-ExtraFieldsCustomerInvoices=Atributos complementares (faturas)
ExtraFieldsSupplierOrders=Atributos complementares (ordens)
-ExtraFieldsSupplierInvoices=Atributos complementares (faturas)
-ExtraFieldsProject=Atributos complementares (projetos)
-ExtraFieldsProjectTask=Atributos complementares (tarefas)
ExtraFieldHasWrongValue=Atributo% s tem um valor errado.
AlphaNumOnlyCharsAndNoSpace=apenas alfanuméricos caracteres sem espaço
AlphaNumOnlyLowerCharsAndNoSpace=apenas alfanumérico e minúsculas, sem espaço
SendingMailSetup=Configuração de envios por e-mail
SendmailOptionNotComplete=Atenção, em alguns sistemas Linux, para enviar e-mail de seu e-mail, sendmail instalação execução must contém opção-ba (mail.force_extra_parameters parâmetros no seu arquivo php.ini). Se alguns destinatários não receber e-mails, tentar editar este parâmetro PHP com mail.force_extra_parameters =-ba).
PathToDocuments=Rotas de acesso a documentos
-PathDirectory=Catálogo
SendmailOptionMayHurtBuggedMTA=Recurso para enviar e-mails usando o método "PHP mail direto" irá gerar uma mensagem de correio que pode não ser corretamente analisado por alguns servidores de correio de recepção. Resultado é que alguns e-mails não podem ser lidos por pessoas, alojadas pela thoose plataformas escutas. É caso para alguns provedores de Internet (Ex: Laranja na França). Este não é um problema em Dolibarr nem em PHP, mas para receber servidor de correio. No entanto, pode adicionar a opção MAIN_FIX_FOR_BUGGED_MTA a 1 no setup - outro para modificar Dolibarr para evitar isso. No entanto, você pode experimentar problemas com outros servidores que respeitem rigorosamente o padrão SMTP. A outra solução (recommanded) é usar o método de "biblioteca de tomada de SMTP" que não tem desvantagens.
TranslationSetup=Configuração de tradução
TranslationDesc=Escolha da língua visível na tela pode ser modificado: * A nível mundial a partir do menu strong Home - Setup - Exibição* Para o usuário apenas de guia de exibição do usuário de cartão de usuário (clique sobre o login no topo da tela).
TotalNumberOfActivatedModules=Número total de módulos de recursos ativados:
YouMustEnableOneModule=Você deve, pelo menos, permitir que um módulo
ClassNotFoundIntoPathWarning=A classe não foi encontrado em caminho PHP
-YesInSummer=Sim no verão
OnlyFollowingModulesAreOpenedToExternalUsers=Note-se, apenas seguintes módulos são abertos a usuários externos (o que quer que sejam permissão desses usuários):
SuhosinSessionEncrypt=Armazenamento de sessão criptografada pelo Suhosin
ConditionIsCurrently=Condição é atualmente
-TestNotPossibleWithCurrentBrowsers=A detecção automática não é possível
YouUseBestDriver=Você usa o driverque é o melhor driver disponível atualmente.
YouDoNotUseBestDriver=Você usa drive mas recomendado.
NbOfProductIsLowerThanNoPb=Você tem produtos / serviços somente no banco de dados. Isso não exigida qualquer otimização particular.
@@ -1042,12 +723,9 @@ AddRefInList=Mostrar ao cliente / fornecedor ref em lista (lista ou combobox sel
FieldEdition=Edição de campo
FixTZ=Correção de fuso horário
FillThisOnlyIfRequired=Exemplo: 2 (preencher somente se deslocamento de fuso horário problemas são experientes)
-GetBarCode=Obter código de barras
EmptyNumRefModelDesc=O código é livre. Este código pode ser modificado a qualquer momento.
-##### Module password generation
PasswordGenerationStandard=Devolve uma senha generada por o algoritmo interno Dolibarr: 8 caracteres, números e caracteres em minúsculas mescladas.
PasswordGenerationNone=não oferece Senhas. a senha se introduce manualmente.
-##### Users setup #####
UserGroupSetup=Configuração Módulo Usuários e Grupos
GeneratePassword=Propor uma senha generada
RuleForGeneratedPasswords=Norma para a geração das Senhas Propostas
@@ -1056,33 +734,25 @@ EncryptedPasswordInDatabase=Permitir encriptação das Senhas na base de dados
DisableForgetPasswordLinkOnLogonPage=não mostrar o link "senha esquecida" na página de login
UsersSetup=Configuração do módulo Usuários
UserMailRequired=EMail necessário para criar um novo usuário
-##### Company setup #####
CompanySetup=configuração do módulo empresas
CompanyCodeChecker=Módulo de geração e control dos códigos de Fornecedores (clientes/Fornecedores)
AccountCodeManager=Módulo de geração dos códigos contabíls (clientes/Fornecedores)
ModuleCompanyCodeAquarium=Devolve um código contabíl composto de %s seguido do código Fornecedor de provedor para o código contabíl de provedor, e %s seguido do código Fornecedor de cliente para o código contabíl de cliente.
ModuleCompanyCodePanicum=Devolve um código contabíl vazio.
ModuleCompanyCodeDigitaria=Devolve um código contabíl composto seguindo o código de Fornecedor. o código está formado por caracter0 ' C ' em primeiroa posição seguido dos 5 primeiroos caracteres do código Fornecedor.
-UseNotifications=Usar Notificações
-NotificationsDesc=a função das Notificações permite enviar automaticamente um correio eletrônico para um determinado evento Dolibarr em empresas configuradas para ele
ModelModules=Modelos de documentos
DocumentModelOdt=Gere documentos a partir de modelos OpenDocuments (. ODT ou. Arquivos ODS para OpenOffice, KOffice, TextEdit, ...)
WatermarkOnDraft=Marca d'água sobre o projeto de documento
+JSOnPaimentBill=Ative a função de preenchimento automático de linhas no formulário de pagamento
CompanyIdProfChecker=Regras sobre profissional Ids
-MustBeUnique=Deve ser exclusivo?
MustBeMandatory=Obrigatório para criar terceiros?
MustBeInvoiceMandatory=Obrigatório para validar faturas?
-Miscellaneous=Diversos
-##### Webcal setup #####
WebCalSetup=configuração de link com o calendário Webcalendar
WebCalSyncro=Integrar os eventos Dolibarr em WebCalendar
-WebCalAllways=Sempre, sem consultar
WebCalYesByDefault=Consultar (sim por default)
WebCalNoByDefault=Consultar (não por default)
-WebCalNever=Nunca
WebCalURL=endereço (URL) de acesso ao calendário
WebCalServer=Servidor da base de dados do calendário
-WebCalDatabaseName=Nome da base de dados
WebCalUser=Usuário com acesso e a base
WebCalSetupSaved=os dados de link são guardado corretamente.
WebCalTestOk=A ligação ao servidor no banco de dados com o usuário de sucesso.
@@ -1097,15 +767,11 @@ WebCalAddEventOnStatusBill=Adicionar evento ao calendário ao alterar destado da
WebCalAddEventOnStatusMember=Adicionar evento ao calendário ao alterar destado dos Membros
WebCalUrlForVCalExport=um link de exportação do calendário em formato <b>%s</b> estará disponível na url: %s
WebCalCheckWebcalSetup=a configuração do módulo Webcal pode ser incorreta
-##### Invoices #####
BillsSetup=configuração do módulo Faturas
BillsDate=Data das faturas
BillsNumberingModule=Módulo de numeração de faturas e entregas
BillsPDFModules=Modelo de documento de faturas
CreditNoteSetup=configuração do módulo entregas
-CreditNotePDFModules=Modelo de documento de entregas
-CreditNote=Entrega
-CreditNotes=Entregas
ForceInvoiceDate=Forçar a data de fatura e a data de validação
DisableRepeatable=Desativar as faturas Repetitivas
SuggestedPaymentModesIfNotDefinedInInvoice=Formas de pagamento sugeridas para as faturas senão estão definidas explicitamente
@@ -1114,85 +780,51 @@ SuggestPaymentByRIBOnAccount=Sugerenciar o pagamento por transfência em conta
SuggestPaymentByChequeToAddress=Sugerenciar o pagamento por cheque a
FreeLegalTextOnInvoices=Texto livre em faturas
WatermarkOnDraftInvoices=Marca d'água sobre o projeto de faturas (nenhum se estiver vazio)
-##### Proposals #####
PropalSetup=configuração do módulo Orçamentos
CreateForm=criação formulário
-NumberOfProductLines=Numero de linhas de produtos
-ProposalsNumberingModules=Módulos de numeração de Orçamentos
-ProposalsPDFModules=Modelos de documentos de Orçamentos
ClassifiedInvoiced=Classificar faturado
HideTreadedPropal=Ocultar os Orçamentos processados do listado
AddShippingDateAbility=possibilidade de determinar uma data de entregas
AddDeliveryAddressAbility=possibilidade de selecionar uma endereço de envio
UseOptionLineIfNoQuantity=uma linha de produto/serviço que tem uma quantidade nula se considera como uma Opção
-FreeLegalTextOnProposal=Texto livre em Orçamentos
WatermarkOnDraftProposal=Marca d'água em projetos de propostas comerciais (nenhum se estiver vazio)
-##### Orders #####
OrdersSetup=configuração do módulo pedidos
-OrdersNumberingModules=Módulos de numeração dos pedidos
OrdersModelModule=Modelos de documentos de pedidos
HideTreadedOrders=Esconder as ordens tratados ou cancelados na lista
-ValidOrderAfterPropalClosed=Confirmar o pedido depois de fechar o orçamento, permite não passar por um pedido provisório
-FreeLegalTextOnOrders=Texto livre em pedidos
WatermarkOnDraftOrders=Marca d'água em projetos de ordem (nenhum se estiver vazio)
-##### Clicktodial #####
ClickToDialSetup=configuração do módulo Click To Dial
ClickToDialUrlDesc=Url de chamada fazendo click ao ícone telefone. <br>a 'url completa chamada será: URL?login
-##### Bookmark4u #####
Bookmark4uSetup=configuração do módulo Bookmark4u
-##### Interventions #####
InterventionsSetup=configuração do módulo Intervenções
FreeLegalTextOnInterventions=Texto livre em documentos de intervenção
-FicheinterNumberingModules=Módulos de numeração das fichas de intervenção
-TemplatePDFInterventions=Modelo de documentos das fichas de intervenção
WatermarkOnDraftInterventionCards=Marca d'água em documentos de cartão de intervenção (nenhum se estiver vazio)
-##### Contracts #####
-ContractsSetup=Configuração do módulo Contratos
ContractsNumberingModules=Contratos numeração módulos
TemplatePDFContracts=Modelos de documentos Contratos
FreeLegalTextOnContracts=Texto livre em contratos
WatermarkOnDraftContractCards=Marca d'água em projetos de contratos (nenhum se estiver vazio)
-##### Members #####
MembersSetup=configuração do módulo associações
MemberMainOptions=opções principales
AddSubscriptionIntoAccount=Registar honorários em conta bancaria ou Caixa do módulo bancario
-AdherentLoginRequired= Gerenciar um login para cada membro
AdherentMailRequired=E-Mail obrigatório para criar um membro novo
MemberSendInformationByMailByDefault=Caixa de verificação para enviar o correio de confirmação a os Membros é por default "sí"
-##### LDAP setup #####
LDAPSetup=Configuracón do módulo LDAP
-LDAPGlobalParameters=parâmetros globais
LDAPUsersSynchro=Usuário
-LDAPGroupsSynchro=Grupos
LDAPContactsSynchro=Contatos
-LDAPMembersSynchro=Membros
LDAPSynchronization=sincronização LDAP
LDAPFunctionsNotAvailableOnPHP=as funções LDAP não estão disponíveis na sua PHP
LDAPToDolibarr=LDAP -> Dolibarr
DolibarrToLDAP=Dolibarr -> LDAP
-LDAPNamingAttribute=Chave em LDAP
LDAPSynchronizeUsers=sincronização dos Usuários Dolibarr com LDAP
LDAPSynchronizeGroups=sincronização dos grupos de Usuários Dolibarr com LDAP
LDAPSynchronizeContacts=sincronização dos contatos Dolibarr com LDAP
LDAPSynchronizeMembers=sincronização dos Membros do módulo associações de Dolibarr com LDAP
LDAPTypeExample=OpenLdap, Egroupware o Active Diretory
-LDAPPrimaryServer=Servidor primario
-LDAPSecondaryServer=Servidor secundario
-LDAPServerPort=Porta do servidor
LDAPServerPortExample=Porta por default : 389
-LDAPServerProtocolVersion=Versão de protocolo
LDAPServerUseTLS=Usuário TLS
LDAPServerUseTLSExample=a sua servidor utiliza TLS
-LDAPServerDn=DN do servidor
-LDAPAdminDn=DN do administrador
-LDAPAdminDnExample=DN completo (ej: cn
LDAPPassword=senha do administrador
LDAPUserDn=DN dos Usuário
-LDAPUserDnExample=DN completo (ej: ou
-LDAPGroupDn=DN dos grupos
-LDAPGroupDnExample=DN completo (ej: ou
LDAPServerExample=endereço do servidor (ej: localhost, 192.168.0.2, ldaps://ldap.example.com/)
-LDAPServerDnExample=DN completo (ej: dc
LDAPPasswordExample=senha do administrador
LDAPDnSynchroActive=Sincronização de Usuários e Grupos
LDAPDnSynchroActiveExample=sincronização LDAP vers Dolibarr ó Dolibarr vers LDAP
@@ -1202,25 +834,13 @@ LDAPDnContactActiveExample=sincronização ativada/desativada
LDAPDnMemberActive=sincronização dos Membros
LDAPDnMemberActiveExample=sincronização ativada/desativada
LDAPContactDn=DN dos contatos Dolibarr
-LDAPContactDnExample=DN completo (ej: ou
-LDAPMemberDn=DN dos Membros
-LDAPMemberDnExample=DN completo (ex: ou
-LDAPMemberObjectClassList=Lista de objectClass
LDAPMemberObjectClassListExample=Lista de ObjectClass que definem os atributos de um registo (ej: top,inetOrgPerson o top,user for active diretory)
-LDAPUserObjectClassList=Lista de objectClass
LDAPUserObjectClassListExample=Lista de ObjectClass que definem os atributos de um registo (ej: top,inetOrgPerson o top,user for active diretory)
-LDAPGroupObjectClassList=Lista de objectClass
-LDAPGroupObjectClassListExample=Lista de ObjectClass que definem os atributos de um registo (ej: top,groupOfUniqueNames)
-LDAPContactObjectClassList=Lista de objectClass
LDAPContactObjectClassListExample=Lista de objectClass que definem os atributos de um registo (ej: top,inetOrgPerson o top,user for active diretory)
-LDAPMemberTypeDn=DN dos tipos de Membros
-LDAPMemberTypeDnExample=DN complet (ej: ou
LDAPTestConnect=Teste a login LDAP
LDAPTestSynchroContact=Teste a sincronização de contatos
LDAPTestSynchroUser=Teste a sincronização de Usuário
-LDAPTestSynchroGroup=Teste a sincronização de grupos
-LDAPTestSynchroMember=Teste a sincronização de Membros
-LDAPTestSearch= Teste uma pesquisa LDAP
+LDAPTestSearch=Teste uma pesquisa LDAP
LDAPSynchroOK=Prueba de sincronização realizada corretamente
LDAPSynchroKO=Prueba de sincronização errada
LDAPSynchroKOMayBePermissions=Error da prueba de sincronização. verifique que a login à servidor sea correta e que permite as atualizaciones LDAP
@@ -1229,62 +849,31 @@ LDAPTCPConnectKO=Fallo de login TCP à servidor LDAP (Servidor
LDAPBindOK=Ligue / authentificate ao servidor LDAP sucesso (Server =% s, Port =% s, Admin =% s, Password =% s)
LDAPBindKO=Fallo de login/autentificação à servidor LDAP (Servidor
LDAPUnbindSuccessfull=Desconecte sucesso
-LDAPUnbindFailed=Saida falhada
LDAPConnectToDNSuccessfull=login a DN (%s) realizada
LDAPConnectToDNFailed=Connexión a DN (%s) falhada
-LDAPSetupForVersion3=Servidor LDAP configurado em Versão 3
-LDAPSetupForVersion2=Servidor LDAP configurado em Versão 2
LDAPDolibarrMapping=Mapping Dolibarr
-LDAPLdapMapping=Mapping LDAP
-LDAPFieldLoginUnix=Login (unix)
-LDAPFieldLoginExample=Exemplo : uid
-LDAPFilterConnection=Filtro de pesquisa
-LDAPFilterConnectionExample=Exemplo : &(objectClass
-LDAPFieldLoginSamba=Login (samba, activedirectory)
LDAPFieldLoginSambaExample=Exemplo : samaccountname
-LDAPFieldFullname=Nome completo
-LDAPFieldFullnameExample=Exemplo : cn
LDAPFieldPassword=senha
LDAPFieldPasswordNotCrypted=senha não encriptada
LDAPFieldPasswordCrypted=senha encriptada
-LDAPFieldPasswordExample=Exemplo : userPassword
-LDAPFieldCommonName=Nome comun
-LDAPFieldCommonNameExample=Exemplo : cn
-LDAPFieldName=Nome
-LDAPFieldNameExample=Exemplo : sn
-LDAPFieldFirstName=Nome
LDAPFieldFirstNameExample=Exemplo : givenname
-LDAPFieldMail=E-Mail
-LDAPFieldMailExample=Exemplo : mail
LDAPFieldPhone=telefone Trabalho
LDAPFieldPhoneExample=Exemplo : telephonenumber
LDAPFieldHomePhone=telefone personal
LDAPFieldHomePhoneExample=Exemplo : homephone
LDAPFieldMobile=telefone móvil
LDAPFieldMobileExample=Exemplo : mobile
-LDAPFieldFax=Fax
LDAPFieldFaxExample=Exemplo : facsimiletelephonenumber
LDAPFieldAddress=endereço
LDAPFieldAddressExample=Exemplo : street
LDAPFieldZip=Código Postal
LDAPFieldZipExample=Exemplo : postalcode
LDAPFieldTown=Município
-LDAPFieldTownExample=Exemplo : l
-LDAPFieldCountry=País
-LDAPFieldCountryExample=Exemplo : c
-LDAPFieldDescription=Descrição
LDAPFieldDescriptionExample=Exemplo : description
-LDAPFieldGroupMembers= Os membros do grupo
-LDAPFieldGroupMembersExample= Exemplo: uniqueMember
+LDAPFieldGroupMembersExample=Exemplo: uniqueMember
LDAPFieldBirthdate=data de nascimento
-LDAPFieldBirthdateExample=Exemplo :
-LDAPFieldCompany=Empresa
-LDAPFieldCompanyExample=Exemplo : o
-LDAPFieldSid=SID
LDAPFieldSidExample=Exemplo : objectsid
LDAPFieldEndLastSubscription=data finalização como membro
-LDAPFieldTitle=Posto/Função
-LDAPFieldTitleExample=Exemplo: título
LDAPParametersAreStillHardCoded=Parâmetros LDAP ainda são codificados (na classe de contato)
LDAPSetupNotComplete=configuração LDAP incompleta (a completar em Outras pestanhas)
LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Administrador o senha não indicados. os acessos LDAP serão anônimos e em só leitura.
@@ -1293,7 +882,6 @@ LDAPDescUsers=Esta página permite definir o Nome dos atributos da árvore LDAP
LDAPDescGroups=Esta página permite definir o Nome dos atributos da árvore LDAP para cada informação dos grupos Usuários Dolibarr.
LDAPDescMembers=Esta página permite definir o Nome dos atributos da árvore LDAP para cada informação dos Membros do módulo associações Dolibarr.
LDAPDescValues=os valores de Exemplos se adaptan a <b>OpenLDAP</b> com os schemas carregados: <b>core.schema, cosine.schema, inetorgperson.schema</b>). sim voçê utiliza os a valores sugeridos e OpenLDAP, modifique a sua arquivo de configuração LDAP <b>slapd.conf</b> para tener todos estos schemas ativos.
-ForANonAnonymousAccess=Para um acesso autentificado
PerfDolibarr=Relatório de configuração Desempenho / otimização
YouMayFindPerfAdviceHere=Você vai encontrar nesta página algumas verificações ou conselhos relacionados com o desempenho.
NotInstalled=Não instalado, por que o seu servidor não está mais lento por isso.
@@ -1311,8 +899,6 @@ FilesOfTypeNotCompressed=Arquivos do tipo não são compactados pelo servidor HT
CacheByServer=Cache por servidor
CacheByClient=Cache pelo navegador
CompressionOfResources=A compressão das respostas HTTP
-TestNotPossibleWithCurrentBrowsers=A detecção automática não é possível
-##### Products #####
ProductSetup=configuração do módulo produtos
ServiceSetup=Configuração do módulo Serviços
ProductServiceSetup=Configuração de Produtos e Serviços módulos
@@ -1326,95 +912,52 @@ UseSearchToSelectProduct=Use um formulário de pesquisa para escolher um produto
UseEcoTaxeAbility=Asumir ecotaxa (DEEE)
SetDefaultBarcodeTypeProducts=Tipo de código de barras utilizado por default para os produtos
SetDefaultBarcodeTypeThirdParties=Tipo de código de barras utilizado por default para os Fornecedores
-ProductCodeChecker= Módulo para geração de código do produto e verificação (produto ou serviço)
-ProductOtherConf= A configuração do produto / serviço
-##### Syslog #####
-SyslogSetup=configuração do módulo Syslog
+ProductCodeChecker=Módulo para geração de código do produto e verificação (produto ou serviço)
+ProductOtherConf=A configuração do produto / serviço
SyslogOutput=Saída do log
-SyslogSyslog=Syslog
-SyslogFacility=Facilidade
SyslogLevel=Nível
SyslogSimpleFile=Arquivo
SyslogFilename=Nome e Rota do Arquivo
YouCanUseDOL_DATA_ROOT=pode utilizar DOL_DATA_ROOT/dolibarr.log para um log na pasta 'documentos' de Dolibarr.
ErrorUnknownSyslogConstant=a constante %s não é uma constante syslog conhecida
OnlyWindowsLOG_USER=Somente para Windows suporta LOG_USER
-##### Donations #####
DonationsSetup=configuração do módulo Bolsas
-DonationsReceiptModel=Modelo de recibo de doação
-##### Barcode #####
BarcodeSetup=configuração dos códigos de barra
-PaperFormatModule=Módulos de formatos de impressão
BarcodeEncodeModule=Módulos de codificação dos códigos de barra
-UseBarcodeInProductModule=Utilizar os códigos de barra nos produtos
CodeBarGenerator=gerador do código
ChooseABarCode=nenhum gerador selecionado
-FormatNotSupportedByGenerator=Formato não gerado por este gerador
BarcodeDescEAN8=Códigos de barra tipo EAN8
BarcodeDescEAN13=Códigos de barra tipo EAN13
BarcodeDescUPC=Códigos de barra tipo UPC
BarcodeDescISBN=Códigos de barra tipo ISBN
BarcodeDescC39=Códigos de barra tipo C39
BarcodeDescC128=Códigos de barra tipo C128
-GenbarcodeLocation=Ferramenta de geração de código de barras em linha de pedido (utilizado por o motor phpbar para determinados tipos de códigos barra)
-BarcodeInternalEngine=Motor interno
BarCodeNumberManager=Gerente de auto definir números de código de barras
-##### Prelevements #####
WithdrawalsSetup=configuração do módulo Débitos Diretos
-##### ExternalRSS #####
ExternalRSSSetup=configuração das importações do fluxos RSS
NewRSS=Sindicação de um Novo fluxos RSS
RSSUrl=RSS URL
-RSSUrlExample=Um feed RSS interessante
-##### Mailing #####
-MailingSetup=configuração do módulo E-Mailing
-MailingEMailFrom=E-Mail emissor (From) dos correios enviados por E-Mailing
MailingEMailError=Voltar E-mail (Erros-to) para e-mails com erros
-##### Notification #####
-NotificationSetup=configuração do módulo Notificações
-NotificationEMailFrom=E-Mail emissor (From) dos correios enviados a traves de Notificações
-ListOfAvailableNotifications=Lista de notificações disponíveis (Esta lista depende módulos ativados)
-##### Sendings #####
+NotificationSetup=Configuração do módulo de notificações por e-mail
SendingsSetup=configuração do módulos envios
-SendingsReceiptModel=Modelo da ficha de expedição
SendingsNumberingModules=Expedição de numeração de módulos
SendingsAbility=Fretes pagos pelo cliente
NoNeedForDeliveryReceipts=na maioria dos casos, as entregas utilizam como nota de entregas ao cliente (lista de produtos a enviar), se recebem e assinam por o cliente. Por o tanto, a hoja de entregas de produtos é uma característica duplicada e rara vez é ativada.
-FreeLegalTextOnShippings=Texto livre em embarques
-##### Deliveries #####
-DeliveryOrderNumberingModules=Módulo de numeração dos envios a clientes
DeliveryOrderModel=Modelo de ordem de envio
DeliveriesOrderAbility=Fretes pagos por o cliente
-FreeLegalTextOnDeliveryReceipts=Texto livre em notas de entregas.
-##### FCKeditor #####
AdvancedEditor=Formatação avançada
ActivateFCKeditor=Ativar FCKeditor para :
FCKeditorForCompany=Criação/Edição WYSIWIG da descrição e notas dos Fornecedores
-FCKeditorForProduct=Criação/Edição WYSIWIG da descrição e notas dos produtos/serviços
FCKeditorForProductDetails=Criação/Edição WYSIWIG das linhas de detalhe dos produtos (em pedidos, Orçamentos, faturas, etc.)
-FCKeditorForMailing= Criação/Edição WYSIWIG dos E-Mails
FCKeditorForUserSignature=WYSIWIG criação / edição da assinatura do usuário
FCKeditorForMail=Criação WYSIWIG / edição para todos os emails (exceto Outils-> e-mail)
-##### OSCommerce 1 #####
OSCommerceErrorConnectOkButWrongDatabase=a login se ha estabelecido, mas a base de dados não parece de OSCommerce.
OSCommerceTestOk=a login à servidor '%s' sobre a base '%s' por o Usuário '%s' é correta.
OSCommerceTestKo1=a login à servidor '%s' sobre a base '%s' por o Usuário '%s' não se pode efetuar.
OSCommerceTestKo2=a login à servidor '%s' por o Usuário '%s' ha falhado.
-##### Stock #####
-StockSetup=configuração do módulo Estoque
-UserWarehouse=Utilizar os estoques personais de Usuário
-##### Menu #####
-MenuDeleted=Menu Eliminado
-TreeMenu=Estructura dos menus
-Menus=Menus
-TreeMenuPersonalized=Menus personalizados
-NewMenu=Novo Menu
-MenuConf=Configuração dos menus
Menu=Seleção dos menus
MenuHandler=Gerente de menus
-MenuModule=Módulo origem
-HideUnauthorizedMenu= Esconder menus não autorizadas (cinza)
-DetailId=Identificador do menu
+HideUnauthorizedMenu=Esconder menus não autorizadas (cinza)
DetailMenuHandler=Nome do gerente de menus
DetailMenuModule=Nome do módulo sim a entrada do menu é resultante de um módulo
DetailType=Tipo de menu (superior o izquierdp)
@@ -1425,36 +968,25 @@ DetailLeftmenu=Condição de visualização o não (obsoleto)
DetailEnabled=Condição para mostrar ou não entrada
DetailRight=Condição de visualização completa o cristálida
DetailLangs=Arquivo langs para a tradução do título
-DetailUser=Interno / Externo / Todos
-Target=Alvo
DetailTarget=Objetivo
DetailLevel=Nível (-1:menu superior, 0:principal, >0 menu e submenú)
-ModifMenu=Modificação do menu
-DeleteMenu=Eliminar entrada de menu
ConfirmDeleteMenu=Tem certeza que quer eliminar a entrada de menu <b>%s</b> ?
DeleteLine=Apagar a Linha
ConfirmDeleteLine=Tem certeza que quer eliminar esta linha?
-##### Tax #####
-TaxSetup=Configuração do Módulo Impostos, Cargas Sociais e Dividendos
OptionVatMode=Opção de carga de ICMS
-OptionVATDefault=Cash basis
-OptionVATDebitOption=Accrual basis
+OptionVATDefault=Regime de caixa
+OptionVATDebitOption=Regime de competência
OptionVatDefaultDesc=a carga do ICMS é: <br>-ao envio dos bens <br>-sobre o pagamento por os serviços
OptionVatDebitOptionDesc=a carga do ICMS é: <br>-ao envio dos bens <br>-sobre o faturamento dos serviços
SummaryOfVatExigibilityUsedByDefault=Hora do VTA exigibilidade por padrão de acordo com a opção escolhida:
-OnDelivery=Na entrega
OnPayment=Mediante o pagamento
OnInvoice=Na fatura
SupposedToBePaymentDate=Data de pagamento usado
SupposedToBeInvoiceDate=Data da fatura usado
-Buy=Comprar
-Sell=Vender
InvoiceDateUsed=Data da fatura usado
YourCompanyDoesNotUseVAT=Sua empresa foi definido para não usar de IVA (Home - Configuração - Empresa / Fundação), então não há nenhuma opção de VAT a configuração.
-AccountancyCode=Código de Contabilidade
AccountancyCodeSell=Conta Venda. código
AccountancyCodeBuy=Compre conta. código
-##### Agenda #####
AgendaSetup=Módulo configuração de ações e agenda
PasswordTogetVCalExport=Chave de autorização vcal export link
PastDelayVCalExport=Não exportar evento mais antigo que
@@ -1462,67 +994,49 @@ AGENDA_USE_EVENT_TYPE=Use eventos tipos (geridos em Setup Menu -> Dicionário ->
AGENDA_DEFAULT_FILTER_TYPE=Use automaticamente este tipo de evento no filtro de busca da agenda
AGENDA_DEFAULT_FILTER_STATUS=Use automaticamente este estado no filtro das buscas da agenda
AGENDA_DEFAULT_VIEW=Qual aba voçê quer abrir por padrão quando o menu Agenda e selecionado
-##### ClickToDial #####
ClickToDialDesc=Este módulo permite agregar um ícone depois do número de telefone de contatos Dolibarr. um clic neste ícone, Chama a um servidor com uma URL que se indica a continuação. Esto pode ser usado para Chamar à sistema call center de Dolibarr que pode Chamar à número de telefone em um sistema SIP, por Exemplo.
-##### Point Of Sales (CashDesk) #####
-CashDesk=Caixa
CashDeskSetup=configuração do módulo de Caixa registradora
-CashDeskThirdPartyForSell=Fornecedor genérico a usar para a venda
CashDeskBankAccountForSell=conta de efetivo que se utilizará para as vendas
-CashDeskBankAccountForCheque= Padrão conta para usar a receber pagamentos por cheque
-CashDeskBankAccountForCB= Padrão conta para usar a receber pagamentos por cartões de crédito
-CashDeskIdWareHouse=Almoxarifado que se utiliza para as vendas
-##### Bookmark #####
+CashDeskBankAccountForCheque=Padrão conta para usar a receber pagamentos por cheque
+CashDeskBankAccountForCB=Padrão conta para usar a receber pagamentos por cartões de crédito
BookmarkSetup=Configuração do Módulo de Favoritos
BookmarkDesc=Este módulo lhe permite Gerenciar os links e acessos diretos. também permite Adicionar qualquer página de Dolibarr o link web ao menu de acesso rápido da esquerda.
NbOfBoomarkToShow=Número máximo de marcadores que se mostrará ao menu
-##### WebServices #####
WebServicesSetup=Configuração do módulo Webservices
WebServicesDesc=Ao habilitar este módulo, Dolibarr se tornar um servidor web service para fornecer serviços web diversos.
WSDLCanBeDownloadedHere=Arquivos descritores WSDL dos serviços prestados pode ser baixado aqui
EndPointIs=Clientes SOAP devem enviar seus pedidos para o terminal Dolibarr Disponível em URL
-##### Bank #####
BankSetupModule=Configuração do módulo Banco
FreeLegalTextOnChequeReceipts=Texto livre em recibos de verificação
BankOrderShow=Ordem de apresentação das contas bancárias para os países usando o "número do banco detalhada"
BankOrderGlobal=General
-BankOrderGlobalDesc=Ordem de exibição Geral
BankOrderES=Espanhol
BankOrderESDesc=Ordem de exibição Espanhol
-##### Multicompany #####
MultiCompanySetup=Configuração do módulo Multi-empresa
-##### Suppliers #####
SuppliersSetup=Configuração Módulo Fornecedor
SuppliersCommandModel=Modelo completo de ordem fornecedor (logo. ..)
SuppliersInvoiceModel=Modelo completo da fatura do fornecedor (logo. ..)
SuppliersInvoiceNumberingModel=Faturas de fornecedores de numeração modelos
-##### GeoIPMaxmind #####
GeoIPMaxmindSetup=Configuração do módulo GeoIP Maxmind
PathToGeoIPMaxmindCountryDataFile=Caminho para o arquivo que contém a tradução Maxmind ip país. Exemplos: / Usr / local / share / GeoIP / GeoIP.dat / Usr / share / GeoIP / GeoIP.dat
NoteOnPathLocation=Note-se que o seu ip para o arquivo de dados do país devem estar dentro de um diretório do seu PHP pode ler (Verifique se o seu PHP open_basedir configuração e as permissões do sistema de arquivos).
YouCanDownloadFreeDatFileTo=Você pode baixar uma versão demo gratuita do arquivo país Maxmind GeoIP em.
YouCanDownloadAdvancedDatFileTo=Você também pode baixar uma versão,mais completa, com atualizações, do arquivo país em Maxmind GeoIP.
TestGeoIPResult=Teste de um IP de conversão -> país
-##### Projects #####
ProjectsNumberingModules=Projetos de numeração módulo
ProjectsSetup=Configuração do módulo de Projetos
ProjectsModelModule=Os relatórios do projeto modelo de documento
TasksNumberingModules=Módulo de numeração de Tarefas
TaskModelModule=Relatórios Tarefas modelo de documento
-##### ECM (GED) #####
-ECMSetup = Instalar GED
-ECMAutoTree = Pasta árvore automática e documento
-##### Fiscal Year #####
+ECMSetup =Instalar GED
+ECMAutoTree =Pasta árvore automática e documento
FiscalYears=Anos fiscais
FiscalYear=Ano fiscal
FiscalYearCard=Ficha ano fiscal
-NewFiscalYear=Novo ano fiscal
EditFiscalYear=Editar ano fiscal
OpenFiscalYear=Abrir ano fiscal
CloseFiscalYear=Fechar ano fiscal
DeleteFiscalYear=Remover ano fiscal
ConfirmDeleteFiscalYear=Voçê tem certeza que quer deleitar este ano fical ?
-Opened=Aberto
-Closed=Fechado
-
Format=Formato
+TypePaymentDesc=0: Pagamento para Cliente, 1: Pagamento para Fornecedor, 2: Pagamentos para Clientes e Fornecedores
diff --git a/htdocs/langs/pt_BR/agenda.lang b/htdocs/langs/pt_BR/agenda.lang
index 360b037d5e20ec896db8c02cc312cc6b44552e37..e6bf3c55b2ad66b2126d2a7763a7a895dd6a21e6 100644
--- a/htdocs/langs/pt_BR/agenda.lang
+++ b/htdocs/langs/pt_BR/agenda.lang
@@ -2,85 +2,71 @@
IdAgenda=ID evento
Actions=Eventos
ActionsArea=Área de eventos (Atividades e Tarefas)
-Agenda= Agenda
-Agendas= Agendas
-Calendar= Calendário
-Calendars= Calendários
-LocalAgenda=Calendário local
-AffectedTo= Atribuído à
-DoneBy= Concluído por
-Events= Eventos
+LocalAgenda=Calendário interno
+ActionsOwnedBy=Evento de propriedade do
+DoneBy=Concluído por
+Event=Evento
EventsNb=Numero de eventos
-MyEvents=Meus eventos
-OtherEvents=Outros eventos
-ListOfActions=Lista de Eventos
-Location=Localização
EventOnFullDay=Evento durante todo o dia (s)
-SearchAnAction= Procurar um evento/tarefa
-MenuToDoActions= Todos os eventos incompletos
-MenuDoneActions= Todas os eventos completos
-MenuToDoMyActions= Os meus eventos incompletas
-MenuDoneMyActions= Os meus eventos completos
-ListOfEvents= Lista de eventos Dolibarr
+SearchAnAction=Procurar um evento/tarefa
+MenuToDoActions=Todos os eventos incompletos
+MenuDoneActions=Todas os eventos completos
+MenuToDoMyActions=Os meus eventos incompletas
+MenuDoneMyActions=Os meus eventos completos
+ListOfEvents=Lista de eventos (calendário interno)
ActionsAskedBy=Eventos registrados por
ActionsToDoBy=Eventos atribuídos à
ActionsDoneBy=Eventos concluído por
ActionsForUser=Eventos para o usuário
ActionsForUsersGroup=Eventos para todos os usuários do grupo
-AllMyActions= Todos meus eventos/tarefas
-AllActions= Todas os eventos/tarefas
+AllMyActions=Todos meus eventos/tarefas
+AllActions=Todas os eventos/tarefas
ViewList=Exibir lista
ViewCal=Exibir Calendário
ViewDay=Exibir dia
ViewWeek=Exibir semana
-ViewPerUser=Por usuario
-ViewWithPredefinedFilters= Exibir com filtros predefinidos
-AutoActions= Preenchimento automático
-AgendaAutoActionDesc= Defina aqui quais os eventos que deseja que o Dolibarr adicione automaticamente na sua agenda. Se nada estiver marcado (por padrão), sera incluído só eventos manualmente na agenda.
-AgendaSetupOtherDesc= Esta página fornece opções para permitir a exportação de seus eventos do Dolibarr para um calendário externo (thunderbird, google agenda, ...)
+ViewPerUser=Visão do usuário
+ViewWithPredefinedFilters=Exibir com filtros predefinidos
+AgendaAutoActionDesc=Defina aqui quais os eventos que deseja que o Dolibarr adicione automaticamente na sua agenda. Se nada estiver marcado (por padrão), sera incluído só eventos manualmente na agenda.
+AgendaSetupOtherDesc=Esta página fornece opções para permitir a exportação de seus eventos do Dolibarr para um calendário externo (thunderbird, google agenda, ...)
AgendaExtSitesDesc=Esta página permite importar calendários de fontes externas para sua agenda de eventos no Dolibarr.
-ActionsEvents= Para qual eventos o Dolibarr irá criar uma atividade na agenda automaticamente
-PropalValidatedInDolibarr= Proposta %s validada
-InvoiceValidatedInDolibarr= Fatura %s validada
+ActionsEvents=Para qual eventos o Dolibarr irá criar uma atividade na agenda automaticamente
+PropalValidatedInDolibarr=Proposta %s validada
+InvoiceValidatedInDolibarr=Fatura %s validada
InvoiceBackToDraftInDolibarr=Fatura %s volta ao estado de rascunho
-InvoiceDeleteDolibarr=Fatura %s apagada
-OrderValidatedInDolibarr= Pedido %s validado
+OrderValidatedInDolibarr=Pedido %s validado
OrderApprovedInDolibarr=Pedido %s aprovado
OrderRefusedInDolibarr=Pedido %s recusado
OrderBackToDraftInDolibarr=Pedido %s volta ao estado de rascunho
OrderCanceledInDolibarr=Pedido %s cancelado
-InterventionValidatedInDolibarr=Intervenção %s validada
ProposalSentByEMail=Proposta comercial %s enviada por e-mail
OrderSentByEMail=Pedido do cliente %s enviado por e-mail
InvoiceSentByEMail=Fatura do cliente %s enviada por e-mail
SupplierOrderSentByEMail=Pedido do fornecedor %s enviado por e-mail
SupplierInvoiceSentByEMail=Fatura do fornecedor %s enviada por e-mail
ShippingSentByEMail=Entrega %s enviado por e-mail
-ShippingValidated= Envio %s validado
-InterventionSentByEMail=Intervenção %s enviada por e-mail
-InterventionClassifiedBilled=Intervenção %s classificada como Faturada
-NewCompanyToDolibarr= Fornecedor criado
-DateActionPlannedStart= Data de início do planejamento
-DateActionPlannedEnd= Data final do planejamento
-DateActionDoneStart= Data real de início
-DateActionDoneEnd= Data real de fim
-DateActionStart= Data de Início
-DateActionEnd= Data de término
+ShippingValidated=Envio %s validado
+NewCompanyToDolibarr=Fornecedor criado
+DateActionPlannedStart=Data de início do planejamento
+DateActionPlannedEnd=Data final do planejamento
+DateActionDoneStart=Data real de início
+DateActionDoneEnd=Data real de fim
+DateActionEnd=Data de término
AgendaUrlOptions1=Você também pode adicionar os seguintes parâmetros para filtrar o resultado:
AgendaUrlOptions2=<b>Usuário=%s</b> permitir apenas resultados para atividades atribuídas, criadas ou concluídas pelo usuário <b>%s</b>.
-AgendaUrlOptions3=<b>Usuário=%s</b> permitir resultados apenas para atividades criadas pelo usuário <b>%s</b>
+AgendaUrlOptions3=<b>logina=%s</b> para restringir açoes de propriedade do usuario <b>%s</b>.
AgendaUrlOptions4=<b>Usuário=%s</b> permitir apenas resultados para atividades atribuídas ao usuário <b>%s</b>.
-AgendaUrlOptions5=<b>Usuário=%s</b> não permitir resultados para atividades concluídas pelo usuário <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> para restringir a saida de açoes associadas ao projeto <b>PROJECT_ID</b>.
AgendaShowBirthdayEvents=Visualizar aniversários dos contatos
AgendaHideBirthdayEvents=Esconder aniversários dos contatos
-Busy=Ocupado
ExportDataset_event1=Lista de eventos na agenda
-
-# External Sites ical
-ExportCal=Exportar calendário
-ExtSites=Importar calendários externos
-ExtSitesEnableThisTool=Visualizar calendários externos na agenda
-ExtSitesNbOfAgenda=Número de calendários
+DefaultWorkingDays=Padrão dias úteis por semana (Exemplo: 1-5, 1-6)
+DefaultWorkingHours=Padrão horas de trabalho em dia (Exemplo: 9-18)
+ExtSitesEnableThisTool=Mostrar calendários externos (definidos na configuração global) na agenda. Não afeta calendários externos definidos pelos usuários.
AgendaExtNb=Calendário nr. %s
ExtSiteUrlAgenda=URL para acessar arquivos .ical
ExtSiteNoLabel=Sem descrição
+WorkingTimeRange=Intervalo de tempo trabalhado
+WorkingDaysRange=Intervalo de dias trabalhado
+AddEvent=Criar evento
+MyAvailability=Minha disponibilidade
diff --git a/htdocs/langs/pt_BR/banks.lang b/htdocs/langs/pt_BR/banks.lang
index f66ea39964d9661e68a1ad544dfaf26d098938d3..90bb4e1584c0c553ab94bbab1e39c38e0a2af48a 100644
--- a/htdocs/langs/pt_BR/banks.lang
+++ b/htdocs/langs/pt_BR/banks.lang
@@ -1,11 +1,7 @@
# Dolibarr language file - Source file is en_US - banks
-Bank=Banco
-Banks=Bancos
MenuBankCash=Banco/Caixa
MenuSetupBank=Configuração Banco/Caixa
BankName=Nome do Banco
-FinancialAccount=Conta
-FinancialAccounts=Contas
BankAccount=Conta Bancaria
BankAccounts=Contas Bancarias
AccountRef=Ref. Conta Financeira
@@ -18,59 +14,38 @@ CurrentAccounts=Contas Correntes
SavingAccount=Conta a Prazo
SavingAccounts=Contas a Prazo
ErrorBankLabelAlreadyExists=Etiqueta de Conta Financeira já existente
-BankBalance=Saldo
BankBalanceBefore=Sldo anterior
BankBalanceAfter=Saldo depois
-BalanceMinimalAllowed=Saldo Máximo Autorizado
-BalanceMinimalDesired=Saldo Mínimo Desejado
-InitialBankBalance=Saldo Inicial
-EndBankBalance=Saldo Final
CurrentBalance=Saldo atual
-FutureBalance=Saldo Previsto
ShowAllTimeBalance=Mostrar Balanço Desde do Inicio
AllTime=Do inicio
-Reconciliation=Conciliação
RIB=Conta Bancaria
-IBAN=Identificador IBAN
-BIC=Identificador BIC/SWIFT
StandingOrders=Débitos Diretos
StandingOrder=Domicilio
-Withdrawals=Reembolsos
-Withdrawal=Reembolso
AccountStatement=Extrato da Conta
AccountStatementShort=Extrato
AccountStatements=Extratos das Contas
LastAccountStatements=�ltimos Extratos Bancários
-Rapprochement=Conciliação
IOMonthlyReporting=Relatório Mensal E/S
BankAccountDomiciliation=Domicilio de Conta
BankAccountCountry=Conta do pais
BankAccountOwner=Nome do Proprietário da Conta
BankAccountOwnerAddress=Endereço do Proprietário da Conta
RIBControlError=Se a integridade das verificações de valores falhar. Isto significa que informações para este número de conta não estão completos ou errados (verifique País, números e IBAN).
-CreateAccount=Criar Conta
-NewAccount=Nova Conta
NewBankAccount=Nova Conta Bancaria
NewFinancialAccount=Nova Conta Financeira
MenuNewFinancialAccount=Nova Conta Financeira
NewCurrentAccount=Nova Conta Corrente
NewSavingAccount=Nova Conta de a Prazo
-NewCashAccount=Nova Conta de Caixa
-EditFinancialAccount=Edição Conta
-AccountSetup=Configuração das Contas financeiras
SearchBankMovement=Procurar Registo Bancario
-Debts=Dívidas
LabelBankCashAccount=Etiqueta da Conta ou Caixa
-AccountType=Tipo de Conta
BankType0=Conta Bancaria a Prazo
BankType1=Conta Bancaria Corrente
BankType2=Conta Caixa/Efetivo
IfBankAccount=Se a Conta Bancária
AccountsArea=Área das Contas
AccountCard=Ficha da Conta
-DeleteAccount=Apagar Conta
ConfirmDeleteAccount=Tem certeza que quer eliminar esta Conta?
-Account=Conta
ByCategories=Por Categorias
ByRubriques=Por Rúbricas
BankTransactionByCategories=Registros bancários por rúbricas
@@ -84,25 +59,15 @@ SearchTransaction=Procurar Registo
ListTransactions=Lista Transações
ListTransactionsByCategory=Lista Transações/Categoria
TransactionsToConciliate=Registros a Conciliar
-Conciliable=Conciliável
-Conciliate=Conciliar
-Conciliation=Conciliação
-ConciliationForAccount=Conciliações nesta Conta
IncludeClosedAccount=Incluir Contas Fechadas
OnlyOpenedAccount=Somente Contas Abertas
AccountToCredit=Conta de Crédito
AccountToDebit=Conta de Débito
DisableConciliation=Desativar a função de Conciliação para esta Conta
ConciliationDisabled=Função de Conciliação Desativada
-StatusAccountOpened=Aberta
-StatusAccountClosed=Fechada
-AccountIdShort=Número
EditBankRecord=Editar Registo
-LineRecord=Registo
AddBankRecord=Adicionar Registo
AddBankRecordLong=Realizar um registo manual fora de uma fatura
-ConciliatedBy=Conciliado por
-DateConciliating=Data Conciliação
BankLineConciliated=Registo Conciliado
CustomerInvoicePayment=Pagamento de Cliente
CustomerInvoicePaymentBack=Pagamento do cliente de volta
@@ -113,22 +78,17 @@ FinancialAccountJournal=Diário de Tesouraria da Conta
BankTransfer=Transferencia Bancaria
BankTransfers=Transferências Bancarias
TransferDesc=Ao criar uma transferencia de uma das suas contas bancarias fazia outra, Dolibarr cria os registros contabeis (um de débito em uma Conta e outro de crédito, do mesmo valor, na outra Conta. Se utiliza para os dois registros a mesma etiqueta de transferencia e a mesma data)
-TransferFrom=De
-TransferTo=Para
TransferFromToDone=A transferencia de <b>%s</b> fazia <b>%s</b> de <b>%s</b> %s foi criado.
-CheckTransmitter=Emissor
ValidateCheckReceipt=Validar esta ficha de entregas?
ConfirmValidateCheckReceipt=Tem certeza que quer Confirmar esta ficha (Nenhuma modificação será possível uma vez a ficha este validada)?
DeleteCheckReceipt=Eliminar esta ficha de entregas?
ConfirmDeleteCheckReceipt=Tem certeza que quer eliminar esta ficha?
-BankChecks=Cheques
BankChecksToReceipt=Cheques a Depositar
ShowCheckReceipt=Mostra recibos do deposito com cheque.
NumberOfCheques=N� de Cheques
DeleteTransaction=Eliminar a Transação
ConfirmDeleteTransaction=Tem certeza que quer eliminar esta transação?
ThisWillAlsoDeleteBankRecord=Esto eliminará também os registros bancários gerados
-BankMovements=Movimentos
CashBudget=Orçamento de Tesouraria
PlannedTransactions=Transações Previstas
Graph=Graficos
@@ -138,13 +98,11 @@ TransactionOnTheOtherAccount=Transação Sobre Outra Conta
TransactionWithOtherAccount=Transferencia de Conta
PaymentNumberUpdateSucceeded=Numero de pagamento modificado
PaymentNumberUpdateFailed=Numero de pagamento não foi possível modificar
-PaymentDateUpdateSucceeded=Data de pagamento modificada
PaymentDateUpdateFailed=Data de pagamento não pode ser modificada
Transactions=Transações
BankTransactionLine=Transação Bancária
AllAccounts=Todas as Contas bancarias/de Caixa
BackToAccount=Voltar e a Conta
-ShowAllAccounts=Mostrar para todas as Contas
FutureTransaction=Transação futura. Impossivel conciliar.
SelectChequeTransactionAndGenerate=Selecionar/filtrar cheques a se incluir no recibo de deposito e clickar no "Criar"
InputReceiptNumber=Escolha o relatorio bancario relativo a conciliação. Use um valor numerico (como AAAAMM)
diff --git a/htdocs/langs/pt_BR/bills.lang b/htdocs/langs/pt_BR/bills.lang
index 76381b66dfa96b4b44c598faab0da6adea5ef631..730cdb1ee6d109261ee736ce55123b040d5089e5 100644
--- a/htdocs/langs/pt_BR/bills.lang
+++ b/htdocs/langs/pt_BR/bills.lang
@@ -24,12 +24,11 @@ InvoiceProFormaDesc=<b>Fatura Pro-Forma</b> é uma verdadeira imagem de uma fatu
InvoiceReplacement=Substituição da Fatura
InvoiceReplacementAsk=Substituição da Fatura para Fatura
InvoiceReplacementDesc=A <b>fatura retificada</b> serve para cancelar e para substituir uma fatura existente em que ainda não existe pagamentos.<br><br>Nota: só uma fatura sem nenhum pagamento pode retificar se. Sim esta última não está fechada, passará automaticamente ao estado 'abandonada'.
-InvoiceAvoir=Nota de Crédito
InvoiceAvoirAsk=Nota de Crédito para Corrigir a Fatura
InvoiceAvoirDesc=A <b>Nota de Crédito</b> é uma fatura negativa destinada a compensar um valor de uma fatura que difere do valor realmente pago (por ter pago a mais ou por devolução de produtos, por Exemplo).<br><br>Nota: Tenha em conta que a fatura original a corrigir deve ter sido fechada (' paga' ou ' paga parcialmente ') para poder realizar uma nota de crédito.
invoiceAvoirWithLines=Criar Nota de Crédito conforme a fatura original
-invoiceAvoirWithPaymentRestAmount=Criar Nota de Crédito com o montante dos pagamentos da fatura de origem
-invoiceAvoirLineWithPaymentRestAmount= Nota de Crédito de pagamentos fatura
+invoiceAvoirWithPaymentRestAmount=Cirar nota de credito com restante não pago da fatura original
+invoiceAvoirLineWithPaymentRestAmount=Nota de credito para valor restante não pago
ReplaceInvoice=Retificar a Fatura %s
ReplacementInvoice=Substituição da Fatura
ReplacedByInvoice=Substituído por Fatura %s
@@ -37,11 +36,9 @@ ReplacementByInvoice=Substituído por Fatura
CorrectInvoice=Correção de Fatura %s
CorrectionInvoice=Correção de Fatura
UsedByInvoice=Aplicar sobre a fatura %s
-ConsumedBy=Consumida por
NotConsumed=Sem Consumo
NoReplacableInvoice=Sem Faturas Retificáveis
NoInvoiceToCorrect=Sem Faturas a Corrigir
-InvoiceHasAvoir=Corrigida por um ou mais recibos
CardBill=Ficha Fatura
PredefinedInvoices=Fatura Predefinida
Invoice=Fatura
@@ -55,15 +52,12 @@ SuppliersInvoices=Faturas de Fornecedores
SupplierBill=Fatura de Fornecedor
SupplierBills=Faturas de Fornecedores
Payment=Pagamento
-PaymentBack=Reembolso
Payments=Pagamentos
-PaymentsBack=Reembolsos
PaidBack=Reembolso
DatePayment=Data de Pagamento
DeletePayment=Eliminar o Pagamento
ConfirmDeletePayment=Tem certeza que quer eliminar este pagamento?
ConfirmConvertToReduc=Quer converter este deposito numa redução futura?<br>O valor deste deposito ficará guardado para este cliente. Poderá utiliza-lo para reduzir o valor de uma próxima fatura do cliente.
-SupplierPayments=Pagamentos a Fornecedores
ReceivedPayments=Pagamentos Recebidos
ReceivedCustomersPayments=Pagamentos Recebidos de Cliente
PayedSuppliersPayments=Pagamentos pago ao fornecedores
@@ -73,20 +67,17 @@ PaymentsReports=Relatórios de Pagamentos
PaymentsAlreadyDone=Pagamentos Efetuados
PaymentsBackAlreadyDone=Reembolsos já efetuados
PaymentRule=Regra de pagamento
-PaymentMode=Forma de Pagamento
-PaymentConditions=Tipo de Pagamento
-PaymentConditionsShort=Tipo de Pagamento
PaymentAmount=Valor a Pagar
ValidatePayment=Validar Pagamento
-PaymentHigherThanReminderToPay=Pagamento superior ao resto a pagar
HelpPaymentHigherThanReminderToPay=Atenção, o valor de uma fatura ou mais faturas e maior do que o que resta a pagar.<br>Editar a sua entrada ou confirme e pense em criar uma nota de credito para o excesso recebido por cada fatura paga alem do valor da mesma.
HelpPaymentHigherThanReminderToPaySupplier=Atenção, o valor do pagamento de uma ou mais contas é maior do que o resto a pagar. <br> Edite sua entrada, caso contrário, confirmar.
ClassifyPaid=Clasificar 'pago'
ClassifyPaidPartially=Clasificar 'parcialmente pago'
ClassifyCanceled=Classificar 'Cancelado'
ClassifyClosed=Classificar 'Encerrado'
+ClassifyUnBilled=Classificar "à faturar"
CreateBill=Criar Fatura
-AddBill=Criar Fatura ou Deposito
+AddBill=Criar fatura ou nota de credito
AddToDraftInvoices=Nenhuma Outra Fatura Rascunho
DeleteBill=Deletar Fatura
SearchACustomerInvoice=Procurar uma fatura de cliente
@@ -96,9 +87,8 @@ SendRemindByMail=Enviar Lembrete
DoPayment=Emitir Pagamento
DoPaymentBack=Emitir Reembolso
ConvertToReduc=Converter em Redução Futura
-EnterPaymentReceivedFromCustomer=Adicionar pagamento recebido de cliente
EnterPaymentDueToCustomer=Realizar pagamento de recibos ao cliente
-DisabledBecauseRemainderToPayIsZero=Desativar já que o resto a pagar é 0
+DisabledBecauseRemainderToPayIsZero=Desabilitado porque o restante não pago e zero
Amount=Valor
PriceBase=Preço Base
BillStatus=Status da fatura
@@ -106,19 +96,14 @@ BillStatusDraft=Rascunho (A Confirmar)
BillStatusPaid=Pago
BillStatusPaidBackOrConverted=Pago ou convertido para o desconto
BillStatusConverted=Pago (pronto para fatura final)
-BillStatusCanceled=Abandonada
BillStatusValidated=Validada (A Pagar)
BillStatusStarted=Paga Parcialmente
BillStatusNotPaid=Não paga
BillStatusClosedUnpaid=Fechado (não pago)
BillStatusClosedPaidPartially=Pago (parcialmente)
-BillShortStatusDraft=Rascunho
BillShortStatusPaid=Pago
BillShortStatusPaidBackOrConverted=Processado
BillShortStatusConverted=Tratada
-BillShortStatusCanceled=Abandonada
-BillShortStatusValidated=Validada
-BillShortStatusStarted=Iniciada
BillShortStatusNotPaid=Nao pago
BillShortStatusClosedUnpaid=Fechado
BillShortStatusClosedPaidPartially=Pago (parcialmente)
@@ -132,12 +117,8 @@ ErrorDiscountAlreadyUsed=Erro, desconto já utilizado
ErrorInvoiceAvoirMustBeNegative=Erro, uma fatura de tipo deposito deve ter um valor negativo
ErrorInvoiceOfThisTypeMustBePositive=Erro, uma fatura deste tipo deve ter um valor positivo
ErrorCantCancelIfReplacementInvoiceNotValidated=Erro, não pode cancelar uma fatura que tenha sido substituída por uma outra fatura e que está status rascunho
-BillFrom=Emissor
-BillTo=Enviar a
ActionsOnBill=Ações Sobre a fatura
NewBill=Nova Fatura
-Prélèvements=Débito Direto
-Prélèvements=Débito Direto
LastBills=As %s últimas faturas
LastCustomersBills=As %s últimas faturas a clientes
LastSuppliersBills=As %s últimas faturas de Fornecedores
@@ -155,9 +136,9 @@ ConfirmCancelBill=Tem certeza que quer cancelar esta fatura <b>%s</b> ?
ConfirmCancelBillQuestion=Por qué Razão quer abandonar a fatura?
ConfirmClassifyPaidPartially=Tem certeza de que deseja voltar a fatura: <b> %s </b> ao status de paga ?
ConfirmClassifyPaidPartiallyQuestion=Esta fatura não foi paga em completo. Qual as razoes para fecha-la ?
-ConfirmClassifyPaidPartiallyReasonAvoir=Restante a pagar <b> (%s %s) </ b> é um desconto concedido porque foi feita antes de prazo de pagamento. Regularizar o ICMS, com uma nota de crédito.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Restante a pagar <b> (%s %s) </ b> é um desconto concedido porque foi feita antes de prazo de pagamento. Eu aceito perder o ICMS sobre este desconto.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Restante a pagar <b> (%s %s) </ b> é um desconto concedido porque foi feita antes do prazo de pagamento. Recuperar o ICMS sobre este desconto, sem uma nota de crédito.
+ConfirmClassifyPaidPartiallyReasonAvoir=Valor restante não pago <b>(%s %s)</b> e um desconto porque o pagamento foi effetuado antes do vencimento. eu regulariso o VAT com a nota de credito.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Valor restante não pago <b>(%s %s)</b> e um desconto porque o pagamento foi effetuado antes do vencimento. Eu aceito de perder o valor do VAT neste desconto.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Valor restante não pago <b>(%s %s)</b> e um desconto porque o pagamento foi effetuado antes do vencimento. Eu recupero o valor do VAT neste desconto sem a nota de credito.
ConfirmClassifyPaidPartiallyReasonBadCustomer=Mau cliente
ConfirmClassifyPaidPartiallyReasonProductReturned=Produtos parcialmente devolvidos
ConfirmClassifyPaidPartiallyReasonOther=Valor abandonado por outra razão
@@ -167,9 +148,7 @@ ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use esta opção se todos os outros
ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Um mau cliente, é um cliente que se recusa a pagar a sua dívida.
ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Esta escolha é utilizado quando o pagamento não está completo, porque alguns dos produtos foram devolvidos
ConfirmClassifyPaidPartiallyReasonOtherDesc=Use esta opção se todos os outros não se adequar, por exemplo, na seguinte situação: <br> - pagamento não está completo porque alguns produtos foram enviados de volta <br> - montante reclamado muito importante porque um desconto foi esquecido <br> Em todos os casos, a quantidade deve ser corrigido no sistema de contabilidade, criando uma nota de crédito.
-ConfirmClassifyAbandonReasonOther=Outro
ConfirmClassifyAbandonReasonOtherDesc=Esta eleição será para qualquer outro caso. Por Exemplo a raíz da intenção de Criar uma fatura retificativa.
-ConfirmCustomerPayment=Confirma o processo deste pagamento de <b>%s</b> %s ?
ConfirmSupplierPayment=Confirma o processo deste pagamento de <b>%s</b> %s ?
ConfirmValidatePayment=Tem certeza que quer Confirmar este pagamento (Nenhuma modificação é possível uma vez o pagamento este validado)?
ValidateBill=Confirmar Fatura
@@ -189,18 +168,14 @@ File=Arquivo
AlreadyPaid=Pago
AlreadyPaidBack=Pagamento voltou
AlreadyPaidNoCreditNotesNoDeposits=Já pago (sem notas de crédito e depósitos)
-Abandoned=Abandonada
-RemainderToPay=Falta a Pagar
-RemainderToTake=Falta Cobrar
-RemainderToPayBack=Restante a pagar
-Rest=Pendente
+RemainderToPay=Restante não pago
+RemainderToTake=Valor restante a se levar
+RemainderToPayBack=Valor restante para pagar de volta
AmountExpected=Valor Reclamado
ExcessReceived=Recebido em Excesso
EscompteOffered=Desconto (Pagamento antecipado)
-SendBillRef=Enviar Fatura %s
-SendReminderBillRef=Lembrete Fatura %s
-StandingOrders=Débitos Diretos
-StandingOrder=Débito Direto
+SendBillRef=Confirmação de fatura %s
+SendReminderBillRef=Lembrete de confirmação de fatura %s
NoDraftBills=Nenhuma Fatura Rascunho
NoOtherDraftBills=Nenhuma Outra Fatura Rascunho
NoDraftInvoices=Nenhuma Fatura Rascunho
@@ -208,65 +183,43 @@ RefBill=Ref. Fatura
ToBill=A Faturar
RemainderToBill=Falta Faturar
SendBillByMail=Enviar a fatura por E-Mail
-SendReminderBillByMail=Enviar um lembrete por E-Mail
RelatedCommercialProposals=Orçamentos Associados
-MenuToValid=A Confirmar
DateMaxPayment=Data limite de Pagamento
-DateEcheance=Data Vencimento
DateInvoice=Data da fatura
NoInvoice=Nenhuma Fatura
ClassifyBill=Classificar a Fatura
SupplierBillsToPay=Faturas de Fornecedores a Pagar
CustomerBillsUnpaid=Faturas de Clientes Pendentes de Cobrança
-DispenseMontantLettres=Faturas preparadas por processos mecânicos estão isentas da ordem em letras
-DispenseMontantLettres=Faturas preparadas por processos mecânicos estão isentas da ordem em letras
NonPercuRecuperable=Sem Recuperação
SetConditions=Definir Condições de Pagamento
SetMode=Definir Modo de Pagamento
Billed=Faturado
-RepeatableInvoice=Fatura predefinida
-RepeatableInvoices=Faturas predefinidas
-Repeatable=Predefinida
-Repeatables=Predefinidas
-ChangeIntoRepeatableInvoice=Modificar p/ Predefinida
-CreateRepeatableInvoice=Criar Fatura Predefinida
-CreateFromRepeatableInvoice=Criar a partir de uma fatura predefinida
+RepeatableInvoice=Modelo fatura
+RepeatableInvoices=Modelos da fatura
+Repeatable=Modelo
+Repeatables=Modelos
+ChangeIntoRepeatableInvoice=Converter para modelo de fatura
+CreateRepeatableInvoice=Criar modelo de fatura
+CreateFromRepeatableInvoice=Criar da fatura modelo
CustomersInvoicesAndInvoiceLines=Faturas a clientes e linhas de faturas
CustomersInvoicesAndPayments=Faturas a clientes e pagamentos
ExportDataset_invoice_1=Faturas a clientes e linhas de fatura
ExportDataset_invoice_2=Faturas a clientes e pagamentos
ProformaBill=Fatura Pro-Forma:
-Reduction=Redução
ReductionShort=Desc.
-Reductions=Descontos
ReductionsShort=Desc.
-Discount=Desconto
-Discounts=Descontos
-AddDiscount=Adicionar Desconto
-AddRelativeDiscount=Criar desconto relativo
EditRelativeDiscount=Alterar Desconto Relativo
AddGlobalDiscount=Adicionar Desconto Fixo
EditGlobalDiscounts=Alterar Descontos Globais
-AddCreditNote=Criar nota de crédito
ShowDiscount=Ver o Desconto
ShowReduc=Mostrar a dedução
RelativeDiscount=Desconto Relativo
GlobalDiscount=Desconto Fixo
CreditNote=Depósito
-CreditNotes=Recibos
-Deposit=Depósito
-Deposits=Depósitos
-DiscountFromCreditNote=Desconto resultante do deposito %s
DiscountFromDeposit=Pagamentos a partir de depósito na fatura %s
AbsoluteDiscountUse=Este tipo de crédito não pode ser usado em um projeto antes da sua validação
CreditNoteDepositUse=O projeto deve ser validado para utilizar este tipo de crédito
-NewGlobalDiscount=Novo Desconto fixo
NewRelativeDiscount=Novo desconto relacionado
-NoteReason=Nota/Motivo
-ReasonDiscount=Motivo
-DiscountOfferedBy=Acordado por
-DiscountStillRemaining=Descontos fixos Pendentes
-DiscountAlreadyCounted=Descontos fixos já aplicados
BillAddress=Endereço de Faturamento
HelpEscompte=Um <b>Desconto</b> é um desconto acordado sobre uma fatura dada, a um cliente que realizou o seu pagamento muito antes do vencimiento.
HelpAbandonBadCustomer=Este valor foi esquecido (cliente classificado como devedor) e considera-se como uma perda excepcional.
@@ -280,7 +233,6 @@ InvoiceStatus=Status da Fatura
InvoiceNote=Nota Fatura
InvoicePaid=Fatura paga
PaymentNumber=Número de Pagamento
-RemoveDiscount=Eliminar Desconto
WatermarkOnDraftBill=Marca de água em faturas rascunho (nada se está vazia)
InvoiceNotChecked=Não há notas fiscais selecionadas
CloneInvoice=Clonar Fatura
@@ -295,10 +247,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total de dois novos desconto deve ser igual
ConfirmRemoveDiscount=Você tem certeza que deseja remover este desconto?
RelatedBill=Fatura Anexo
RelatedBills=Faturas Anexos
-
-# PaymentConditions
-PaymentConditionShortRECEP=Pronto Pagamento
-PaymentConditionRECEP=Pronto Pagamento
+LatestRelatedBill=Últimas fatura correspondente
+WarningBillExist=Atenção, um ou mais fatura já existem
PaymentConditionShort30D=30 Dias
PaymentCondition30D=Pagamento a 30 Dias
PaymentConditionShort30DENDMONTH=30 Dias Fim do Mês
@@ -307,43 +257,24 @@ PaymentConditionShort60D=60 Dias
PaymentCondition60D=Pagamento a 60 Dias
PaymentConditionShort60DENDMONTH=60 Dias Fim de Mês
PaymentCondition60DENDMONTH=Pagamento a 60 Dias até ao Fim do Mês
-PaymentConditionShortPT_DELIVERY=Envio
-PaymentConditionPT_DELIVERY=Na entrega
PaymentConditionShortPT_ORDER=Em ordem
PaymentConditionPT_ORDER=Em ordem
-PaymentConditionShortPT_5050=50-50
PaymentConditionPT_5050=50 por cento adiantado, 50 por cento na entrega
FixAmount=Quantidade fixa
VarAmount=Quantidade variável
-# PaymentType
PaymentTypeVIR=Transferência Bancaria
-PaymentTypeShortVIR=Transferência
PaymentTypePRE=Débito Direto Bancario
PaymentTypeShortPRE=Débito Direto
PaymentTypeLIQ=Espécie
-PaymentTypeShortLIQ=Espécies
-PaymentTypeCB=Cartão
-PaymentTypeShortCB=Cartão
-PaymentTypeCHQ=Cheque
-PaymentTypeShortCHQ=Cheque
PaymentTypeTIP=Em Dinheiro
PaymentTypeShortTIP=Em Dinheiro
-PaymentTypeVAD=Pagamento On Line
-PaymentTypeShortVAD=Pagamento On Line
PaymentTypeTRA=Letra
-PaymentTypeShortTRA=Letra
BankDetails=Dados Bancários
BankCode=Código Banco
DeskCode=Código Balcão
BankAccountNumber=Número Conta
-BankAccountNumberKey=Dígito Control
Residence=Domicilio
-IBANNumber=Código IBAN
-IBAN=IBAN
-BIC=BIC/SWIFT
-BICNumber=Código BIC/SWIFT
ExtraInfos=Informações Complementares
-RegulatedOn=Pagar o
ChequeNumber=Cheque N�
ChequeOrTransferNumber=Cheque/Transferência n�
ChequeMaker=Emissor do Cheque
@@ -351,31 +282,22 @@ ChequeBank=Banco do Cheque
NetToBePaid=Neto a Pagar
PhoneNumber=Telf.
FullPhoneNumber=Telefone
-TeleFax=Fax
PrettyLittleSentence=Aceito o pagamento mediante cheques a meu nome dos valores em divida, na qualidade de membro de uma empresa autorizada pela Administração Fiscal.
IntracommunityVATNumber=Número de ICMS Intracomunitario
-PaymentByChequeOrderedTo=Pagamento Mediante Cheque Nominativo a %s enviado a
PaymentByChequeOrderedToShort=Pagamento Mediante Cheque Nominativo a
SendTo=- A Enviar Para
PaymentByTransferOnThisBankAccount=Pagamento Mediante Trasferência Sobre a Conta Bancária Seguinte
VATIsNotUsedForInvoice=* ICMS não aplicável art-293B do CGI
-LawApplicationPart1=Por aplicação da lei 80.335 de 12/05/80
LawApplicationPart2=As mercadoriias permanecem em propiedade de
LawApplicationPart3=Vendedor até cobrança completa de
LawApplicationPart4=Os Seus Preços
-LimitedLiabilityCompanyCapital=SRL com capital de
-UseLine=Aplicar
-UseDiscount=Aplicar Desconto
UseCredit=Utilizar Crédito
UseCreditNoteInInvoicePayment=Reduzir o pagamento com este depósito
-MenuChequeDeposits=Depósito de Cheques
MenuCheques=Administração Cheques
-MenuChequesReceipts=Fichas
NewChequeDeposit=Novo Depósito
ChequesReceipts=Ficha Emissão de Cheques
ChequesArea=Área Emissão de Cheques
ChequeDeposits=Depósito de Cheques
-Cheques=Cheques
CreditNoteConvertedIntoDiscount=Este depósito converteu-se em %s
UsBillingContactAsIncoiveRecipientIfExist=Utilizar o endereço do contato de cliente de faturação da fatura em vez do endereço do Fornecedor como destinatário das faturas
ShowUnpaidAll=Mostrar todas as faturas
@@ -383,17 +305,14 @@ ShowUnpaidLateOnly=Mostrar apenas faturas em Atraso
PaymentInvoiceRef=Pagamento Fatura %s
ValidateInvoice=Validar a fatura
Cash=em dinheiro
-Reported=Atrasado
DisabledBecausePayments=Não é possível uma vez já que existem alguns pagamentos
CantRemovePaymentWithOneInvoicePaid=Não é possível remover o pagamento já que há pelo menos uma fatura classificada como pago
ExpectedToPay=Esperando pagamento
-PayedByThisPayment=Pago
+PayedByThisPayment=Pago
ClosePaidInvoicesAutomatically=Classifique "Paid" todas as faturas padrão ou a substituição inteiramente paga.
ClosePaidCreditNotesAutomatically=Classificar "pagou" todas as notas de crédito totalmente pago de volta.
AllCompletelyPayedInvoiceWillBeClosed=Todos fatura que permanecer sem pagar será automaticamente fechada ao status de "Paid".
-ToMakePayment=Pagar
ToMakePaymentBack=pagar tudo
-ListOfYourUnpaidInvoices=Lista de faturas não pagas
NoteListOfYourUnpaidInvoices=Atenção: Esta lista inclue somente faturas para terceiros para as quais voce esta conectado como vendedor.
RevenueStamp=Selo da receita
YouMustCreateInvoiceFromThird=Esta opção só está disponível ao criar fatura de terceiros
@@ -401,7 +320,6 @@ PDFCrabeDescription=Modelo de fatura completo (ICMS, método de pagamento a most
TerreNumRefModelDesc1=Mostrarr número com formato %syymm-nnnn padrão para faturas e %syymm-nnnn para notas de crédito onde yy é o ano, mm mês e nnnn é uma sequência, sem interrupção e não pode mostrar o valor 0
MarsNumRefModelDesc1=Mostrar número com formato %syymm-nnnn padrão para faturas e %syymm-nnnn para notas de crédito onde yy é o ano, mm mês e nnnn é uma sequência, sem interrupção e não pode mostrar o valor 0
TerreNumRefModelError=O projeto começa começado por $syymm já existe e não é compatível com este modelo de seq�ência. Remova-o ou renomei-o para ativar este módulo.
-##### Types de contacts #####
TypeContact_facture_internal_SALESREPFOLL=Responsável do acompanhamento da fatura do cliente
TypeContact_facture_external_BILLING=Contato fatura cliente
TypeContact_facture_external_SHIPPING=Contato envio cliente
diff --git a/htdocs/langs/pt_BR/bookmarks.lang b/htdocs/langs/pt_BR/bookmarks.lang
index 90abb0ab3230d3deebdfd35a3174d1d715ccf0be..2d4ff9f572e9781e4d10ad7a1527c5b4bd8a1807 100644
--- a/htdocs/langs/pt_BR/bookmarks.lang
+++ b/htdocs/langs/pt_BR/bookmarks.lang
@@ -1,15 +1,9 @@
-# Dolibarr language file - Source file is en_US - marque pages
-AddThisPageToBookmarks=Adicionar esta página aos Favoritos
-Bookmark=Favorito
-Bookmarks=Favoritos
-NewBookmark=Novo Favorito
+# Dolibarr language file - Source file is en_US - bookmarks
ShowBookmark=Visualizar Favorito
OpenANewWindow=Abrir em uma nova janela
-ReplaceWindow=Substituir a janela atual
BookmarkTargetNewWindowShort=Uma nova janela
BookmarkTargetReplaceWindowShort=Na janela atual
BookmarkTitle=Título do favorito
-UrlOrLink=URL
BehaviourOnClick=Comportamento ao clicar em uma URL
CreateBookmark=Criar favorito
SetHereATitleForLink=Definir um título para ao favorito
diff --git a/htdocs/langs/pt_BR/boxes.lang b/htdocs/langs/pt_BR/boxes.lang
index c8d45909f77768a6159fc7b807890f4d45e70326..c1e1dde6f55a4a274cd513019f69bcd88559ad0f 100644
--- a/htdocs/langs/pt_BR/boxes.lang
+++ b/htdocs/langs/pt_BR/boxes.lang
@@ -1,70 +1,44 @@
# Dolibarr language file - Source file is en_US - boxes
-BoxLastRssInfos=Links de informação RSS
-BoxLastProducts=Últimos produtos/serviços
BoxProductsAlertStock=Produtos em alerta de estoque
-BoxLastProductsInContract=Últimos produtos/serviços contratados
BoxLastSupplierBills=Últimas faturas de Fornecedores
BoxLastCustomerBills=Últimas faturas a Clientes
BoxOldestUnpaidCustomerBills=Primeira fatura pendente do cliente
BoxOldestUnpaidSupplierBills=Primeira fatura pendentes do fornecedor
-BoxLastProposals=Últimos Orçamentos
-BoxLastProspects=Últimos clientes potenciais
-BoxLastCustomers=Últimos clientes
-BoxLastSuppliers=Últimos Fornecedores
-BoxLastCustomerOrders=Últimos pedidos
-BoxLastBooks=Últimos books
BoxLastActions=Últimas ações
BoxLastContracts=Últimos contratos
BoxLastContacts=Últimos contatos/endereços
-BoxLastMembers=Últimos membros
BoxFicheInter=Últimas intervenções
BoxCurrentAccounts=Abrir saldo das contas
-BoxSalesTurnover=Volume de negocio
-BoxTotalUnpaidCustomerBills=Total de faturas pendentes de clientes
+BoxTotalUnpaidCustomerBills=Total de faturas pendentes de clientes
BoxTotalUnpaidSuppliersBills=Total de faturas pendentes de fornecedores
-BoxTitleLastBooks=Os %s últimos Favoritos registados
-BoxTitleNbOfCustomers=Número de clientes
BoxTitleLastRssInfos=As %s últimas Infos de %s
BoxTitleLastProducts=Os %s últimos Produtos/Serviços Registados
BoxTitleProductsAlertStock=Produtos em alerta de estoque
-BoxTitleLastCustomerOrders=Os %s últimos pedidos de clientes modificados
-BoxTitleLastSuppliers=Os %s últimos Fornecedores modificados
-BoxTitleLastCustomers=Os %s últimos clientes modificados
BoxTitleLastModifiedSuppliers=Últimos %s fornecedores modificados
BoxTitleLastModifiedCustomers=Últimos clientes
-BoxTitleLastCustomersOrProspects=Os %s últimos clientes ou clientes potenciais registados
-BoxTitleLastPropals=Os %s últimos Orçamentos registados
BoxTitleLastCustomerBills=As %s últimas faturas a clientes registradas
BoxTitleLastSupplierBills=As %s últimas faturas de Fornecedores registradas
-BoxTitleLastProspects=Os %s últimos clientes potenciais modificados
BoxTitleLastModifiedProspects=Últimos clientes potenciais modificados
-BoxTitleLastProductsInContract=Os %s últimos produtos/serviços contratados
BoxTitleLastModifiedMembers=os %s últimos Membros modificados
BoxTitleLastFicheInter=As últimas % s intervenções modificadas
BoxTitleOldestUnpaidCustomerBills=Primeira %s fatura pendente do cliente
BoxTitleOldestUnpaidSupplierBills=Primeira %s fatura pendente do fornecedor
BoxTitleCurrentAccounts=Abrir saldo das contas
-BoxTitleSalesTurnover=Volume de negocio realizado
BoxTitleTotalUnpaidCustomerBills=Faturas de Clientes Pendentes de Cobrança
BoxTitleTotalUnpaidSuppliersBills=Faturas de Fornecedores Pendentes de Pagamento
BoxTitleLastModifiedContacts=Últimos %s contatos/endereços
BoxMyLastBookmarks=Os meus últimos Favoritos
BoxOldestExpiredServices=Primeiro serviços expirados ativos
-BoxLastExpiredServices=Últimos %s contatos com os serviços expirados ativos
+BoxLastExpiredServices=Últimos %s contatos com os serviços expirados ativos
BoxTitleLastActionsToDo=As %s últimas ações a realizar
-BoxTitleLastContracts=Últimos contratos
-BoxTitleLastModifiedDonations=As ultimas %s doações modificadaas
+BoxTitleLastModifiedDonations=As ultimas %s doações modificadaas
BoxTitleLastModifiedExpenses=Últimas despesas modificadas
BoxGlobalActivity=Atividade geral (notas fiscais, propostas, ordens)
FailedToRefreshDataInfoNotUpToDate=Erro na atualização do fluxos RSS. Data da última atualização: %s
LastRefreshDate=Data da última atualização
-NoRecordedBookmarks=Não existem favoritos pessoais. Click aqui para adicionar.
ClickToAdd=Clique aqui para adicionar
-NoRecordedCustomers=Nenhum cliente registado
NoRecordedContacts=Nenhum contato registrado
NoActionsToDo=Sem ações a realizar
-NoRecordedOrders=Sem pedidos de clientes registados
-NoRecordedProposals=Sem Orçamentos registados
NoRecordedInvoices=Sem faturas a clientes registados
NoUnpaidCustomerBills=Cliente sem faturas em aberto
NoRecordedSupplierInvoices=Sem faturas de Fornecedores
@@ -76,16 +50,14 @@ NoContractedProducts=Nenhum Produto/Serviço contratado
NoRecordedContracts=Nenhum contrato registrado
NoRecordedInterventions=Não há intervenções gravadas
BoxLatestSupplierOrders=Últimos pedidos a forcecedores
-BoxTitleLatestSupplierOrders= %s últimos pedidos a forcecedores
+BoxTitleLatestSupplierOrders=%s últimos pedidos a forcecedores
NoSupplierOrder=Nenhum pedido a fornecedor registrado
BoxCustomersInvoicesPerMonth=Faturas de cliente por mês
BoxSuppliersInvoicesPerMonth=Faturas de fornecedor por mês
BoxCustomersOrdersPerMonth=Pedidos de clientes por mês
BoxSuppliersOrdersPerMonth=Pedidos de fornecedor por mês
-BoxProposalsPerMonth=Propostas por mês
NoTooLowStockProducts=Nenhum produto abaixo do limite de estoque
BoxProductDistribution=Produtos / Serviços e distribuição
BoxProductDistributionFor=Distribuição de para
ForCustomersInvoices=Faturas de Clientes
ForCustomersOrders=Ordem de clientes
-ForProposals=Orçamentos
diff --git a/htdocs/langs/pt_BR/cashdesk.lang b/htdocs/langs/pt_BR/cashdesk.lang
index 83670dde415cfd2efa5817e6967094213e3195a1..f2098c9655c6d184673f68828e0a827d39a29779 100644
--- a/htdocs/langs/pt_BR/cashdesk.lang
+++ b/htdocs/langs/pt_BR/cashdesk.lang
@@ -1,40 +1,18 @@
-# Language file - Source file is en_US - cashdesk
-CashDeskMenu=Ponto de venda
-CashDesk=Ponto de venda
+# Dolibarr language file - Source file is en_US - cashdesk
CashDesks=Ponto de vendas
CashDeskBank=Conta Bancaria
-CashDeskBankCash=Conta bancária (dinheiro)
-CashDeskBankCB=Conta bancária (cartão)
-CashDeskBankCheque=Conta bancária (cheque)
-CashDeskWarehouse=Armazém
-CashdeskShowServices=Venda de serviços
-CashDeskProducts=Produtos
CashDeskStock=Estoque
CashDeskOn=Ligado
CashDeskThirdParty=Fornecedor
CashdeskDashboard=Ponto de acesso de venda
-ShoppingCart=Carrinho de compras
NewSell=Nova venda
-BackOffice=Back office
AddThisArticle=Adicione este artigo
RestartSelling=Volte para vendas
SellFinished=Venda finalizada
PrintTicket=Imprimir cupom
-NoProductFound=Nenhum artigo encontrado
-ProductFound=produto encontrado
-ProductsFound=produtos encontrados
-NoArticle=Nenhum artigo
-Identification=Identificação
-Article=Artigo
-Difference=Diferença
TotalTicket=Total do cupom
-NoVAT=Sem IVA para esta venda
Change=Recebido em Excesso
-CalTip=Clique para ver o calendário
CashDeskSetupStock=Você tentou retirar do estoque com a emissão da fatura, mas o usuário não tem permissão para usar o armazém <br> Altere a configuração do módulo de estoque, ou escolha outro armazém
BankToPay=Carregar Conta
ShowCompany=Exibir empresa
-ShowStock=Mostrar armazém
-DeleteArticle=Clique para remover este artigo
FilterRefOrLabelOrBC=Busca (Ref/Etiqueta)
-UserNeedPermissionToEditStockToUsePos=Você tentou retirar do estoque com a emissão da fatura, mas o usuário precisa ter permissão para editar estoque.
diff --git a/htdocs/langs/pt_BR/categories.lang b/htdocs/langs/pt_BR/categories.lang
index afc5bc8a79a57c7f617033f75741d9a3e7db9080..9ea64949849eb0b567331e4c3192b0f49e8ccc83 100644
--- a/htdocs/langs/pt_BR/categories.lang
+++ b/htdocs/langs/pt_BR/categories.lang
@@ -1,85 +1,31 @@
# Dolibarr language file - Source file is en_US - categories
-Category=Categoria
-Categories=Categorias
Rubrique=Rubrica
Rubriques=Rubricas
categories=Categorias
-TheCategorie=A Categoria
-NoCategoryYet=Nenhuma Categoria Deste Tipo Criada
In=Em
-AddIn=Adicionar em
-modify=Modificar
-Classify=Classificar
-CategoriesArea=Área Categorias
-ProductsCategoriesArea=Área Categorias de Produtos e Serviços
-SuppliersCategoriesArea=Área Categorias Fornecedores
-CustomersCategoriesArea=Área Categorias Clientes
ThirdPartyCategoriesArea=Área Categorias de Fornecedores
MembersCategoriesArea=Área categorias membros
ContactsCategoriesArea=Contatos area categorias
-MainCats=Categorias Principais
-SubCats=Sub-Categorias
-CatStatistics=Estatísticas
-CatList=Lista de Categorias
-AllCats=Todas as Categorias
-ViewCat=Ver Categoria
-NewCat=Nova Categoria
-NewCategory=Nova Categoria
-ModifCat=Modificar uma Categoria
-CatCreated=Categoria Criada
-CreateCat=Adicionar uma Categoria
-CreateThisCat=Adicionar esta Categoria
-ValidateFields=Confirmar os campos
NoSubCat=Esta categoria não contém Nenhuma subcategoria.
-SubCatOf=Subcategoria
-FoundCats=Categorias Encontradas
-FoundCatsForName=Categorias Encontradas com o Nome:
-FoundSubCatsIn=Subcategorias Encontradas na Categoria
ErrSameCatSelected=Selecionou a mesma categoria varias vezes
ErrForgotCat=Esqueceu de escolher a categoria
ErrForgotField=Esqueceu de atribuir um campo
ErrCatAlreadyExists=Este nome esta sendo utilizado
-AddProductToCat=Adicionar este produto a uma categoria?
ImpossibleAddCat=Impossível Adicionar a categoria
-ImpossibleAssociateCategory=Impossível associar a categoria
-WasAddedSuccessfully=Foi adicionado com êxito.
ObjectAlreadyLinkedToCategory=O elemento já está associado a esta categoria
-CategorySuccessfullyCreated=A Categoria %s foi inserida com sucesso
-ProductIsInCategories=Este produto/serviço encontra-se nas seguintes categorias
-SupplierIsInCategories=Este fornecedor encontra-se nas seguintes categorias
-CompanyIsInCustomersCategories=Esta empresa encontra-se nas seguintes categorias
-CompanyIsInSuppliersCategories=Esta empresa encontra-se nas seguintes categorias de Fornecedores
MemberIsInCategories=Este membro deve as seguintes categorias de membros
ContactIsInCategories=Este contato pertence as seguentes categorias contatos
-ProductHasNoCategory=Este produto/serviço não se encontra em nenhuma categoria em particular
-SupplierHasNoCategory=Este fornecedor não se encontra em Nenhuma categoria em particular
CompanyHasNoCategory=Esta empresa não se encontra em Nenhuma categoria em particular
MemberHasNoCategory=Este membro nao esta em nenhuma categoria
ContactHasNoCategory=Este contato nao esta em nenhuma categoria
ClassifyInCategory=Esta categoria não contém clientes
-NoneCategory=Nenhuma
-NotCategorized=Sem categoria
-CategoryExistsAtSameLevel=Esta categoria já existe na mesma localização
-ReturnInProduct=Voltar à ficha produto/serviço
-ReturnInSupplier=Voltar à ficha fornecedor
-ReturnInCompany=Voltar à ficha cliente/cliente potencial
ContentsVisibleByAll=O Conteúdo Será Visivel por Todos?
ContentsVisibleByAllShort=Conteúdo visivel por todos
ContentsNotVisibleByAllShort=Conteúdo não visivel por todos
CategoriesTree=Tipos de categoria
-DeleteCategory=Eliminar Categoria
ConfirmDeleteCategory=Tem certeza que quer eliminar esta categoria?
-RemoveFromCategory=Eliminar link com categoria
RemoveFromCategoryConfirm=Tem certeza que quer eliminar o link entre a transação e a categoria?
-NoCategoriesDefined=Nenhuma Categoria Definida
-SuppliersCategoryShort=Categoria Fornecedores
-CustomersCategoryShort=Categoria Clientes
-ProductsCategoryShort=Categoria Produtos
MembersCategoryShort=Categoria de membros
-SuppliersCategoriesShort=Categorias Fornecedores
-CustomersCategoriesShort=Categorias Clientes
-CustomersProspectsCategoriesShort=Cat. Clientes/Potenciais
-ProductsCategoriesShort=Categorias Produtos
MembersCategoriesShort=Categoria de membros
ContactCategoriesShort=Categorias contatos
ThisCategoryHasNoProduct=Esta categoria não contém nenhum produto.
@@ -87,11 +33,6 @@ ThisCategoryHasNoSupplier=Esta categoria não contém a nenhum fornecedor.
ThisCategoryHasNoCustomer=Esta categoria não contém a nenhum cliente.
ThisCategoryHasNoMember=Esta categoria nao contem nenhum membro.
ThisCategoryHasNoContact=Esta categoria nao contem nenhum contato.
-AssignedToCustomer=Atribuir a um cliente
-AssignedToTheCustomer=Atribuido a um cliente
-InternalCategory=Categoria Interna
-CategoryContents=Conteúdo da Categoria
-CategId=Id Categoria
CatSupList=Lista de categorias de fornecedores
CatCusList=Lista de Categorias de Clientes/Perspectivas
CatProdList=Lista de Categorias de Produtos
@@ -101,9 +42,6 @@ CatSupLinks=Linkes entre fornecedores e catogorias
CatCusLinks=Linkes entre clientes/prospetivas e categorias
CatProdLinks=Linkes entre produtos/servicos e categorias
CatMemberLinks=Linkes entre membros e categorias
-CatProdLinks=Linkes entre produtos/servicos e categorias
-CatCusLinks=Linkes entre clientes/prospetivas e categorias
-CatSupLinks=Linkes entre fornecedores e catogorias
DeleteFromCat=Excluir da categoria
DeletePicture=Apagar foto
ConfirmDeletePicture=Confirmar eliminação de fotografias
@@ -111,3 +49,5 @@ ExtraFieldsCategories=atributos complementares
CategoriesSetup=Configuração de categorias
CategorieRecursiv=Ligação com a categoria automaticamente
CategorieRecursivHelp=Se ativado, o produto também será ligada a categoria original quando adicionando em uma subcategoria
+AddProductServiceIntoCategory=Adicione o seguinte produto / serviço
+ShowCategory=Mostrar categoria
diff --git a/htdocs/langs/pt_BR/commercial.lang b/htdocs/langs/pt_BR/commercial.lang
index 1fd54b255ecc713d49f2219a20b48ac386c6408f..68b7321fe1ba8029fa751936f4da875849b4719a 100644
--- a/htdocs/langs/pt_BR/commercial.lang
+++ b/htdocs/langs/pt_BR/commercial.lang
@@ -1,25 +1,16 @@
# Dolibarr language file - Source file is en_US - commercial
-Commercial=Comercial
CommercialArea=Área Comercial
CommercialCard=Ficha Comercial
-CustomerArea=Área de Clientes
-Customer=Cliente
-Customers=Clientes
-Prospect=Cliente Potencial
-Prospects=Clientes Potenciais
DeleteAction=Eliminar um evento/tarefa
NewAction=Novo evento/tarefa
-AddAction=Adicionar evento/tarefa
-AddAnAction=Adicionar um evento/tarefa
-AddActionRendezVous=Criar uma reunião
-Rendez-Vous=Reunião
+AddAction=Criar evento/tarefa
+AddAnAction=Criar um evento/tarefa
+AddActionRendezVous=Criar evento tipo Rendez-vous
ConfirmDeleteAction=Você tem certeza que deseja excluir este evento/tarefa?
CardAction=Ficha de evento
PercentDone=Percentual completo
ActionOnCompany=Tarefa relativa à empresa
ActionOnContact=Tarefa relativa a um contato
-TaskRDV=Reunião
-TaskRDVWith=Reunião com %s
ShowTask=Visualizar tarefa
ShowAction=Visualizar evento
ActionsReport=Relatório de eventos
@@ -33,8 +24,6 @@ ErrorWrongCode=Código Incorreto
NoSalesRepresentativeAffected=Nenhum Comercial Afetado
ShowCustomer=Ver Cliente
ShowProspect=Ver Clientes Potenciais
-ListOfProspects=Lista de Clientes Potenciais
-ListOfCustomers=Lista de Clientes
LastDoneTasks=As %s últimas Ações Efetuadas
LastRecordedTasks=últimas Ações Registradas
LastActionsToDo=As %s últimas Ações não Completadas
@@ -44,11 +33,10 @@ DoneActions=Lista de Ações Realizadas
DoneActionsFor=Lista de Ações Realizadas por %s
ToDoActions=Lista de Ações Incompletas
ToDoActionsFor=Lista de Ações Incompletas de %s
-SendPropalRef=Enviar Orçamento %s
-SendOrderRef=Enviar Pedido %s
+SendPropalRef=Confirmação de proposta comercial %s
+SendOrderRef=Confirmação da ordem %s
StatusNotApplicable=Não aplicavel
StatusActionToDo=A Realizar
-StatusActionDone=Realizado
MyActionsAsked=Ações que Registei
MyActionsToDo=Ações que tenho que fazer
MyActionsDone=Ações que me afetam
@@ -60,31 +48,22 @@ LastProspectToContact=A Contactar
LastProspectContactInProcess=Contato em Curso
LastProspectContactDone=Clientes Potenciais Contactados
DateActionPlanned=Data Planificação
-DateActionDone=Data realização
ActionAskedBy=Ação Questionada por
-ActionAffectedTo=Ação associada a
+ActionAffectedTo=Responsável pelo evento
ActionDoneBy=Ação Realizada por
ActionUserAsk=Registrada por
ErrorStatusCantBeZeroIfStarted=Se o campo '<b>Ficha de Realização</b>' tiver dados a ação está em curso, por isso o campo 'Estado' não pode ser 0%%.
ActionAC_TEL=Chamada Telefônica
ActionAC_FAX=Envio Fax
ActionAC_PROP=Envio Orçamento por Correio
-ActionAC_EMAIL=Envio E-Mail
-ActionAC_RDV=Reunião
ActionAC_INT=Intervenção no lugar
ActionAC_FAC=Envio Fatura por Correio
ActionAC_REL=Lembrete fatura por correio
-ActionAC_CLO=Fechar
ActionAC_EMAILING=Envio mailing massivo
ActionAC_COM=Envio Pedido por Correio
ActionAC_SHIP=Enviar Por E-Mail
ActionAC_SUP_ORD=Enviar pedido de fornecedor por e-mail
ActionAC_SUP_INV=Enviar fatura de fornecedor por e-mail
-ActionAC_OTH=Outro
-ActionAC_OTH_AUTO=Outros (eventos inseridos automaticamente)
-ActionAC_MANUAL=Eventos inseridos manualmente
-ActionAC_AUTO=Eventos inseridos automaticamente
-Stats=Estatisticas de Venda
CAOrder=Ordem CA
FromTo=A partir de %s até %s
MargeOrder=Ordem da Margem
diff --git a/htdocs/langs/pt_BR/companies.lang b/htdocs/langs/pt_BR/companies.lang
index 4c60483423667cf36d99694b532ad59fb6227880..7d3adf0d865ef14342b3ca6f606d371cabe2ff15 100644
--- a/htdocs/langs/pt_BR/companies.lang
+++ b/htdocs/langs/pt_BR/companies.lang
@@ -2,300 +2,128 @@
ErrorCompanyNameAlreadyExists=Nome da empresa %s já existe. Indique outro.
ErrorPrefixAlreadyExists=Prefixo %s já existe. Indique outro.
ErrorSetACountryFirst=Primeiro defina o Pais
-SelectThirdParty=Selecione um Terceiro
-DeleteThirdParty=Excluir um Terceiro
+SelectThirdParty=Selecione um cliente/fornecedor
+DeleteThirdParty=Excluir um cliente/fornecedor
ConfirmDeleteCompany=Tem certeza que quer excluir esta empresa e toda a informação dela pendente?
DeleteContact=Excluir um contato
ConfirmDeleteContact=Tem certeza que quer excluir este contato e toda a sua informação inerente?
-MenuNewThirdParty=Novo Terceiro
-MenuNewCompany=Nova Empresa
-MenuNewCustomer=Novo Cliente
-MenuNewProspect=Novo Cliente Potencial
-MenuNewSupplier=Novo Fornecedor
-MenuNewPrivateIndividual=Novo Particular
-MenuSocGroup=Grupos
-NewCompany=Nova Empresa (Cliente Potencial, Cliente, Fornecedor)
-NewThirdParty=Novo Terceiro (Cliente Potencial, Cliente, Fornecedor)
+MenuNewThirdParty=Novo cliente/fornecedor
+MenuNewProspect=Novo cliente em potencial
+MenuNewSupplier=Novo fornecedor
+NewCompany=Nova Empresa (cliente em potencial, cliente, fornecedor)
+NewThirdParty=Novo cliente/fornecedor (cliente em potencial, cliente, fornecedor)
NewSocGroup=Novo grupo de empresas
-NewPrivateIndividual=Novo Particular (Cliente Potencial, Cliente, Fornecedor)
-CreateDolibarrThirdPartySupplier=Criar um terceiro(Fornecedor)
-ProspectionArea=Área de prospeção
+NewPrivateIndividual=Nova pessoa física (cliente em potencial, cliente, fornecedor)
+CreateDolibarrThirdPartySupplier=Criar um fornecedor
SocGroup=Agrupamento de empresas
-IdThirdParty=ID Terceiro
-IdCompany=Id Empresa
+IdThirdParty=ID do cliente/fornecedor
IdContact=Id Contato
Contacts=Contatos
-ThirdPartyContacts=Contatos de Fornecedores
-ThirdPartyContact=Contato de Fornecedor
+ThirdPartyContacts=Contatos de clientes/fornecedores
+ThirdPartyContact=Contato/Endereço de cliente/fornecedor
StatusContactValidated=Estado do Contato
-Company=Empresa
CompanyName=Razão Social
-Companies=Empresas
CountryIsInEEC=País da Comunidadeee Económica Europeia
-ThirdPartyName=Nome do fornecedor
-ThirdParty=Fornecedor
-ThirdParties=Empresas
-ThirdPartyAll=Fornecedores (Todos)
-ThirdPartyProspects=Clientes Potenciais
-ThirdPartyProspectsStats=Clientes Potenciais
-ThirdPartyCustomers=Clientes
-ThirdPartyCustomersStats=Clientes
-ThirdPartyCustomersWithIdProf12=Clientes com %s ó %s
-ThirdPartySuppliers=Fornecedores
-ThirdPartyType=Tipo de Fornecedor
-Company/Fundation=Empresa/Associação
-Individual=Particular
+ThirdPartyName=Nome do cliente/fornecedor
+ThirdParty=Cliente/Fornecedor
+ThirdParties=Clientes/Fornecedores
+ThirdPartyAll=Clientes/Fornecedores (Todos)
+ThirdPartyProspects=Clientes em potencial
+ThirdPartyProspectsStats=Clientes em potencial
+ThirdPartyType=Tipo de cliente/fornecedor
ToCreateContactWithSameName=Criar automaticamente um contato fisico com a mesma informação
ParentCompany=Casa Mãe
Subsidiary=Subsidiário
Subsidiaries=Subsidiários
NoSubsidiary=Sem subsidiário
-ReportByCustomers=Relatório por cliente
-ReportByQuarter=Relatório por trimestre
-CivilityCode=Código cortesía
RegisteredOffice=Domicilio Social
-Name=Nome
-Lastname=Apelidos
-Firstname=Primeiro Nome
-PostOrFunction=Posto/Função
-UserTitle=Título
-Surname=Pseudonimo
Address=Endereço
-State=Distrito
-Region=Região
-Country=País
CountryCode=Código País
CountryId=ID do país
-Phone=Telefone
-Skype=Skype
Call=Ligar
-Chat=Chat
-PhonePro=Telef. Trabalho
PhonePerso=Telef. Particular
-PhoneMobile=Telemovel
No_Email=Não envie e-mails em massa
-Fax=Fax
Zip=Código Postal
Town=Município
-Web=Web
-Poste= Posição
DefaultLang=Linguagem por padrão
VATIsUsed=Sujeito a ICMS
VATIsNotUsed=Não Sujeito a ICMS
-CopyAddressFromSoc=Preencha o endereço com o endereço do fornecedor
+CopyAddressFromSoc=Preencha com o endereço do cliente/fornecedor
NoEmailDefined=Não tem email definido
-##### Local Taxes #####
-LocalTax1IsUsedES= Sujeito a RE
-LocalTax1IsNotUsedES= Não sujeito a RE
-LocalTax2IsUsedES= Sujeito a IRPF
-LocalTax2IsNotUsedES= Não sujeito a IRPF
-LocalTax1ES=RE
-LocalTax2ES=IRPF
+LocalTax1IsUsedES=Sujeito a RE
+LocalTax1IsNotUsedES=Não sujeito a RE
+LocalTax2IsUsedES=Sujeito a IRPF
+LocalTax2IsNotUsedES=Não sujeito a IRPF
TypeLocaltax1ES=RE Tipo
TypeLocaltax2ES=IRPF Tipo
TypeES=Tipo
-ThirdPartyEMail=%s
WrongCustomerCode=Código cliente incorreto
-WrongSupplierCode=Código fornecedor incorreto
-CustomerCodeModel=Modelo de código cliente
-SupplierCodeModel=Modelo de código fornecedor
-Gencod=Código de barras
-##### Professional ID #####
-ProfId1Short=Prof. id 1
-ProfId2Short=Prof. id 2
-ProfId3Short=Prof. id 3
-ProfId4Short=Prof. id 4
+WrongSupplierCode=Código do fornecedor incorreto
ProfId5Short=Prof. id 5
ProfId6Short=Prof. id 6
-ProfId1=ID profesional 1
-ProfId2=ID profesional 2
-ProfId3=ID profesional 3
-ProfId4=ID profesional 4
ProfId5=ID profesional 5
ProfId6=ID profesional 6
ProfId1AR=Prof Id 1 (CUIT/CUIL)
ProfId2AR=Prof Id 2 (Receitas brutas)
-ProfId3AR=-
-ProfId4AR=-
-ProfId5AR=-
-ProfId6AR=-
-ProfId1AU=ABN
-ProfId2AU=-
-ProfId3AU=-
-ProfId4AU=-
-ProfId5AU=-
-ProfId6AU=-
ProfId1BE=Núm da Ordem
-ProfId2BE=-
-ProfId3BE=-
-ProfId4BE=-
-ProfId5BE=-
-ProfId6BE=-
-ProfId1BR=-
-ProfId2BR=IE (Inscricao Estadual)
-ProfId3BR=IM (Inscricao Municipal)
-ProfId4BR=CPF
-#ProfId5BR=CNAE
-#ProfId6BR=INSS
-ProfId1CH=-
-ProfId2CH=-
-ProfId3CH=Número federado
-ProfId4CH=Núm. Registo de Comércio
-ProfId5CH=-
-ProfId6CH=-
ProfId1CL=Prof Id 1 (R.U.T.)
-ProfId2CL=-
-ProfId3CL=-
-ProfId4CL=-
-ProfId5CL=-
-ProfId6CL=-
ProfId1CO=Prof Id 1 (R.U.T.)
-ProfId2CO=-
-ProfId3CO=-
-ProfId4CO=-
-ProfId5CO=-
-ProfId6CO=-
-ProfId1DE=Prof Id 1 (USt.-IdNr)
ProfId2DE=Prof Id 2 (USt.-Nr)
ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
-ProfId4DE=-
-ProfId5DE=-
-ProfId6DE=-
ProfId1ES=Prof Id 1 (CIF/NIF)
ProfId2ES=Prof Id 2 (Número do seguro social)
ProfId3ES=Prof Id 3 (CNAE)
ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=-
-ProfId6ES=-
-ProfId1FR=SIREN
-ProfId2FR=SIRET
-ProfId3FR=NAF (Ex APE)
-ProfId4FR=RCS/RM
ProfId5FR=-
-ProfId6FR=-
-ProfId1GB=Número Registo
-ProfId2GB=-
-ProfId3GB=SIC
-ProfId4GB=-
-ProfId5GB=-
-ProfId6GB=-
-ProfId1HN=Id prof. 1 (RTN)
-ProfId2HN=-
-ProfId3HN=-
-ProfId4HN=-
-ProfId5HN=-
-ProfId6HN=-
-ProfId1IN=Prof Id 1 (TIN)
ProfId2IN=Prof Id 2 (PAN)
ProfId3IN=Prof Id 3 (Taxa de Serviço)
-ProfId4IN=Prof Id 4
-ProfId5IN=Prof Id 5
-ProfId6IN=-
ProfId1MA=Id prof. 1 (R.C.)
-ProfId2MA=Id prof. 2 (Patente)
ProfId3MA=Id prof. 3 (I.F.)
ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=-
-ProfId6MA=-
ProfId1MX=Prof Id 1 (R.F.C).
ProfId2MX=Prof Id 2 (R..P. IMSS)
ProfId3MX=Prof Id 3 (Carta Profissional)
-ProfId4MX=-
-ProfId5MX=-
-ProfId6MX=-
ProfId1NL=KVK nummer
-ProfId2NL=-
-ProfId3NL=-
ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=-
-ProfId6NL=-
-ProfId1PT=NIPC
-ProfId2PT=Núm. Segurança Social
-ProfId3PT=Num. Reg. Comercial
-ProfId4PT=Conservatória
-ProfId5PT=-
-ProfId6PT=-
-ProfId1SN=RC
-ProfId2SN=NINEA
-ProfId3SN=-
-ProfId4SN=-
-ProfId5SN=-
-ProfId6SN=-
-ProfId1TN=RC
-ProfId2TN=Matrícula Fiscal
-ProfId3TN=Código na Alfandega
-ProfId4TN=CCC
-ProfId5TN=-
-ProfId6TN=-
ProfId1RU=Id prof 1 (I.E.)
ProfId2RU=Id prof 2 (I.M.)
ProfId3RU=Id prof. 3 (CGC)
ProfId4RU=Id prof. 4 (Livre)
-ProfId5RU=-
-ProfId6RU=-
VATIntra=Cadastro Nacional Pessoa Juridica - CNPJ
-VATIntraShort=CNPJ
-VATIntraVeryShort=CNPJ
-VATIntraSyntaxIsValid=Sintaxe Válida
-VATIntraValueIsValid=Valor Válido
-ProspectCustomer=Cliente Potencial/Cliente
-Prospect=Cliente Potencial
-CustomerCard=Ficha de Cliente
-Customer=Cliente
-CustomerDiscount=Desconto Cliente
-CustomerRelativeDiscount=Desconto Cliente Relativo
-CustomerAbsoluteDiscount=Desconto Cliente Fixo
-CustomerRelativeDiscountShort=Desconto Relativo
-CustomerAbsoluteDiscountShort=Desconto Fixo
+ProspectCustomer=Cliente em potencial/Cliente
CompanyHasRelativeDiscount=Este cliente tem um Desconto por default de <b>%s%%</b>
CompanyHasNoRelativeDiscount=Este cliente não tem Descontos relativos por default
CompanyHasAbsoluteDiscount=Este cliente tem <b>%s %s</b> Descontos fixos disponíveis
CompanyHasCreditNote=Este cliente tem <b>%s %s</b> recibos disponíveis
CompanyHasNoAbsoluteDiscount=Este cliente não tem mais Descontos fixos disponíveis
CustomerAbsoluteDiscountAllUsers=Descontos fixos em curso (acordado por todos os Usuário)
-CustomerAbsoluteDiscountMy=Descontos fixos em curso (acordados Pessoalmente)
DefaultDiscount=Desconto por Fefeito
AvailableGlobalDiscounts=Descontos Fixos Disponíveis
-DiscountNone=Nenhuma
-Supplier=Fornecedor
-CompanyList=Lista de Empresas
-AddContact=Criar Contato
-AddContactAddress=Novo Contato/Endereço
+AddContact=Criar contato
+AddContactAddress=Criar contato/endereço
EditContact=Editar contato
EditContactAddress=Editar contato/endereco
Contact=Contato
ContactsAddresses=Contatos/Enderecos
-NoContactDefinedForThirdParty=Nenhum contato definido para este terceiro
-NoContactDefined=Nenhum contato definido para este fornecedor
+NoContactDefinedForThirdParty=Nenhum contato definido para este cliente/fornecedor
+NoContactDefined=Nenhum contato definido
DefaultContact=Contato por Padrao
-AddCompany=Criar Empresa
-AddThirdParty=Criar Fornecedor
-DeleteACompany=Eliminar uma Empresa
-PersonalInformations=Informação Pessoal
-AccountancyCode=Código Contabilidade
-CustomerCode=Código Cliente
-SupplierCode=Código Fornecedor
-CustomerAccount=Conta Cliente
-SupplierAccount=Conta Fornecedor
-CustomerCodeDesc=Código único cliente para cada cliente
-SupplierCodeDesc=Código único fornecedor para cada fornecedor
-RequiredIfCustomer=Requerida se o Fornecedor for Cliente ou Cliente Potencial
-RequiredIfSupplier=Requerida se o Fornecedor for Fornecedor
-ValidityControledByModule=Validação Controlada pelo Módulo
-ThisIsModuleRules=Esta é a regra para este módulo
-LastProspect=último Cliente Potencial
-ProspectToContact=Cliente Potencial a Contactar
-CompanyDeleted=A Empresa "%s" foi Eliminada
+AddCompany=Criar empresa
+AddThirdParty=Criar cliente/fornecedor
+SupplierCode=Código do fornecedor
+SupplierAccount=Conta do fornecedor
+SupplierCodeDesc=Código do fornecedor, único para cada fornecedor
+RequiredIfCustomer=Requerida se for cliente ou cliente em potencial
+RequiredIfSupplier=Obrigatório se for fornecedor
+LastProspect=último cliente em potencial
+ProspectToContact=Cliente em potencial a contatar
ListOfContacts=Lista de Contatos/Endereços
ListOfContactsAddresses=Lista de Contatos/Endereços
ListOfProspectsContacts=Lista de Contatos Clientes Potenciais
ListOfCustomersContacts=Lista de Contatos Clientes
-ListOfSuppliersContacts=Lista de Contatos Fornecedores
-ListOfCompanies=Lista de Empresas
-ListOfThirdParties=Lista de Fornecedores
-ShowCompany=Mostar Empresa
+ListOfSuppliersContacts=Lista de contatos de fornecedores
+ListOfThirdParties=Lista de clientes/fornecedores
ShowContact=Mostrar Contato
-ContactsAllShort=Todos (sem filtro)
ContactType=Tipo de Contato
ContactForOrders=Contato para Pedidos
ContactForProposals=Contato de Orçamentos
@@ -309,68 +137,37 @@ NewContact=Novo Contato
NewContactAddress=Novo Contato/Endereço
LastContacts=Últimos contatos
MyContacts=Meus Contatos
-Phones=Telefones
-Capital=Capital
-CapitalOf=Capital Social de %s
-EditCompany=Modificar Empresa
EditDeliveryAddress=Modificar Endereço de Envio
-ThisUserIsNot=Este usuário nem é um cliente potencial, nem um cliente, nem um fornecedor
-VATIntraCheck=Verificar
+ThisUserIsNot=Este usuário não é um cliente em potencial, nem um cliente, nem um fornecedor
VATIntraCheckDesc=o link <b>%s</b> permite consultar à serviço europeo de control de números de ICMS intracomunitario. Se requer acesso a internet para que o serviço funcione
VATIntraCheckURL=http://www.receita.fazenda.gov.br/pessoajuridica/cnpj/cnpjreva/cnpjreva_solicitacao.asp
VATIntraCheckableOnEUSite=Verificar na web da Comisión Europea
VATIntraManualCheck=pode também realizar uma verificação manual na web europea <a href
ErrorVATCheckMS_UNAVAILABLE=Verificação Impossível. O serviço de verificação não é prestado pelo país membro (%s).
-NorProspectNorCustomer=Nem Cliente, Nem Cliente Potencial
-JuridicalStatus=Forma Jurídica
-Staff=Empregados
-ProspectLevelShort=Cli. Potenc.
-ProspectLevel=Cliente Potencial
-ContactPrivate=Privado
+NorProspectNorCustomer=Nem cliente, nem cliente em potencial
+ProspectLevel=Cliente em potencial
ContactPublic=Compartilhado
-ContactVisibility=Visibilidade
-OthersNotLinkedToThirdParty=Outros, não associado a um Fornecedor
-ProspectStatus=Estado cliente potencial
-PL_NONE=Nenhum
-PL_UNKNOWN=Desconhecida
-PL_LOW=Baixo
-PL_MEDIUM=Medio
-PL_HIGH=Alto
+OthersNotLinkedToThirdParty=Outros, não associado à um cliente/fornecedor
+ProspectStatus=Estado do cliente em potencial
TE_UNKNOWN=-
-TE_STARTUP=Pequena
-TE_GROUP=Grande
-TE_MEDIUM=Media
-TE_ADMIN=Administração Pública
-TE_SMALL=Pequena
-TE_RETAIL=Retalhista
-TE_WHOLE=Grossista
-TE_PRIVATE=Micro
-TE_OTHER=Outro
-StatusProspect-1=Não Contactar
-StatusProspect0=Nunca Contactado
-StatusProspect1=A Contactar
+StatusProspect-1=Não contatar
+StatusProspect1=A contatar
StatusProspect2=Contato em Curso
StatusProspect3=Contato Realizado
-ChangeDoNotContact=Alterar o Estado para ' Não Contactar '
-ChangeNeverContacted=Alterar o Estado para 'Nunca Nontactado'
-ChangeToContact=Alterar o Estado para 'A Contactar'
+ChangeDoNotContact=Alterar o estado para ' Não contatar '
+ChangeToContact=Alterar o estado para 'A contatar'
ChangeContactInProcess=Alterar o Estado para 'Contato em Curso'
ChangeContactDone=Alterar o Estado para 'Contato Realizado'
-ProspectsByStatus=Clientes Potenciais por Estado
+ProspectsByStatus=Clientes em potencial por estado
BillingContact=Contato para Faturação
NbOfAttachedFiles=N de Arquivos Anexos
AttachANewFile=Adicionar um Novo Arquivo
-NoRIB=Nenhuma Conta Definida
-NoParentCompany=Nenhuma
-ExportImport=Importar-Exportar
ExportCardToFormat=Exportar Ficha para o Formato
-ContactNotLinkedToCompany=Contato não Vinculado a um Fornecedor
-DolibarrLogin=Login
-NoDolibarrAccess=Sem Acesso
-ExportDataset_company_1=Terceiros (Empresas/Fondacoes/Pessoas Fisicas) e propriedades
+ContactNotLinkedToCompany=Contato não associado à um cliente/fornecedor
+ExportDataset_company_1=Cilentes/Fornecedores (Empresas/Instituíções/Pessoas Fisicas) e propriedades
ExportDataset_company_2=Contatos de Fornecedor e Atributos
-ImportDataset_company_1=Terceiros (Empresas/Fondacoes/Pessoas Fisicas) e propriedades
-ImportDataset_company_2=Contatos/Enderecos (dos terceiros e nao) e atributos
+ImportDataset_company_1=Clientes/Fornecedores (Empresas/Fundações/Pessoas Físicas) e propriedades
+ImportDataset_company_2=Contatos/Enderecos (de clientes/fornecedores ou não) e atributos
ImportDataset_company_3=Dados Bancários
PriceLevel=Nível de Preços
DeliveriesAddress=Endereço(ões) de Envio
@@ -379,8 +176,8 @@ DeliveryAddressLabel=Etiqueta de Envio
DeleteDeliveryAddress=Eliminar uma Endereço de Envio
ConfirmDeleteDeliveryAddress=? Tem certeza que quer eliminar esta endereço de envio?
NewDeliveryAddress=Nova Endereço de Envio
-AddDeliveryAddress=Adicionar Endereço
-AddAddress=Adicionar Endereço
+AddDeliveryAddress=Criar endereço
+AddAddress=Criar endereço
NoOtherDeliveryAddress=Não Existe Endereço alternatica definidas
SupplierCategory=Categoria de Fornecedor
JuridicalStatus200=Estado Juridico
@@ -389,24 +186,20 @@ ConfirmDeleteFile=? Tem certeza que quer eliminar este Arquivo?
AllocateCommercial=Assinado ao representate de vendas
SelectCountry=Selecionar um País
SelectCompany=Selecionar um Fornecedor
-Organization=Organismo
AutomaticallyGenerated=Gerado Automaticamente
-FiscalYearInformation=Informação do Ano Fiscal
-FiscalMonthStart=Mês de Inicio do Exercício
-YouMustCreateContactFirst=E obrigatorio cadastrar contatos email para um terceiro para ser possivel adicionar notificacoes por email.
+YouMustCreateContactFirst=Você deve cadastrar contatos de e-mail para um cliente/fornecedor para ser possível adicionar notificações por e-mail.
ListSuppliersShort=Lista de Fornecedores
-ListProspectsShort=Lista de Clientes Potenciais
+ListProspectsShort=Lista de clientes em potencial
ListCustomersShort=Lista de Clientes
-ThirdPartiesArea=Area terceiros
-LastModifiedThirdParties=Os ultimos %s terceiros modificados
-UniqueThirdParties=Total de terceiros unicos
-InActivity=Aberto
-ActivityCeased=Fechado
+ThirdPartiesArea=Área de clientes/fornecedores e contatos
+LastModifiedThirdParties=Os ultimos %s clitentes/fornecedores modificados
+UniqueThirdParties=Total de clientes/fornecedores únicos
ActivityStateFilter=Status das atividades
ProductsIntoElements=Lista de produtos para %s
CurrentOutstandingBill=Notas aberta correntes
OutstandingBill=Max. permitido para uma nota aberta
OutstandingBillReached=Chegou ao max permitido para nostas abertas
MonkeyNumRefModelDesc=Devolve um número baixo o formato %syymm-nnnn para os códigos de clientes e %syymm-nnnn para os códigos dos Fornecedores, donde yy é o ano, mm o mês e nnnn um contador seq�êncial sem ruptura e sem Voltar a 0.
-LeopardNumRefModelDesc=Código de cliente/fornecedor livre sem verificação. pode ser modificado em qualquer momento.
ManagingDirectors=Nome do Representante(CEO,Diretor,Presidente...)
+SearchThirdparty=Procurar cliente/fornecedor
+SearchContact=Procurar contato
diff --git a/htdocs/langs/pt_BR/compta.lang b/htdocs/langs/pt_BR/compta.lang
index 807892c89553592128a5bcca5a0b7ef7e170adc8..c50fcd7173ddfbc60ea6bb4520913194bcf0f0a4 100644
--- a/htdocs/langs/pt_BR/compta.lang
+++ b/htdocs/langs/pt_BR/compta.lang
@@ -1,41 +1,22 @@
# Dolibarr language file - Source file is en_US - compta
-Accountancy=Contabilidade
-AccountancyCard=Ficha Contabilidade
-Treasury=Tesouraria
-MenuFinancial=Financeira
TaxModuleSetupToModifyRules=Vá para <a href="%s">configuração do módulo Impostos</a> para modificar regras de cálculo
TaxModuleSetupToModifyRulesLT=Ir para <a href="%s">Configurações da Empresa</a> para modificar as regras de calculação
OptionMode=Opção de Administração Contabilidade
OptionModeTrue=Opção Depositos/Despesas
-OptionModeVirtual=Opção Créditos/Dividas
OptionModeTrueDesc=Neste método, o balanço calcula-se sobre a base das faturas pagas.\nA validade dos valores não está garantida pois a Administração da Contabilidade pasa rigurosamente pelas entradas/saidas das contas mediante as faturas.\nNota : Nesta Versão, Dolibarr utiliza a data da fatura ao estado ' Validada ' e não a data do estado ' paga '.
OptionModeVirtualDesc=neste método, o balanço se calcula sobre a base das faturas validadas. pagas o não, aparecen ao resultado em quanto sejam discolocaçãos.
FeatureIsSupportedInInOutModeOnly=função disponível somente ao modo contas CREDITOS-dividas (Véase a configuração do módulo contas)
VATReportBuildWithOptionDefinedInModule=Os valores aqui apresentados são calculados usando as regras definidas pela configuração do módulo Fiscal.
LTReportBuildWithOptionDefinedInModule=Valores mostrados aqui são calculados usando as regras definidas nas configurações da empresa.
-Param=Parametrização
RemainingAmountPayment=Pagamento montante remanescente:
AmountToBeCharged=O valor total a pagar:
-AccountsGeneral=Contas Gerais
-Account=Conta
-Accounts=Contas
Accountparent=Conta pai
Accountsparent=Contas pai
BillsForSuppliers=Faturas de Fornecedores
Income=Depositos
-Outcome=Despesas
-ReportInOut=Resultado / Exercício
-ReportTurnover=Volume de Negócios
PaymentsNotLinkedToInvoice=pagamentos vinculados a Nenhuma fatura, por o que nenhum Fornecedor
PaymentsNotLinkedToUser=pagamentos não vinculados a um usuário
-Profit=Beneficio
-Balance=Saldo
-Debit=Débito
-Credit=Crédito
Piece=Contabilidade Doc.
-Withdrawal=Levantamento
-Withdrawals=Levantamentos
-AmountHTVATRealReceived=Total Recebido
AmountHTVATRealPaid=líquido pago
VATToPay=ICMS a Pagar
VATReceived=ICMS Recebido
@@ -52,33 +33,14 @@ LT2SupplierES=IRPF de compras
LT1CustomerES=RE vendas
LT1SupplierES=RE compras
VATCollected=ICMS Recuperado
-ToPay=A Pagar
-ToGet=Para restituir
+ToGet=Para restituir
SpecialExpensesArea=Área para todos os pagamentos especiais
-TaxAndDividendsArea=Área Impostos, gastos sociais e dividendos
-SocialContribution=Gasto social
-SocialContributions=Gastos sociais
MenuSpecialExpenses=Despesas especiais
-MenuTaxAndDividends=Impostos e Dividas
-MenuSalaries=Salários
-MenuSocialContributions=Gastos sociais
-MenuNewSocialContribution=Novo gasto
-NewSocialContribution=Novo gasto social
-ContributionsToPay=Gastos por pagar
-AccountancyTreasuryArea=Área Contabilidade/Tesouraria
-AccountancySetup=Configuração Contabilidade
-NewPayment=Novo Pagamento
-Payments=Pagamentos
PaymentCustomerInvoice=Pagamento de fatura do cliente
PaymentSupplierInvoice=Pagamento de fatura do fornecedor
PaymentSocialContribution=pagamento gasto social
PaymentVat=Pagamento ICMS
PaymentSalary=Pagamento de salário
-ListPayment=Lista de pagamentos
-ListOfPayments=Lista de pagamentos
-ListOfCustomerPayments=Lista de pagamentos de clientes
-ListOfSupplierPayments=Lista de pagamentos a Fornecedores
-DatePayment=Data de Pagamento
DateStartPeriod=Período de início e data
DateEndPeriod=Período e data final
NewVATPayment=Novo Pagamento de ICMS
@@ -92,43 +54,27 @@ VATPayment=Pagamento ICMS
VATPayments=Pagamentos ICMS
SocialContributionsPayments=Pagamento de contribuições sociais
ShowVatPayment=Ver Pagamentos ICMS
-TotalToPay=Total a Pagar
TotalVATReceived=Total do ICMS Recebido
-CustomerAccountancyCode=Código contabilidade cliente
-SupplierAccountancyCode=Código contabilidade fornecedor
-AccountNumberShort=Nº de conta
AccountNumber=Nº de conta
-NewAccount=Nova conta
-SalesTurnover=Volume de Negócio
SalesTurnoverMinimum=Volume de negócios mínimo de vendas
ByThirdParties=Por Fornecedor
ByUserAuthorOfInvoice=Por autor da fatura
AccountancyExport=exportação Contabilidade
ErrorWrongAccountancyCodeForCompany=Código contabilidade incorreto para %s
-SuppliersProductsSellSalesTurnover=Volume de negócio gerado por venda de produtos aos Fornecedores
-CheckReceipt=Ficha de cheques
-CheckReceiptShort=Ficha
-NewCheckReceipt=Novo Cheque
-NewCheckDeposit=Novo Deposito
-NewCheckDepositOn=Criar Novo deposito na conta: %s
-NoWaitingChecks=Não existe cheque em espera para depositar.
-DateChequeReceived=Data introdução de dados de recepção cheque
+LastCheckReceiptShort=Ultimos %s cheques recebidos
NbOfCheques=N� de Cheques
-PaySocialContribution=Pagar uma gasto social
ConfirmPaySocialContribution=? Tem certeza que quer classificar esta gasto social como paga?
-DeleteSocialContribution=Eliminar gasto social
ConfirmDeleteSocialContribution=? Tem certeza que quer eliminar esta gasto social?
-ExportDataset_tax_1=gastos sociais e pagamentos
CalcModeVATDebt=<b>Modo% S VAT compromisso da contabilidade% s.</b>
CalcModeVATEngagement=<b>Modo% SVAT sobre os rendimentos e as despesas% s.</b>
CalcModeDebt=Modo <b>% s declarações de dívidas% s </ b> diz <b> Compromisso da contabilidade </ b>.
CalcModeEngagement=Modo <b>% s rendimentos e as despesas% s </ b> contabilidade do caixa <b> </ b>>
-CalcModeLT1= Modo <b>%sRE nas faturas dos clientes - faturas dos fornecedores%s</b>
-CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b>
-CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
-CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
-CalcModeLT2Debt=Mode <b>%sIRPF on customer invoices%s</b>
-CalcModeLT2Rec= Mode <b>%sIRPF on suppliers invoices%s</b>
+CalcModeLT1=Modo <b>%sRE nas faturas dos clientes - faturas dos fornecedores%s</b>
+CalcModeLT1Debt=Modo <b>%sRE nas faturas dos clientes%s</b>
+CalcModeLT1Rec=Modo <b>%sRE nas faturas dos fornecedores%s</b>
+CalcModeLT2=Modo <b>%sIRPF nas faturas de clientes - fornecedores%s</b>
+CalcModeLT2Debt=Modo <b>%sIRPF nas faturas de clientes%s</b>
+CalcModeLT2Rec=Modo <b>%sIRPF nas faturas de fornecedores%s</b>
AnnualSummaryDueDebtMode=Balanço de receitas e despesas, resumo anual
AnnualSummaryInputOutputMode=Balanço de receitas e despesas, resumo anual
AnnualByCompaniesDueDebtMode=balanço de depositos e despesas, desglosado por Fornecedores, em modo <b>%sCréditos-dividas%s</b> chamada <b>Contabilidade de compromisso</b>.
@@ -152,7 +98,6 @@ LT2ReportByQuartersInInputOutputMode=Relatoriopor rata IRPF
VATReportByQuartersInDueDebtMode=Relatório da taxa do IVA cobrado e pago
LT1ReportByQuartersInDueDebtMode=Relatorio por rata RE
LT2ReportByQuartersInDueDebtMode=Relatorio por rata IRPF
-SeeVATReportInInputOutputMode=Ver o Relatório <b>%sIVA pago%s</b> para um modo de cálculo Standard
SeeVATReportInDueDebtMode=Ver o Relatório <b>%sIVA a dever%s</b> para um modo de cálculo com a opção sobre a divida
RulesVATInServices=- No caso dos serviços, o relatório inclui os regulamentos IVA efetivamente recebidas ou emitidas com base na data de pagamento.
RulesVATInProducts=- Para os bens materiais, que inclui as notas fiscais de IVA com base na data da fatura.
@@ -164,18 +109,14 @@ NotUsedForGoods=Bens não utilizados
ProposalStats=As estatísticas sobre as propostas
OrderStats=Estatísticas de comandos
InvoiceStats=As estatísticas sobre as contas
-Dispatch=Repartição
-Dispatched=Repartições
-ToDispatch=A Repartir
ThirdPartyMustBeEditAsCustomer=Fornecedor deve ser definido como um cliente
SellsJournal=Diário de Vendas
PurchasesJournal=Diário de Compras
DescSellsJournal=Diário de Vendas
DescPurchasesJournal=Diário de Compras
-InvoiceRef=Ref. Fatura
CodeNotDef=Não Definida
AddRemind=Exibir o valor disponível
-RemainToDivide= Saldo disponível
+RemainToDivide=Saldo disponível
WarningDepositsNotIncluded=Depósitos faturas não estão incluídos nesta versão com este módulo de contabilidade.
DatePaymentTermCantBeLowerThanObjectDate=Data Prazo de pagamento não pode ser inferior a data da compra ou aquisição
Pcg_version=Versão Pcg
@@ -187,20 +128,19 @@ AccountancyDashboard=Resumo Contabilidade
ByProductsAndServices=Por produtos e serviços
RefExt=Ref externo
ToCreateAPredefinedInvoice=Para criar uma Fatura predefinida, criar uma fatura padrão, em seguida, sem validá-la, clique no botão "Converter para fatura pré-definida".
-LinkedOrder=ligado ao pedido
-ReCalculate=Recalcular
-Mode1=Método 1
-Mode2=Método 2
+LinkedOrder=Atalho para ordem
CalculationRuleDesc=Para calcular o total do VAT, há dois métodos: <br> Método 1 é arredondamento cuba em cada linha, em seguida, soma-los. <br> Método 2 é somando tudo cuba em cada linha, em seguida, o arredondamento resultado. <br> Resultado final pode difere de alguns centavos. O modo padrão é o <b>modo% s.</b>
CalculationRuleDescSupplier=De acordo com o fornecedor, escolher o método adequado aplicar mesma regra de cálculo e obter mesmo resultado esperado pelo seu fornecedor.
TurnoverPerProductInCommitmentAccountingNotRelevant=Relatório Volume de negócios por produto, quando se usa um modo de <b>contabilidade de caixa</b> não é relevante. Este relatório está disponível somente quando utilizar o modo de <b>contabilidade engajamento</b> (ver configuração do módulo de contabilidade).
-CalculationMode=Modo de cálculo
AccountancyJournal=Codigo do jornal fiscal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Código de contabilidade padrão para comprar produtos
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Código de contabilidade padrão para vender produtos
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Código de contabilidade padrão para comprar serviços
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Código de contabilidade padrão para vender serviços
-ACCOUNTING_VAT_ACCOUNT=Código de contabilidade padrão para cobrança do VAT
-ACCOUNTING_VAT_BUY_ACCOUNT=Código de contabilidade padrão para pagar o VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Código Contabilidade por padrão para fornecedores de clientes
-ACCOUNTING_ACCOUNT_SUPPLIER=Código da contabilidade por padrão para fornecedor
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Codigo contavel padrao para compra de produtos
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Codigo contavel padrao para venda de produtos
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Codigo contavel padrao para compra de servicos
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Codigo contavel padrao para venda de serviços
+ACCOUNTING_VAT_ACCOUNT=Codigo contavel padrao para credito VAT
+ACCOUNTING_VAT_BUY_ACCOUNT=Codigo contavel padrao para pagamento do VAT
+ACCOUNTING_ACCOUNT_CUSTOMER=Codigo contavel padrao para clientes
+ACCOUNTING_ACCOUNT_SUPPLIER=Codigo contavel padrao para fornecedores
+CloneTax=Clonar contribuição social
+ConfirmCloneTax=Confirmar clonação da contribuição social
+CloneTaxForNextMonth=Clonar para o proximo mes
diff --git a/htdocs/langs/pt_BR/contracts.lang b/htdocs/langs/pt_BR/contracts.lang
index 6d8f0befe60e7929cea6b5b87daaa18b7cd77cf7..33c7bf3054f1ea7c5043c2b1bc25b3bcb8b6e876 100644
--- a/htdocs/langs/pt_BR/contracts.lang
+++ b/htdocs/langs/pt_BR/contracts.lang
@@ -1,41 +1,28 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Área Contratos
ListOfContracts=Lista de Contratos
-LastContracts=Os últimos %s contratos modificados
AllContracts=Todos os Contratos
ContractCard=Ficha Contrato
ContractStatus=Estado do Contrato
ContractStatusNotRunning=Fora de Serviço
ContractStatusRunning=Em Serviço
-ContractStatusDraft=Rascunho
-ContractStatusValidated=Validado
ContractStatusClosed=Encerrado
ServiceStatusInitial=Inativo
ServiceStatusRunning=Em Serviço
ServiceStatusNotLate=Rodando, nao vencido
ServiceStatusNotLateShort=Nao vencido
ServiceStatusLate=Em Serviço, Expirado
-ServiceStatusLateShort=Expirado
ServiceStatusClosed=Encerrado
ServicesLegend=Legenda para os Serviços
Contracts=Contratos
-Contract=Contrato
NoContracts=Sem Contratos
-MenuServices=Serviços
MenuInactiveServices=Serviços Inativos
MenuRunningServices=Serviços Ativos
-MenuExpiredServices=Serviços Expirados
-MenuClosedServices=Serviços Fechados
-NewContract=Novo Contrato
-AddContract=Criar Contrato
-SearchAContract=Procurar um Contrato
-DeleteAContract=Eliminar um Contrato
-CloseAContract=Fechar um Contrato
+AddContract=Criar contrato
ConfirmDeleteAContract=Tem certeza que quer eliminar este contrato?
ConfirmValidateContract=Tem certeza que quer Confirmar este contrato?
ConfirmCloseContract=Tem certeza que quer Fechar este contrato?
ConfirmCloseService=Tem certeza que quer Fechar este serviço?
-ValidateAContract=Confirmar um contrato
ActivateService=Ativar o serviço
ConfirmActivateService=Tem certeza que quer ativar este serviço em data %s?
RefContract=Referencia contrato
@@ -53,7 +40,6 @@ ListOfRunningContractsLines=Lista de Linhas de Contratos em Serviço
ListOfRunningServices=Lista de Serviços Ativos
NotActivatedServices=Serviços Desativados (Com os Contratos Validados)
BoardNotActivatedServices=Serviços a Ativar (Com os Contratos Validados)
-LastContracts=Os últimos %s contratos modificados
LastActivatedServices=Os %s últimos Serviços Ativados
LastModifiedServices=Os %s últimos Serviços Modificados
EditServiceLine=Edição Linha do Serviço
@@ -79,10 +65,7 @@ CloseAllContracts=Fechar Todos os Contratos
DeleteContractLine=Eliminar a linha do contrato
ConfirmDeleteContractLine=Voce tem certeza que deseja apagar esta linha de contrato ?
MoveToAnotherContract=Mover o serviço a outro contrato deste Fornecedor.
-ConfirmMoveToAnotherContract=Escolhi o contrato e confirmo o alterar de serviço ao presente contrato.
ConfirmMoveToAnotherContractQuestion=Escolha qualquer outro contrato do mesmo Fornecedor, deseja mover este serviço?
-PaymentRenewContractId=Renovação do Serviço (Numero %s)
-ExpiredSince=Expirado desde
RelatedContracts=Contratos relativos
NoExpiredServices=Nao tem servicos ativos vencidos
ListOfServicesToExpireWithDuration=Lista de servicos a vencer em %s dias
@@ -91,10 +74,6 @@ ListOfServicesToExpire=Lista de servicos a vencer
NoteListOfYourExpiredServices=Esta lista contém apenas contratos de serviços de terceiros as quais você está ligado como representante de vendas.
StandardContractsTemplate=Modelo de contratos simples
ContactNameAndSignature=Para %s, nome e assinatura:
-
-##### Types de contacts #####
-TypeContact_contrat_internal_SALESREPSIGN=Comercial assinante do contrato
-TypeContact_contrat_internal_SALESREPFOLL=Comercial seguimento do contrato
TypeContact_contrat_external_BILLING=Contato cliente de faturação do contrato
TypeContact_contrat_external_CUSTOMER=Contato cliente seguimento do contrato
TypeContact_contrat_external_SALESREPSIGN=Contato cliente assinante do contrato
diff --git a/htdocs/langs/pt_BR/cron.lang b/htdocs/langs/pt_BR/cron.lang
index 5e6d6e4b96720f989a8a48eaa9e97a56fecd68b8..36a14dfc527ec13bd71769665ea9498d436c7c70 100644
--- a/htdocs/langs/pt_BR/cron.lang
+++ b/htdocs/langs/pt_BR/cron.lang
@@ -1,41 +1,30 @@
# Dolibarr language file - Source file is en_US - cron
-# About page
-About = Sobre
-CronAbout = Sobre Cron
-CronAboutPage = Pagina sobre Cron
-# Right
-Permission23101 = Ler tarefa agendada
-Permission23102 = Criar/atualizar tarefa agendada
-Permission23103 = Apagar tarefa agendada
-Permission23104 = Executar tarefa agendada
-# Admin
-CronSetup= Configuração do gerenciamento de trabalho agendado
+About =Sobre
+CronAboutPage =Pagina sobre Cron
+Permission23101 =Ler tarefa agendada
+Permission23102 =Criar/atualizar tarefa agendada
+Permission23103 =Apagar tarefa agendada
+CronSetup=Configuração do gerenciamento de trabalho agendado
URLToLaunchCronJobs=URL para checar e iniciar os cron se necessario
OrToLaunchASpecificJob=Ou checkar e iniciar um specifico trabalho
KeyForCronAccess=Chave seguranca para URL que lanca tarefas cron
FileToLaunchCronJobs=Linha de comando para iniciar tarefas agendadas
CronExplainHowToRunUnix=No ambiente Unix você deve usar crontab para executar linha de comando a cada minuto
CronExplainHowToRunWin=No ambiente Microsoft (tm) Windows você pode usar ferramentas tarefa agendada para executar a linha de comando cada minuto
-# Menu
CronJobs=Trabalhos programados
-CronListActive= Lista de trabalhos ativos
-CronListInactive= Lista de trabalhos nao ativos
-CronListActive= Lista de trabalhos ativos
-# Page list
+CronListInactive=Lista de trabalhos nao ativos
CronDateLastRun=Ultimo acionamento
CronLastOutput=Saida do ultimo acionamento
CronLastResult=Codigo do ultimo resultado
-CronListOfCronJobs=Lista de tarefas agendadas
-CronCommand=Comando
CronList=Lista trabalhos
-CronDelete= Apagar tarefas cron
-CronConfirmDelete= Tem certeza que deseja apagar este trabalho cron ?
+CronDelete=Apagar tarefas cron
+CronConfirmDelete=Tem certeza que deseja apagar este trabalho cron ?
CronExecute=Lançar trabalho
-CronConfirmExecute= Tem certeza que quer executar esta tarefa agora ?
-CronInfo= Tarefas permitem de executar aòoes nao planejadas
+CronConfirmExecute=Tem certeza que quer executar esta tarefa agora ?
+CronInfo=Tarefas permitem de executar aòoes nao planejadas
CronWaitingJobs=Trabalhos na espera
CronTask=Trabalho
-CronNone= Nenhum
+CronNone=Nenhum
CronDtStart=Data inicio
CronDtEnd=Data fim
CronDtNextLaunch=Proxima execuçao
@@ -45,20 +34,17 @@ CronClass=Clase
CronMethod=Metodo
CronModule=Modulo
CronAction=Açao
-CronStatus=Estado
CronStatusActive=Ativado
CronStatusInactive=Desativado
CronNoJobs=Nenhum trabalho registrado
-CronPriority=Prioridade
CronLabel=Descriçao
CronNbRun=Nr. execuçao
CronEach=Cada
JobFinished=Trabalho iniciado e terminado
-#Page card
-CronAdd= Adicionar trabalho
-CronHourStart= Hora e data do inicio do trabalho
-CronEvery= E execute cada tarefa
-CronObject= Instancia/Objeto a se criar
+CronAdd=Adicionar trabalho
+CronHourStart=Hora e data do inicio do trabalho
+CronEvery=E execute cada tarefa
+CronObject=Instancia/Objeto a se criar
CronArgs=Parametros
CronSaveSucess=Salvo corretamente
CronNote=Comentario
@@ -68,7 +54,6 @@ CronStatusActiveBtn=Ativar
CronStatusInactiveBtn=Desativar
CronTaskInactive=Este trabalho foi desativado
CronDtLastResult=Data ultimo resultado
-CronId=Id
CronClassFile=Classe (nomearquivo.class.php)
CronModuleHelp=Nome do diretório do módulo Dolibarr (também trabalha com módulo Dolibarr externo). Por exemplo para buscar método do objeto Dolibarr Product /htdocs/<u>produto</u>/class/product.class.php, o valor do módulo é o <i>produto</i>
CronClassFileHelp=O nome do arquivo a ser carregado.<BR>Por exemplo para buscar método do objeto Dolibarr Product /htdocs/produtos/classe/<u>product.class.php</u>, o valor do nome do arquivo de classe é <i>product.class.php</i>
@@ -76,12 +61,9 @@ CronObjectHelp=O nome do objeto a ser carregado. Por exemplo para buscar método
CronMethodHelp=O método de objeto para o lançamento. Por exemplo para buscar método do objeto Dolibarr Product /htdocs/produtos/class/product.class.php, o valor do método é <i>fecth</i>
CronArgsHelp=Os argumentos do método. Por exemplo para buscar método do objeto Product do Dolibarr /htdocs/produto/class/product.class.php, o valor de paramtetros pode ser <i>0, ProductRef</i>
CronCommandHelp=A linha de comando do sistema a se executar.
-# Info
CronInfoPage=Informaçao
-# Common
CronType=Tipo tarefa
CronType_method=Chamar metodo da classe Dolibarr
CronType_command=Comando Shell
-CronMenu=Cron
CronCannotLoadClass=Nao e possivel carregar a classe %s ou o objeto %s
UseMenuModuleToolsToAddCronJobs=Vá ao menu "Principal - Módulo de ferramentas - Lista de trabalhos" para ver e editar a programação dos trabalhos.
diff --git a/htdocs/langs/pt_BR/deliveries.lang b/htdocs/langs/pt_BR/deliveries.lang
index 231eca9935dc37eeada73afeaa254f427d4c65a9..3c9465cd4b3f271b2680b3585ee00b1709136351 100644
--- a/htdocs/langs/pt_BR/deliveries.lang
+++ b/htdocs/langs/pt_BR/deliveries.lang
@@ -1,26 +1,9 @@
# Dolibarr language file - Source file is en_US - deliveries
-Delivery=Envio
-Deliveries=Envios
-DeliveryCard=Ficha Envio
-DeliveryOrder=Ordem de Envio
-DeliveryOrders=Ordens de Envio
-DeliveryDate=Data de Envio
-DeliveryDateShort=Data Envio
-CreateDeliveryOrder=Gerar Ordem de Entrega
-QtyDelivered=Quant. Enviada
-SetDeliveryDate=Indicar a Data de Envio
-ValidateDeliveryReceipt=Confirmar a Nota de Entrega
ValidateDeliveryReceiptConfirm=Tem certeza de que deseja confirmar esta entrega?
DeleteDeliveryReceipt=Apagar Recibo de Entrega
DeleteDeliveryReceiptConfirm=Tem certeza de que deseja apagar o recibo de entrega <b>%s</b> ?
-DeliveryMethod=Método de Envio
TrackingNumber=Nr. de rastreamento
DeliveryNotValidated=Entrega nao validada
-# merou PDF model
-NameAndSignature=Nome e assinatura:
-ToAndDate=Em___________________________________ a ____/_____/__________
GoodStatusDeclaration=Recebi a mercadorias acima em bom estado,
Deliverer=Destinatario:
Sender=Remetente
-Recipient=Destinatário
-ErrorStockIsNotEnough=Não existe estoque suficiente
diff --git a/htdocs/langs/pt_BR/dict.lang b/htdocs/langs/pt_BR/dict.lang
index 0dddb4b8b7445f70fd1dbe685cd0954c3fbd9a27..20fff4ba5e18bb77db6f90e66662749f77577eb2 100644
--- a/htdocs/langs/pt_BR/dict.lang
+++ b/htdocs/langs/pt_BR/dict.lang
@@ -1,318 +1,30 @@
# Dolibarr language file - Source file is en_US - dict
-CountryFR=França
-CountryBE=Belgica
-CountryIT=Italia
-CountryES=Espanha
-CountryDE=Alemanha
-CountryCH=Suiça
-CountryGB=Grã-Bretanha
-CountryUK=Reino Unido
-CountryIE=Irlanda
-CountryCN=China
-CountryTN=Tunísia
-CountryUS=Estados Unidos
-CountryMA=Marrocos
-CountryDZ=Algeria
-CountryCA=Canada
-CountryTG=Togo
-CountryGA=Gabão
-CountryNL=Holanda
-CountryHU=Hungria
-CountryRU=Russia
-CountrySE=Suécia
-CountryCI=Costa do Marfim
-CountrySN=Senegal
-CountryAR=Argentina
-CountryCM=Camarões
-CountryPT=Portugal
-CountrySA=Arábia Saudita
-CountryMC=Mônaco
-CountryAU=Austrália
-CountrySG=Singapura
-CountryAF=Afeganistão
-CountryAX=Terra Ilhas
-CountryAL=Albânia
-CountryAS=Samoa Americana
-CountryAD=Andorra
-CountryAO=Angola
-CountryAI=Anguilla
-CountryAQ=Antártica
-CountryAG=Antígua e Barbuda
-CountryAM=Armênia
-CountryAW=Aruba
-CountryAT=Áustria
-CountryAZ=Azerbaijão
-CountryBS=Bahamas
-CountryBH=Barém
-CountryBD=Bangladesh
-CountryBB=Barbados
-CountryBY=Bielorrússia
-CountryBZ=Belize
-CountryBJ=Benin
-CountryBM=Bermudas
-CountryBT=Butão
-CountryBO=Bolívia
-CountryBA=Bósnia e Herzegovina
-CountryBW=Botsuana
-CountryBV=Ilha Bouvet
-CountryBR=Brasil
-CountryIO=Território Britânico do Oceano Índico
-CountryBN=Brunei Darussalam
-CountryBG=Bulgaria
-CountryBF=Burkina Faso
-CountryBI=Burundi
-CountryKH=Camboja
-CountryCV=Cabo Verde
-CountryKY=Ilhas Cayman
-CountryCF=Central Africano República
-CountryTD=Chade
-CountryCL=Chile
-CountryCX=Ilha Christmas
-CountryCC=Ilhas Cocos (Keeling)
-CountryCO=Colômbia
-CountryKM=Comoros
-CountryCG=Congo
-CountryCD=Congo, República Democrática do
-CountryCK=Ilhas Cook
-CountryCR=Costa Rica
-CountryHR=Croácia
-CountryCU=Cuba
-CountryCY=Chipre
-CountryCZ=República Checa
-CountryDK=Dinamarca
-CountryDJ=Djibuti
-CountryDM=Dominica
-CountryDO=República Dominicana
-CountryEC=Equador
-CountryEG=Egito
-CountrySV=El Salvador
-CountryGQ=Guiné Equatorial
-CountryER=Eritréia
-CountryEE=Estônia
-CountryET=Etiópia
-CountryFK=Ilhas Malvinas
-CountryFO=Ilhas Faroé
-CountryFJ=Ilhas Fiji
-CountryFI=Finlândia
-CountryGF=Guiana Francesa
CountryPF=Polinéia Francesa
-CountryTF=Territórios Franceses do Sul
-CountryGM=Gâmbia
-CountryGE=Georgia
-CountryGH=Gana
-CountryGI=Gibraltar
-CountryGR=Grécia
-CountryGL=Gronelândia
-CountryGD=Granada
-CountryGP=Guadalupe
-CountryGU=Guam
-CountryGT=Guatemala
-CountryGN=Guiné
-CountryGW=Guiné-Bissau
-CountryGY=Guiana
-CountryHT=Hati
-CountryHM=Ilha Heard e McDonald
-CountryVA=Santa Sé (Vaticano)
-CountryHN=Honduras
-CountryHK=Hong Kong
-CountryIS=Icelande
-CountryIN=Índia
CountryID=Indonéia
-CountryIR=Irão
-CountryIQ=Iraque
-CountryIL=Israel
-CountryJM=Jamaica
-CountryJP=Japão
-CountryJO=Jordânia
-CountryKZ=Cazaquistão
-CountryKE=Quênia
-CountryKI=Kiribati
-CountryKP=Coreia do Norte
-CountryKR=Coréia do Sul
-CountryKW=Kuwait
-CountryKG=Kyrghyztan
-CountryLA=Laociano
-CountryLV=Letônia
-CountryLB=Líbano
-CountryLS=Lesoto
-CountryLR=Libéria
-CountryLY=Líbia
-CountryLI=Lichtenstein
-CountryLT=Lituania
-CountryLU=Luxemburgo
-CountryMO=Macau
-CountryMK=Macedónia, antiga República Jugoslava da
-CountryMG=Madagascar
-CountryMW=Malauí
-CountryMY=Malásia
-CountryMV=Maldivas
-CountryML=Mali
-CountryMT=Malta
-CountryMH=Ilhas Marshall
-CountryMQ=Martinica
-CountryMR=Mauritânia
-CountryMU=Maurício
-CountryYT=Mayotte
-CountryMX=México
CountryFM=Micronéia
-CountryMD=Moldávia
-CountryMN=Mongólia
-CountryMS=Montserrat
-CountryMZ=Moçambique
-CountryMM=Birmania (Myanmar)
-CountryNA=Namíbia
-CountryNR=Nauruano
-CountryNP=Nepal
-CountryAN=Antilhas Holandesas
-CountryNC=Nova Caledónia
-CountryNZ=Nova Zelândia
-CountryNI=Nicarágua
-CountryNE=Níger
-CountryNG=Nigéria
-CountryNU=Niue
-CountryNF=Ilha Norfolk
-CountryMP=Ilhas Marianas do Norte
-CountryNO=Noruega
-CountryOM=Omã
-CountryPK=Paquistão
-CountryPW=Palau
-CountryPS=Território Palestiniano, Ocupado
-CountryPA=Panamá
-CountryPG=Papuásia-Nova Guiné
-CountryPY=Paraguai
-CountryPE=Peru
-CountryPH=Filipinas
-CountryPN=Ilhas Pitcairn
-CountryPL=Polônia
-CountryPR=Porto Rico
-CountryQA=Catar
-CountryRE=Reunião
-CountryRO=Romênia
-CountryRW=Ruanda
-CountrySH=Santa Helena
-CountryKN=Saint Kitts e Nevis
-CountryLC=Santa Lúcia
-CountryPM=Saint-Pierre e Miquelon
-CountryVC=São Vicente e Granadinas
-CountryWS=Samoa
-CountrySM=San Marino
-CountryST=São Tomé e Príncipe
-CountryRS=Sérvia
-CountrySC=Seychelles
-CountrySL=Serra Leoa
-CountrySK=Eslováquia
-CountrySI=Eslovênia
-CountrySB=Ilhas Salomão
-CountrySO=Somália
-CountryZA=África do Sul
-CountryGS=Geórgia do Sul e Ilhas Sandwich do Sul
-CountryLK=Sri Lanka
-CountrySD=Sudão
-CountrySR=Suriname
-CountrySJ=Svalbard e Jan Mayen
-CountrySZ=Suazilândia
-CountrySY=Síria
-CountryTW=Taiwan
-CountryTJ=Tajiquistão
-CountryTZ=Tanzânia
-CountryTH=Tailândia
-CountryTL=Timor-Leste
-CountryTK=Toquelau
-CountryTO=Tonga
-CountryTT=Trinidad e Tobago
-CountryTR=Turquia
-CountryTM=Turquemenistão
-CountryTC=Ilhas Turcas e Cailos
-CountryTV=Tuvaluano
-CountryUG=Uganda
-CountryUA=Ucrania
-CountryAE=Emirados Árabes Unidos
-CountryUM=Territórios Insulares dos Estados Unidos
-CountryUY=Uruguai
-CountryUZ=Uzbequistão
-CountryVU=Vanuatu
-CountryVE=Venezuela
-CountryVN=Viet Nam
-CountryVG=Ilhas Virgens Britânicas
-CountryVI=Ilhas Virgens, E.U.
-CountryWF=Wallis e Futuna
-CountryEH=Sara Ocidental
-CountryYE=Iêmen
-CountryZM=Zâmbia
-CountryZW=Zimbabué
-CountryGG=Guernsey
-CountryIM=Ilha de Man
-CountryJE=Jersey
-CountryME=Montenegro
-CountryBL=Saint Barthelemy
-CountryMF=Saint Martin
-
-##### Civilities #####
-CivilityMME=Sra.
-CivilityMR=Sr.
-CivilityMLE=Dr.
-CivilityMTRE=Eng.
-CivilityDR=Doutor
-##### Currencies #####
-Currencyeuros=Euros
CurrencyAUD=Dólaros Australianos
CurrencySingAUD=Dólaro Australiano
CurrencyCAD=Dólaros CAN
CurrencySingCAD=Dolaro Canadense
-CurrencyCHF=Francos suíços
CurrencySingCHF=Franco Suico
-CurrencyEUR=Euros
-CurrencySingEUR=Euro
-CurrencyFRF=Francos Franceses
CurrencySingFRF=Franco Frances
CurrencyGBP=Esterlinas Inglesas
CurrencySingGBP=Esterlina Inglesa
CurrencyINR=Rupias India
CurrencySingINR=Rupia India
-CurrencyMAD=Dirham
-CurrencySingMAD=Dirham
-CurrencyMGA=Ariary
-CurrencySingMGA=Ariary
CurrencyMUR=Mauritius rupias
CurrencySingMUR=Mauritius rupia
CurrencyNOK=Coroas Norwegas
CurrencySingNOK=Coroa Norwega
-CurrencyTND=TND
CurrencySingTND=Dinaro Tunisino
CurrencyUSD=Dólaros E.U.
CurrencySingUSD=Dólar E.U.
-CurrencyUAH=Hryvnia
-CurrencySingUAH=Hryvnia
-CurrencyXAF=Francos CFA BEAC
-CurrencySingXAF=Franco CFA BEAC
-CurrencyXOF=Francos CFA BCEAO
-CurrencySingXOF=Franco CFA BCEAO
CurrencyXPF=Francos CFP
-CurrencySingXPF=Franco CFP
-CurrencyCentSingEUR=centavo
-CurrencyThousandthSingTND=mil
-#### Input reasons #####
-DemandReasonTypeSRC_INTE=Internet
DemandReasonTypeSRC_CAMP_MAIL=Campanha correio
DemandReasonTypeSRC_CAMP_EMAIL=Campanha por E-mail
DemandReasonTypeSRC_CAMP_PHO=Campanha Telefone
-DemandReasonTypeSRC_CAMP_FAX=Campanha Fax
-DemandReasonTypeSRC_COMM=Contato comercial
DemandReasonTypeSRC_SHOP=Contato na loja
-DemandReasonTypeSRC_WOM=Palavra da boca
-DemandReasonTypeSRC_PARTNER=Parceiro
-DemandReasonTypeSRC_EMPLOYEE=Empregado
DemandReasonTypeSRC_SPONSORING=Sponsorizacao
-#### Paper formats ####
-PaperFormatEU4A0=Formato 4A0
-PaperFormatEU2A0=Formato 2A0
-PaperFormatEUA0=Formato A0
-PaperFormatEUA1=Formato A1
-PaperFormatEUA2=Formato A2
-PaperFormatEUA3=Formato A3
-PaperFormatEUA4=Formato A4
-PaperFormatEUA5=Formato A5
-PaperFormatEUA6=Formato A6
PaperFormatUSLETTER=Formato Carta E.U.A.
PaperFormatUSLEGAL=Formato Legal E.U.A.
PaperFormatUSEXECUTIVE=Formato Executivo E.U.A.
diff --git a/htdocs/langs/pt_BR/donations.lang b/htdocs/langs/pt_BR/donations.lang
index 22908e103a7db546156f825729af8cf7e982518d..60c851b3eafd7176861d06d3d464421554a6c700 100644
--- a/htdocs/langs/pt_BR/donations.lang
+++ b/htdocs/langs/pt_BR/donations.lang
@@ -4,29 +4,12 @@ Donations=Doações
DonationRef=Doaçaõ ref.
Donor=Dador
Donors=Dadores
-AddDonation=Adicionar Doação
-NewDonation=Nova Doação
ShowDonation=Mostrar doaçaõ
-DonationPromise=Promessa de Doação
-PromisesNotValid=Promessas Não Validadas
-PromisesValid=Promessas Validadas
DonationsPaid=Doações pagas
-DonationsReceived=Doações Recebidas
-PublicDonation=Doação Pública
-DonationsNumber=Número de Doações
-DonationsArea=Área de Doações
-DonationStatusPromiseNotValidated=Promessa Não Validada
-DonationStatusPromiseValidated=Promessa Validada
DonationStatusPaid=Doaçaõ recebida
-DonationStatusPromiseNotValidatedShort=Não Validada
-DonationStatusPromiseValidatedShort=Validada
DonationStatusPaidShort=Recebido
-ValidPromess=Validar promessa
DonationReceipt=Recibo doaçaõ
-BuildDonationReceipt=Criar Recibo
-DonationsModels=Modelo de documento de recepção de Doação
-LastModifiedDonations=As ultimas %s doações modificadaas
+LastModifiedDonations=As ultimas %s doações modificadaas
SearchADonation=Buscar doaçaõ
DonationRecipient=Recipiente doaçaõ
-ThankYou=Obrigado
IConfirmDonationReception=Declaro o recebimento como doaçaõ, de seguinte montante.
diff --git a/htdocs/langs/pt_BR/ecm.lang b/htdocs/langs/pt_BR/ecm.lang
index 957a7778fefbc729360ed15635301c7d9633b732..950e0e3cdc326ae8439ba0d4b0fc917ea2ce90e3 100644
--- a/htdocs/langs/pt_BR/ecm.lang
+++ b/htdocs/langs/pt_BR/ecm.lang
@@ -1,5 +1,4 @@
# Dolibarr language file - Source file is en_US - ecm
-MenuECM=Documentos
DocsMine=Os meus documentos
DocsGenerated=Documentos gerados
DocsElements=Elementos dos documentos
@@ -10,13 +9,10 @@ DocsOrders=Documentos de pedidos
DocsInvoices=Documentos de faturas
ECMNbOfDocs=Nr. de documentos
ECMNbOfDocsSmall=Nr. de doc.
-ECMSection=Pasta
ECMSectionManual=Pasta manual
ECMSectionAuto=Pasta automática
ECMSectionsManual=Pastas manuais
ECMSectionsAuto=Pastas automáticas
-ECMSections=Pastas
-ECMRoot=Raíz
ECMNewSection=Criar pasta
ECMAddSection=Adicionar pasta
ECMNewDocument=Novo documento
@@ -25,25 +21,16 @@ ECMNbOfFilesInDir=Número de arquivos na pasta
ECMNbOfSubDir=Número de subpastas
ECMNbOfFilesInSubDir=Numero de arquivos nos subpastas
ECMCreationUser=Criado por
-ECMArea=Área GED
ECMAreaDesc=O GED (Gestão Eletrônica de Documentos) permite salvar, compartilhar e pesquisar rapidamente todos os tipos de documentos contidos no Dolibarr.
ECMAreaDesc2=* As pastas automáticas são geradas automaticamente quando algum arquivo é adicionado a algum ficheiro do sistema.<br>* As pastas manuais podem ser usados para guardar documentos sem ligação a um cadastro do sistema.
-ECMSectionWasRemoved=A pasta <b>%s</b> foi eliminada
ECMDocumentsSection=Documento da pasta
ECMSearchByKeywords=Busca usando palavras chave
ECMSearchByEntity=Busca por objeto
ECMSectionOfDocuments=Pastas de documentos
-ECMTypeManual=Manual
-ECMTypeAuto=Automático
-ECMDocsBySocialContributions=Documentos associados a contribuições sociais
ECMDocsByThirdParties=Documentos associados a fornecedores
ECMDocsByProposals=Documentos associados a orçamentos
-ECMDocsByOrders=Documentos associados a pedidos
-ECMDocsByContracts=Documentos associados a contratos
ECMDocsByInvoices=Documentos associados a faturas do cliente
-ECMDocsByProducts=Documentos associados a produtos
ECMDocsByProjects=Documentos associados a projetos
-ECMNoDirectoryYet=Nenhuma pasta criada
ShowECMSection=Exibir pasta
DeleteSection=Apagar pasta
ConfirmDeleteSection=Você confirmar que quer apagar a pasta <b>%s</b> ?
@@ -52,4 +39,3 @@ CannotRemoveDirectoryContainsFiles=Não foi possível apagar, porque contém alg
ECMFileManager=Gerenciador de arquivos
ECMSelectASection=Selecione uma pasta na árvore a esquerda...
DirNotSynchronizedSyncFirst=Esta pasta parece que foi criada ou modificada fora do módulo GED. Você deve clicar no botão "Atualizar" para sincronizar as informações com o banco de dados e poder ver o conteúdo da pasta.
-
diff --git a/htdocs/langs/pt_BR/errors.lang b/htdocs/langs/pt_BR/errors.lang
index 3f9d535095b86f99d510f7d41a87cbadc4e7d877..6bdc570f7f9d0276dbde6b32920b355bdf4e557e 100644
--- a/htdocs/langs/pt_BR/errors.lang
+++ b/htdocs/langs/pt_BR/errors.lang
@@ -1,10 +1,5 @@
# Dolibarr language file - Source file is en_US - errors
-
-# No errors
NoErrorCommitIsDone=Nenhum erro, cometemos
-# Errors
-Error=Erro
-Errors=Erros
ErrorButCommitIsDone=Erros encontrados, mas que, apesar disso validar
ErrorBadEMail=EMail% s está errado
ErrorBadUrl=Url% s está errado
@@ -16,28 +11,21 @@ ErrorFailToRenameFile=Falha ao renomear o arquivo <b>'% s'</b> para <b>'% s'.</b
ErrorFailToDeleteFile=Error à eliminar o Arquivo '<b>%s</b>'.
ErrorFailToCreateFile=Erro ao criar o arquivo '<b<%s</b>'
ErrorFailToRenameDir=Error à renombar a pasta '<b>%s</b>' a '<b>%s</b>'.
-ErrorFailToCreateDir=Erro ao criar a pasta '<b>%s</b>'
ErrorFailToDeleteDir=Error à eliminar a pasta '<b>%s</b>'.
ErrorFailedToDeleteJoinedFiles=impossível eliminar a entidade já que tem Arquivos anexos. Elimine antes os Arquivos anexos
ErrorThisContactIsAlreadyDefinedAsThisType=Este contato já está definido como contato para este tipo.
-ErrorCashAccountAcceptsOnlyCashMoney=Esta conta bancaria é de tipo Caixa e só aceita o método de pagamento de tipo <b>especie</b>.
ErrorFromToAccountsMustDiffers=a conta origem e destino devem ser diferentes.
ErrorBadThirdPartyName=Nome de Fornecedor incorreto
ErrorProdIdIsMandatory=Obrigatório
ErrorBadCustomerCodeSyntax=a sintaxis do código cliente é incorreta
ErrorBadBarCodeSyntax=A sintaxe do código de barras esta incorreta
-ErrorCustomerCodeRequired=Código cliente obrigatório
ErrorBarCodeRequired=Código de barras necessário
-ErrorCustomerCodeAlreadyUsed=Código de cliente já utilizado
ErrorBarCodeAlreadyUsed=Código de barras já utilizado
-ErrorPrefixRequired=Prefixo obrigatório
ErrorUrlNotValid=O Endereço do Site está incorreta
ErrorBadSupplierCodeSyntax=a sintaxis do código fornecedor é incorreta
-ErrorSupplierCodeRequired=Código fornecedor obrigatório
-ErrorSupplierCodeAlreadyUsed=Código de fornecedor já utilizado
ErrorBadParameters=parâmetros incorretos
-ErrorBadValueForParameter=Valor errado, parâmetro incorreto
-ErrorBadImageFormat=O arquivo de imagem não tem um formato suportado
+ErrorBadValueForParameter=Valor errado, parâmetro incorreto
+ErrorBadImageFormat=Arquivo imagem de formato não suportado (Seu PHP não suporta funções para converter neste formato)
ErrorBadDateFormat=Valor tem o formato de data errada
ErrorWrongDate=A data não está correta!
ErrorFailedToWriteInDir=impossível escribir na pasta %s
@@ -72,31 +60,25 @@ ErrorLDAPSetupNotComplete=a configuração Dolibarr-LDAP é incompleta.
ErrorLDAPMakeManualTest=foi criado unn Arquivo .ldif na pasta %s. Trate de gastor manualmente este Arquivo a partir da linha de comandos para Obter mais detalles acerca do error.
ErrorCantSaveADoneUserWithZeroPercentage=No se pode cambiar uma acção ao estado no comenzada si tiene un usuario realizante de a acción.
ErrorRefAlreadyExists=a referencia utilizada para a criação já existe
-ErrorPleaseTypeBankTransactionReportName=Introduzca o Nome do registo bancario sobre a qual o escrito está constatado (formato AAAAMM ó AAAMMJJ)
ErrorRecordHasChildren=não se pode eliminar o registo porque tem hijos.
ErrorRecordIsUsedCantDelete=Não é possível excluir registro. Ele já é usado ou incluídos em outro objeto.
ErrorModuleRequireJavascript=Javascript não deve ser desativado para ter esse recurso funcionando. Para ativar / desativar o Javascript, vá ao menu Home-> Configuração-> Display.
-ErrorPasswordsMustMatch=Ambas as senhas digitadas devem corresponder entre si
ErrorContactEMail=Um erro técnico ocorrido. Por favor, contate o administrador para seguinte <b>e-mail% s</b> en fornecer o código de <b>erro% s</b> em sua mensagem, ou ainda melhor, adicionando uma cópia de tela da página.
ErrorWrongValueForField=Valor errado para o número do <b>campo% s</b> (valor <b>'% s'</b> não corresponde <b>regra% s)</b>
ErrorFieldValueNotIn=Valor errado para o número do <b>campo% s</b> (valor <b>'% s'</b> não é um valor disponível no <b>campo% s</b> da <b>tabela% s)</b>
ErrorFieldRefNotIn=Valor errado para o número do <b>campo% s</b> (valor <b>'% s'</b> não é <b>um% s</b> ref existente)
ErrorsOnXLines=Erros no registro de <b>origem% s</b> (s)
-ErrorFileIsInfectedWithAVirus=O programa antivírus não foi capaz de validar o arquivo (arquivo pode ser infectado por um vírus)
ErrorSpecialCharNotAllowedForField=Os caracteres especiais não são permitidos para o campo "% s"
ErrorDatabaseParameterWrong=Parâmetro de configuração do banco de dados <b>'% s'</b> tem um valor não é compatível para usar Dolibarr (deve ter o valor <b>'% s').</b>
ErrorNumRefModel=Uma referência existe no banco de dados (% s) e não é compatível com esta regra de numeração. Remover registro ou referência renomeado para ativar este módulo.
ErrorQtyTooLowForThisSupplier=Quantidade insuficiente para este fornecedor
ErrorModuleSetupNotComplete=Configuração do módulo parece ser incompleto. Vá em Setup - Módulos para ser concluído.
-ErrorBadMask=Erro na máscara
ErrorBadMaskFailedToLocatePosOfSequence=Erro, máscara sem número de sequência
ErrorBadMaskBadRazMonth=Erro, valor de redefinição ruim
-ErrorSelectAtLeastOne=Erro. Selecione pelo menos uma entrada.
ErrorProductWithRefNotExist=O produto com referência não existem <i>'% s'</i>
ErrorDeleteNotPossibleLineIsConsolidated=Não e possívelexcluir porque registro está ligada a uma transação bancária que está conciliada
ErrorProdIdAlreadyExist=% S é atribuída a outro terço
ErrorFailedToSendPassword=Erro ao enviar a senha
-ErrorFailedToLoadRSSFile=Falha ao obter feed RSS. Tente adicionar MAIN_SIMPLEXMLLOAD_DEBUG constante se as mensagens de erro não fornecer informações suficientes.
ErrorPasswordDiffers=As Senhas não são identicas, volte a introduzi-las
ErrorForbidden=acesso não autorizado.<br>Tentando acessar a uma página, zona o função sem estar em uma Sessão autentificada o que não se autoriza para a sua conta de usuário.
ErrorForbidden2=Os permissões para este usuário podem ser designados por o administrador Dolibarr mediante o menu %s-> %s.
@@ -104,7 +86,6 @@ ErrorForbidden3=Dolibarr não parece funcionar em uma Sessão autentificada. Con
ErrorNoImagickReadimage=a função imagick_readimage não está presente nesta Instalação de PHP. a resenha não está pois disponível. Os administradores podem desativar esta separador ao menu configuração - visualização.
ErrorRecordAlreadyExists=registo já existente
ErrorCantReadFile=Erro na leitura do arquivo '&s'
-ErrorCantReadDir=Erro na leitura da pasta '%s'
ErrorFailedToFindEntity=Error de leitura da entidade '%s'
ErrorBadLoginPassword=Identificadores de usuário o senha incorretos
ErrorLoginDisabled=a sua conta está desativada
@@ -114,8 +95,7 @@ ErrorLoginDoesNotExists=a conta de usuário de <b>%s</b> não foi encontrado.
ErrorLoginHasNoEmail=Este usuário não tem e-mail. impossível continuar.
ErrorBadValueForCode=Valor incorreto para o código. volte a \ttentar com um Novo valor...
ErrorBothFieldCantBeNegative=Campos% se% s não pode ser tanto negativo
-ErrorWebServerUserHasNotPermission=Conta de usuário usado para executar servidor não tem permissão
-ErrorNoActivatedBarcode=Nenhum tipo de código de barras ativado
+ErrorWebServerUserHasNotPermission=Conta de usuário usado para executar servidor não tem permissão
ErrUnzipFails=Falha ao descompactar com ZipArchive
ErrNoZipEngine=Não esta instaladoo programa para descompactar o arquivo% s neste PHP
ErrorFileMustBeADolibarrPackage=O arquivo deve ser um pacote zip Dolibarr
@@ -126,18 +106,16 @@ ErrorFailedToRemoveToMailmanList=Falha ao remover registro% s para% s Mailman li
ErrorNewValueCantMatchOldValue=O novo valor não pode ser igual ao anterior
ErrorFailedToValidatePasswordReset=Falha ao reinicializar senha. Pode ser o reinit já foi feito (este link pode ser usado apenas uma vez). Se não, tente reiniciar o processo reinit.
ErrorToConnectToMysqlCheckInstance=Conecte-se ao banco de dados falhar. Verifique servidor MySQL está rodando (na maioria dos casos, você pode iniciá-lo a partir de linha de comando com o "sudo / etc / init.d / mysql start ').
-ErrorFailedToAddContact=Falha ao adicionar contato
ErrorDateMustBeBeforeToday=A data não pode ser maior do que hoje
ErrorPaymentModeDefinedToWithoutSetup=A modalidade de pagamento foi definido para tipo% s mas a configuração do módulo de fatura não foi concluída para definir as informações para mostrar para esta modalidade de pagamento.
ErrorPHPNeedModule=Erro, o PHP deve ter <b>módulo% s</b> instalado para usar este recurso.
ErrorOpenIDSetupNotComplete=Você arquivo de configuração Dolibarr configuração para permitir a autenticação OpenID, mas a URL de serviço OpenID não está definido em constante% s
ErrorWarehouseMustDiffers=A conta origem e destino devem ser diferentes
ErrorBadFormat=Formato ruim!
-ErrorPaymentDateLowerThanInvoiceDate=Data de Pagamento (% s) não pode "ser antes da data da fatura para faturar.
ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Erro, esse membro ainda não está vinculado a qualquer fornecedor. Fazer a ligação membro a um terceiro existente ou criar uma novo fornecedor antes de criar assinatura com nota fiscal.
ErrorThereIsSomeDeliveries=Erro, há algumas entregas ligados a este envio. Supressão recusou.
-
-# Warnings
+ErrorCantDeletePaymentReconciliated=Não posso deletar o pagamento que gerou uma transação bancaria conciliada.
+ErrorCantDeletePaymentSharedWithPayedInvoice=Não e possivel cancelar o pagamento condiviso para pelo menos uma fatura com estado Pago
WarningMandatorySetupNotComplete=Parâmetros de configuração obrigatórios ainda não estão definidos
WarningSafeModeOnCheckExecDir=Atenção, a opção PHP <b>safe_mode</b> está em modo de comando devem ser armazenados dentro de um diretório declarado pelo php parâmetro <b>safe_mode_exec_dir.</b>
WarningAllowUrlFopenMustBeOn=o parâmetro <b>allow_url_fopen</b> deve ser especificado a <b>on</b> ao Arquivo <b>php.ini</b> para discolocar deste módulo completamente ativo. deve modificar este Arquivo manualmente
@@ -153,4 +131,6 @@ WarningCloseAlways=Atenção, o fechamento é feito mesmo se o valor difere entr
WarningUsingThisBoxSlowDown=Atenção, utilizando esta caixa de abrandar a sério todas as páginas que mostram a caixa.
WarningClickToDialUserSetupNotComplete=Configuração de informações ClickToDial para o usuário não são completas (ver guia ClickToDial no seu cartão de usuário).
WarningNotRelevant=Operação irrelevante para este conjunto de dados
-WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Função desabilitada quando a tela e optimizada para uso das pessoas cegas ou navegadores de texto.
+WarningPaymentDateLowerThanInvoiceDate=Data de pagamento (%s) e antes da data da nota (%s) para a fatura %s.
+WarningTooManyDataPleaseUseMoreFilters=Dados de mais, por favor use mais filtros
diff --git a/htdocs/langs/pt_BR/exports.lang b/htdocs/langs/pt_BR/exports.lang
index 51eeab11ac9513b3885e6001ee7aadeb6b38e341..d680c4d114500935b6e6480716bbe7b2305dc994 100644
--- a/htdocs/langs/pt_BR/exports.lang
+++ b/htdocs/langs/pt_BR/exports.lang
@@ -1,49 +1,23 @@
# Dolibarr language file - Source file is en_US - exports
ExportsArea=Área Exportações
-ImportArea=Área de Importação
-NewExport=Nova Exportação
-NewImport=Nova Importação
-ExportableDatas=Conjunto de dados exportáveis
ImportableDatas=Conjunto de dados importaveis
SelectExportDataSet=Escolha um conjunto predefinido de dados que deseja exportar...
SelectImportDataSet=Escolha um conjunto predefinido de dados que deseja importar...
-SelectExportFields=Escolha os campos que devem exportar-se, ou escolha um perfil de exportação predefinido
SelectImportFields=Escolha campos de arquivo de fonte que você deseja importar e seu campo de destino no banco de dados, movendo-os para cima e para baixo com a seta, ou selecione um perfil de importação pré-definido:
NotImportedFields=Os campos de arquivo de origem não importado
-SaveExportModel=Guardar este perfil de exportação assim pode reutiliza-lo posteriormente...
SaveImportModel=Guardar este perfil de importação assim pode reutiliza-lo posteriormente...
-ExportModelName=Nome do perfil de exportação
-ExportModelSaved=Perfil de exportação guardado com o nome de <b>%s</b>.
-ExportableFields=Campos Exportáveis
-ExportedFields=Campos a Exportar
ImportModelName=Nome do perfil de importação
ImportModelSaved=Perfil de importação guardado com o nome de <b>%s</b>.
ImportableFields=Campos Importáveis
ImportedFields=Campos a Importar
-DatasetToExport=Conjunto de dados a exportar
DatasetToImport=Conjunto de dados a importar
NoDiscardedFields=Não há campos em arquivo de origem são descartados
-Dataset=Conjunto de Dados
-ChooseFieldsOrdersAndTitle=Escolha a ordem dos campos...
-FieldsOrder=Ordem dos Campos
-FieldsTitle=Título Campos
FieldOrder=Ordem de campo
-FieldTitle=Campo título
-ChooseExportFormat=Escolha o formato de exportação
NowClickToGenerateToBuildExportFile=Agora, faça click em "Gerar" para gerar o arquivo exportação...
-AvailableFormats=Formatos Disponíveis
-LibraryShort=Biblioteca
LibraryUsed=Bibliotéca Utilizada
-LibraryVersion=Versão
-Step=Passo
-FormatedImport=Assistente de Importação
-FormatedImportDesc1=Esta área permite realizar importações personalizadas de dados mediante um ajudante que evita ter conhecimentos técnicos de Dolibarr.
FormatedImportDesc2=O primeiro passo consiste em escolher o tipo de dado que deve importar, logo o arquivo e a continuação escolher os campos que deseja importar.
-FormatedExport=Assistente de Exportação
-FormatedExportDesc1=Esta área permite realizar exportações personalizadas dos dados mediante um ajudante que evita ter conhecimentos técnicos de Dolibarr.
FormatedExportDesc2=O primeiro passo consiste em escolher um dos conjuntos de dados predefinidos, a continuação escolher os campos que quer exportar para o arquivo e em que ordem.
FormatedExportDesc3=Uma vez selecionados os dados, é possível escolher o formato do arquivo de exportação gerado.
-Sheet=Folha
NoImportableData=Não existe tipo de dados importavel (não existe nenhum módulo com definições de dados importavel ativado)
FileSuccessfullyBuilt=Arquivo de exportação gerado
SQLUsedForExport=Pedido de SQL usado para construir exportação de arquivo
@@ -56,17 +30,13 @@ LineTotalHT=Valor do HT por linha
LineTotalTTC=Acrescido de ICMS da linha
LineTotalVAT=Valor ICMS por Linha
TypeOfLineServiceOrProduct=Tipo de Linha (0
-FileWithDataToImport=Arquivo com os dados de importação
FileToImport=Arquivo de origem de importação
FileMustHaveOneOfFollowingFormat=Arquivo para importação deve ter um dos seguinte formato
DownloadEmptyExample=Baixar exemplo de arquivo de origem vazio
ChooseFormatOfFileToImport=Escolha o formato de arquivo a ser usado como formato de arquivo de importação clicando no para selecioná-lo ...
ChooseFileToImport=Carregar arquivo e clique no picto% s para selecionar o arquivo como arquivo de importação de fonte ...
-SourceFileFormat=Formato de arquivo de origem
FieldsInSourceFile=Campos em arquivo de origem
FieldsInTargetDatabase=Campos de destino no banco de dados Dolibarr (negrito = obrigatório)
-Field=Campo
-NoFields=Nenhum campo
MoveField=Mover campo número da colunas
ExampleOfImportFile=Exemplo de arquivo de importação
SaveImportProfile=Guardar este perfil de importação
@@ -78,13 +48,10 @@ TableTarget=Alvo
FieldTarget=Campo de destino
FieldSource=Campo Fonte
DoNotImportFirstLine=Não importar primeira linha de arquivo de origem
-NbOfSourceLines=Número de linhas no arquivo de origem
NowClickToTestTheImport=Verifique os parâmetros de importação que você definiu. Se eles estiverem corretos, clique no botão <b>"% s"</b> para iniciar uma simulação do processo de importação (os dados não serão alterados em seu banco de dados, é apenas uma simulação para o momento) ...
-RunSimulateImportFile=Inicie a simulação de importação
FieldNeedSource=Este campo requer dados do arquivo de origem
SomeMandatoryFieldHaveNoSource=Alguns campos obrigatórios não têm nenhuma fonte de arquivo de dados
InformationOnSourceFile=Informações sobre arquivo de origem
-InformationOnTargetTables=Informações sobre os campos de destino
SelectAtLeastOneField=Mude pelo menos um campo de origem na coluna de campos para exportar
SelectFormat=Escolha este formato de arquivo de importação
RunImportFile=Arquivo de importação de lançamento
@@ -94,7 +61,6 @@ ErrorMissingMandatoryValue=Dados obrigatórios esta vazio no arquivo de origem p
TooMuchErrors=Há ainda outras linhas de origem com erros mas a produção tem sido limitado.
TooMuchWarnings=Há ainda outras linhas de origem com avisos, mas a produção tem sido limitado.
EmptyLine=Linha vazia (serão descartados)
-CorrectErrorBeforeRunningImport=Primeiro, você deve corrigir todos os erros antes de executar a importação definitiva.
FileWasImported=O arquivo foi importado com o números.
YouCanUseImportIdToFindRecord=Você pode encontrar todos os registros importados em seu banco de dados, filtrando em campo import_key.
NbOfLinesOK=Número de linhas sem erros e sem avisos:
@@ -106,29 +72,21 @@ DataComeFromIdFoundFromCodeId=O código que vem de número do campo do arquivo d
DataIsInsertedInto=Dados provenientes do arquivo de origem será inserido o seguinte campo:
DataIDSourceIsInsertedInto=O id do objeto pai encontrado usando os dados em arquivo de origem, será inserido o seguinte campo:
DataCodeIDSourceIsInsertedInto=O ID da linha pai encontrado a partir do código, será inserido no campo a seguir:
-SourceRequired=Valor dos dados é obrigatória
SourceExample=Exemplo de possível valor dos dados
ExampleAnyRefFoundIntoElement=Qualquer ref encontrada para o elemento
ExampleAnyCodeOrIdFoundIntoDictionary=Qualquer código (ou id) encontrado em dicionário
-CSVFormatDesc=Formato de arquivo de valores separados por vírgulas . Este é um formato de arquivo de texto, onde os campos são separados pelo separador. Se separador é encontrado dentro de um conteúdo de campo, o campo é arredondado pelo caráter rodada . Fuja personagem para escapar caráter rodada é
+CSVFormatDesc=Formato de arquivo de valores separados por vírgulas . Este é um formato de arquivo de texto, onde os campos são separados pelo separador. Se separador é encontrado dentro de um conteúdo de campo, o campo é arredondado pelo caráter rodada . Fuja personagem para escapar caráter rodada é
Excel95FormatDesc=Formato de arquivo do Excel. (Xls) Este é o formato Excel 95 nativa (BIFF5).
Excel2007FormatDesc=Formato de arquivo do Excel (. Xlsx) Este é o formato Excel 2007 nativo (SpreadsheetML).
TsvFormatDesc=Formato de arquivo Tab Separated Value (. TSV) Este é um formato de arquivo de texto, onde os campos são separados por um tabulador [Tab].
ExportFieldAutomaticallyAdded=O campo foi adicionado automaticamente. Ele vai evitar que você tenha linhas semelhantes a serem tratados como registros duplicados (com este campo adicionado, todas as linhas serão possuem seu próprio ID e será diferente).
CsvOptions=Opções csv
-Separator=Separador
Enclosure=Recinto
SuppliersProducts=Fornecedores Produtos
-BankCode=Código Banco
-DeskCode=Código Balcão
-BankAccountNumber=Número de conta
-BankAccountNumberKey=Dígito Control
SpecialCode=Código especial
ExportStringFilter=Permite substituir um ou mais caracteres no texto
ExportDateFilter='AAAA' YYYYMM 'AAAAMMDD': filtros em um ano / mês / dia <br> 'AAAA + AAAA' YYYYMM + YYYYMM 'AAAAMMDD + AAAAMMDD': filtros mais uma série de anos / meses / dias <br> > AAAA ''> YYYYMM ''> AAAAMMDD ': filtros nos seguintes anos / meses / dias <br> '<AAAA' '<YYYYMM' '<AAAAMMDD': filtros nos anos / meses / dias anteriores
ExportNumericFilter=filtros "NNNNN" por um valor <br> filtros "NNNNN + NNNNN 'mais de uma faixa de valores <br> '> NNNNN' filtros por valores mais baixos <br> '> NNNNN' filtros por valores mais elevados
-## filters
SelectFilterFields=Se você deseja filtrar alguns valores, apenas os valores de entrada aqui.
-FilterableFields=Champs Filtrables
FilteredFields=Campos filtrados
FilteredFieldsValues=Valor para o filtro
diff --git a/htdocs/langs/pt_BR/externalsite.lang b/htdocs/langs/pt_BR/externalsite.lang
index 6999e5d2f564c9b7313dff87565f09976052996a..f0669dcd138ebf3338ccf80bff74f1937686ba08 100644
--- a/htdocs/langs/pt_BR/externalsite.lang
+++ b/htdocs/langs/pt_BR/externalsite.lang
@@ -1,4 +1,4 @@
# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Link configuraçao ao site externo
+ExternalSiteSetup=Link configuraçao ao site externo
ExternalSiteURL=URL site externo
ExternalSiteModuleNotComplete=Modulo SiteExterno nao foi configurado corretamente.
diff --git a/htdocs/langs/pt_BR/ftp.lang b/htdocs/langs/pt_BR/ftp.lang
index 50e84ff872f7448cfc932af8e7d7f88052d2db7f..b388a7474cbcffbaf0800ebfdf54c85b0c50a26a 100644
--- a/htdocs/langs/pt_BR/ftp.lang
+++ b/htdocs/langs/pt_BR/ftp.lang
@@ -9,4 +9,3 @@ FailedToConnectToFTPServer=Falha na conexão ao servidor FTP (server% s, porta%
FailedToConnectToFTPServerWithCredentials=Falha ao efetuar login no servidor FTP com login/senha
FTPFailedToRemoveFile=Falha ao remover o arquivo <b>%s</ b>.
FTPFailedToRemoveDir=Falha ao remover diretório <b>%s</ b> (verifique as permissões e se o diretório está vazio).
-FTPPassiveMode=Modo passivo
diff --git a/htdocs/langs/pt_BR/help.lang b/htdocs/langs/pt_BR/help.lang
index ac6810757128d33972f650f69635f34e0b1d7130..45771022c6c42ebbc2b123a921ec7dfa94e74353 100644
--- a/htdocs/langs/pt_BR/help.lang
+++ b/htdocs/langs/pt_BR/help.lang
@@ -1,23 +1,19 @@
# Dolibarr language file - Source file is en_US - help
-CommunitySupport=Fórum/Wiki suporte
+CommunitySupport=Fórum/Wiki suporte
EMailSupport=E-mails de suporte
RemoteControlSupport=Suporte em tempo real / remoto
OtherSupport=Outros suportes
ToSeeListOfAvailableRessources=Entrar em contato com/consulte os recursos disponíveis:
-ClickHere=Clickque aqui
HelpCenter=Central de ajuda
DolibarrHelpCenter=Centro de suporte e ajuda Dolibarr
ToGoBackToDolibarr=Caso contrário, clique aqui para usar Dolibarr
TypeOfSupport=Fonte de suporte
-TypeSupportCommunauty=Comunidade (grátis)
-TypeSupportCommercial=Comercial
-TypeOfHelp=Tipo
NeedHelpCenter=Precisa de ajuda ou suporte ?
Efficiency=eficiência
TypeHelpOnly=Somente ajuda
TypeHelpDev=Ajuda+Desenvolvimento
TypeHelpDevForm=Ajuda+Desenvolvimento+Formação
-ToGetHelpGoOnSparkAngels1=Algumas empresas podem prover um suporte online rápido (às vezes imediato) e mais eficiente ao assumirem o controle de seu computador. Tais ajudantes podem ser encontrados na página <b>%s</b>:
+ToGetHelpGoOnSparkAngels1=Algumas empresas podem prover um suporte online rápido (às vezes imediato) e mais eficiente ao assumirem o controle de seu computador. Tais ajudantes podem ser encontrados na página <b>%s</b>:
ToGetHelpGoOnSparkAngels3=Você também pode acessar a lista de todos os treinadores disponíveis para o Dolibarr, para isto clique no botão
ToGetHelpGoOnSparkAngels2=Às vezes, não há nenhuma empresa disponível no momento de fazer sua pesquisa, por isso acho que para mudar o filtro para procurar "tudo disponibilidade". Você será capaz de enviar mais pedidos.
BackToHelpCenter=Caso contrário, clique aqui para ir para trás para ajudar a home page .
diff --git a/htdocs/langs/pt_BR/holiday.lang b/htdocs/langs/pt_BR/holiday.lang
index bd3f3d02f2f6f4f20f84961ef3832bc8c201baf5..7586477f9e5f6f1323b8ccba71df1d08baa86ccd 100644
--- a/htdocs/langs/pt_BR/holiday.lang
+++ b/htdocs/langs/pt_BR/holiday.lang
@@ -1,68 +1,57 @@
# Dolibarr language file - Source file is en_US - holiday
HRM=HRM
-Holidays=Ferias
-CPTitreMenu=Ferias
+Holidays=Leaves
+CPTitreMenu=Leaves
MenuReportMonth=Relatorio mensal
-MenuAddCP=Aplicar para ferias
-NotActiveModCP=Vocẽ tem que habilitar o modulo de ferias para ver esta pagina.
-NotConfigModCP=Você precisa configurar o modulo de ferias para ver esta pagina. Para faze-lo, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> clickque aqui </ a>.
-NoCPforUser=Voce nao tem demandado as ferias.
-AddCP=Aplique-se para as ferias.
-Employe=Empregado
+MenuAddCP=Make a leave request
+NotActiveModCP=You must enable the module Leaves to view this page.
+NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+NoCPforUser=You don't have any available day.
+AddCP=Make a leave request
DateDebCP=Data inicio
DateFinCP=Data fim
DateCreateCP=Data criacão
-DraftCP=Rascunho
ToReviewCP=Aguardando aprovação
-ApprovedCP=Aprovado
-CancelCP=Cancelado
RefuseCP=Negado
ValidatorCP=Aprovador
-ListeCP=Lista de feriados
+ListeCP=List of leaves
ReviewedByCP=Sera revisado por
-DescCP=Descrição
-SendRequestCP=Criando demanda para ferias
-DelayToRequestCP=Demandas para ferias teram que ser feitas no minimo <b>%s dias</b> antes.
-MenuConfCP=Editar balancete das ferias
-UpdateAllCP=Atualizar ferias
-SoldeCPUser=Equilíbrio dos feriados dias.
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Edit balance of leaves
+UpdateAllCP=Update the leaves
+SoldeCPUser=Leaves balance is <b>%s</b> days.
ErrorEndDateCP=Você deve selecionar uma data final posterior à data inicial.
ErrorSQLCreateCP=Ocorreu um erro no SQL durante a criação:
-ErrorIDFicheCP=Ocorreu um erro, no pedido de ferias não existe.
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
ReturnCP=Retorne à página anterior
-ErrorUserViewCP=Você não está autorizado a ler essa requisição de férias.
-InfosCP=Informações da demanda das férias
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosCP=Information of the leave request
InfosWorkflowCP=Fluxo de Trabalho de Informação
RequestByCP=Requisitado por
-TitreRequestCP=Folha de férias
-NbUseDaysCP=Número de dias utilizados das férias
-EditCP=Editar
+TitreRequestCP=Leave request
+NbUseDaysCP=Number of days of vacation consumed
DeleteCP=Eliminar
ActionValidCP=Confirmar
ActionRefuseCP=Não autorizar
-ActionCancelCP=Cancelar
-StatutCP=Estado
-SendToValidationCP=Enviar para validação
-TitleDeleteCP=Apagar a requisição de férias
-ConfirmDeleteCP=Confirme a eliminação deste pedido para férias?
-ErrorCantDeleteCP=Você não tem privilégios para apanhar essa requisição de férias
-CantCreateCP=Você não tem o direito de aplicar para férias.
-InvalidValidatorCP=Você deve escolher um aprovador ao seu pedido de férias.
-UpdateButtonCP=Modificar
-CantUpdate=Você não pode atualizar esta solicitação de férias.
+TitleDeleteCP=Delete the leave request
+ConfirmDeleteCP=Confirm the deletion of this leave request?
+ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
+CantCreateCP=You don't have the right to make leave requests.
+InvalidValidatorCP=You must choose an approbator to your leave request.
+CantUpdate=You cannot update this leave request.
NoDateDebut=Você deve selecionar uma data inicial.
NoDateFin=Você deve selecionar uma data final.
-ErrorDureeCP=O seu pedido de férias não contém dia de trabalho.
-TitleValidCP=Aprovar a requisição de férias
-ConfirmValidCP=Você tem certeza que deseja aprovar a requisição de férias?
-DateValidCP=Data aprovada
-TitleToValidCP=Enviar requisição de férias
-ConfirmToValidCP=Você tem certeza que deseja enviar a requisição de férias?
-TitleRefuseCP=Não autorizar a requisição de férias
-ConfirmRefuseCP=Você tem certeza que não deseja autorizar a requisição de férias?
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
+ConfirmValidCP=Are you sure you want to approve the leave request?
+TitleToValidCP=Send leave request
+ConfirmToValidCP=Are you sure you want to send the leave request?
+TitleRefuseCP=Refuse the leave request
+ConfirmRefuseCP=Are you sure you want to refuse the leave request?
NoMotifRefuseCP=Você deve selecionar uma razão para não autorizar a requisição.
-TitleCancelCP=Cancelar a requisição de férias
-ConfirmCancelCP=Você tem certeza que deseja cancelar a requisição de férias?
+TitleCancelCP=Cancel the leave request
+ConfirmCancelCP=Are you sure you want to cancel the leave request?
DetailRefusCP=Motivo da recusa
DateRefusCP=Data da recusa
DateCancelCP=Data do cancelamento
@@ -72,45 +61,27 @@ MotifCP=Razão
UserCP=Usuário
ErrorAddEventToUserCP=Ocorreu um erro ao adicionar a licença excepcional.
AddEventToUserOkCP=A adição da licença excepcional tenha sido concluída.
-MenuLogCP=Ver registos de ferias
-LogCP=Calculo de atualizações de ferias
+MenuLogCP=View logs of leave requests
+LogCP=Log of updates of available vacation days
ActionByCP=Interpretada por
-UserUpdateCP=Para o utilizador
PrevSoldeCP=Balanço anterior
NewSoldeCP=Novo Balanco
-alreadyCPexist=Um pedido de ferias já foi feito neste período.
+alreadyCPexist=A leave request has already been done on this period.
UserName=Apelidos
-Employee=Empregado
-FirstDayOfHoliday=Primeiro dia de férias
-LastDayOfHoliday=Último dia de férias
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
HolidaysMonthlyUpdate=A atualização mensal
ManualUpdate=Atualização manual
-HolidaysCancelation=Feriados cancelados
-
-## Configuration du Module ##
-ConfCP=A configuração do módulo de ferias
+ConfCP=Configuration of leave request module
DescOptionCP=Descrição da opção
ValueOptionCP=Valor
-GroupToValidateCP=Grupo com a capacidade de aprovar ferias
+GroupToValidateCP=Group with the ability to approve leave requests
ConfirmConfigCP=Validar a configuração
-LastUpdateCP=Última atualização automática das férias
+LastUpdateCP=Last automatic update of leaves allocation
UpdateConfCPOK=Atualizado com sucesso.
ErrorUpdateConfCP=Ocorreu um erro durante a atualização, por favor, tente novamente.
-AddCPforUsers=Por favor, adicione o balanço dos feriados de usuários, define_ferias" estilo="fonte -weight: normal; color: vermelha; texto decoração: sublinhar; clicando aqui .
-DelayForSubmitCP=Prazo para solicitar feriados
-AlertapprobatortorDelayCP=Impedir a approvação se o pedido de férias não coincidir com a data limite
-AlertValidatorDelayCP=Prevenir o aprovador se o pedido de férias exceder atraso
-AlertValidorSoldeCP=Impedir a aprovador se o pedido de férias exceder o equilíbrio
-nbUserCP=Número de usuários suportados nas férias de módulo
-nbHolidayDeductedCP=Número de feriados a ser deduzido por dia de feriado tomado
-nbHolidayEveryMonthCP=Número de feriados adicionados a cada mês
-Module27130Name= Gestão das férias
-Module27130Desc= Gestão das férias
-TitleOptionMainCP=Principais configurações de ferias
-TitleOptionEventCP=Configurações de feriados relacionados a eventos
ValidEventCP=Confirmar
UpdateEventCP=Eventos de atualização
-CreateEventCP=Criar
NameEventCP=Nome do evento
OkCreateEventCP=A adição do evento correu bem.
ErrorCreateEventCP=Erro ao criar o evento.
@@ -127,23 +98,3 @@ UpdateEventOptionCP=Modificar
ErrorMailNotSend=Ocorreu um erro durante o envio de e-mail:
NoCPforMonth=Não deixe este mês.
nbJours=Número de dias
-TitleAdminCP=Configuração de Férias
-#Messages
-Hello=Olá
-HolidaysToValidate=Validar feriados
-HolidaysToValidateBody=Abaixo está um pedido de férias para validar
-HolidaysToValidateDelay=Este pedido de ferias terá lugar dentro de um período de menos dias.
-HolidaysToValidateAlertSolde=O usuário que fez o pedido de feriados não têm número suficiente de dias disponíveis.
-HolidaysValidated=Feriados validados
-HolidaysValidatedBody=O seu pedido de ferias foi validado.
-HolidaysRefused=Feriados negados
-HolidaysRefusedBody=O seu pedido de ferias foi negado pelo seguinte motivo:
-HolidaysCanceled=Feriados cancelados
-HolidaysCanceledBody=O seu pedido de ferias foi cancelada.
-Permission20000=Leia você próprios feriados
-Permission20001=Criar / modificar as suas férias
-Permission20002=Criar / modificar feriados para todos
-Permission20003=Excluir pedidos férias
-Permission20004=Usuários de configuração ferias
-Permission20005=Revisão dos feriados modificados
-Permission20006=Leia feriados relatório mensal
diff --git a/htdocs/langs/pt_BR/install.lang b/htdocs/langs/pt_BR/install.lang
index 216b5905732b22eccf75f4b8d08f8071973db491..0f356aad94d533e0a958677ba8cbd8b2be1da699 100644
--- a/htdocs/langs/pt_BR/install.lang
+++ b/htdocs/langs/pt_BR/install.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - install
InstallEasy=Tentámos tornar a instalação do Dolibarr o mais fácil possível. É favor seguir as instruções passo-a-passo.
MiscellaneousChecks=Checkando pré-requisitos
-DolibarrWelcome=Bem-vindo ao Dolibarr
ConfFileExists=O arquivo de configuração <b>conf.php</b> existe.
ConfFileDoesNotExists=Arquivo de <b>configuração %s</b> não existe!
ConfFileDoesNotExistsAndCouldNotBeCreated=Arquivo de <b>configuração %s</b> não existe e não poderia ser criado!
@@ -12,13 +11,7 @@ ConfFileReload=Recarregar todas as informaçoes do arquivo de configuraçao.
PHPSupportSessions=Esta PHP suporta sessões.
PHPSupportPOSTGETOk=Esta PHP suporta variáveis GET e POST.
PHPSupportPOSTGETKo=É possível configurar o PHP não suporta variáveis POST e / ou GET. Verifique se o seu parâmetro <b>variables_order</b> em php.ini.
-PHPSupportGD=Este suporte PHP GD gráfica funções.
-PHPSupportUTF8=Este suporte PHP UTF8 funções.
-PHPMemoryOK=Seu PHP max sessão memória está definido <b>para %s.</b> Isto deve ser suficiente.
PHPMemoryTooLow=Seu PHP max sessão memória está definido <b>para %s</b> bytes. Isto deve ser muito baixo. Alterar o seu <b>php.inem memory_limit</b> para definir parâmetro para pelo <b>menos %s</b> bytes.
-Recheck=Clique aqui para um teste mais significativo
-ErrorPHPDoesNotSupportSessions=Sua instalação não suporta PHP sessões. Esta característica é necessária para tornar Dolibarr trabalho. Verifique a sua configuração do PHP.
-ErrorPHPDoesNotSupportGD=Sua instalação PHP não suporta gráficos função GD. Não gráfico estarão disponíveis.
ErrorPHPDoesNotSupportUTF8=Sua instalação PHP não suporta UTF8 funções. Dolibarr pode não funcionar corretamente. Resolva este antes de instalar Dolibarr.
ErrorDirDoesNotExists=Diretório %s não existe.
ErrorGoBackAndCorrectParameters=Ir para trás e corrigir errado parâmetros.
@@ -33,112 +26,60 @@ ErrorDatabaseAlreadyExists=Base de dados' %s' já existe.
IfDatabaseNotExistsGoBackAndUncheckCreate=Se não existe base de dados, volte e verifique a opção "Criar uma base de dados".
IfDatabaseExistsGoBackAndCheckCreate=Caso dados já existe, volte e desmarque "Criar uma base de dados" opção.
WarningBrowserTooOld=Navegador antigo. Faça a atualizaçao do seu navegador para uma versao mais recente de Firefox, Chrome ou Opera, e altamente recomendado.
-PHPVersion=Versão PHP
YouCanContinue=Pode continuar...
-PleaseBePatient=Por favor, seja paciente ...
License=A usar licença
ConfigurationFile=Arquivo de configuração
WebPagesDirectory=Directoria onde armazenar as páginas web
DocumentsDirectory=Directoria onde armazenar documentos enviados e/ou gerados
-URLRoot=URL de raiz
ForceHttps=Forcar conexoes seguras (https)
CheckToForceHttps=Escolha esta opcao para forcar conexoes seguras (https).<br>Isto requere que o servidor web esta configurado para uso com certificado SSL.
DolibarrDatabase=Base de dados Dolibarr
-DatabaseChoice=Escolha de base de dados
-DatabaseType=Tipo de base de dados
-DriverType=Driver tipo
Server=Servidor
-ServerAddressDescription=Nome ou endereço IP para o servidor de dados, normalmente 'localhost' ao banco de dados está hospedado no mesmo servidor que servidor web
-ServerPortDescription=Database server port. Mantenha vazio se desconhecido.
-DatabaseServer=Database server
-DatabaseName=Nome da base de dados
DatabasePrefix=Prefixo tabela banco de dados
-Login=Login
AdminLogin=Login para o administrador da base de dados Dolibarr. Deixar em branco se a conexão é feita com anônimo
-Password=Password
PasswordAgain=Introduza a password uma segunda vez
AdminPassword=Password para o administrador da base de dados Dolibarr. Deixar em branco se a conexão é feita com anônimo
CreateDatabase=Criar uma base de dados
CreateUser=Criar usuário
DatabaseSuperUserAccess=Base de dados - Acesso Superuser
-CheckToCreateDatabase=Verifique se caixa de dados não existe e deve ser criado. <br> Neste caso, você deve preencher o login / senha para o superusuário em conta, na parte inferior desta página.
-CheckToCreateUser=Caixa de login, se não existe e deve ser criado. <br> Neste caso, você deve preencher o login / senha para o superusuário em conta, na parte inferior desta página.
Experimental=(experimental, não operacional)
-DatabaseRootLoginDescription=Login do usuário permissão para criar novas bases de dados ou de novos usuários, inútil se o seu banco de dados e seu banco de dados já existe login (como quando você está hospedado por um provedor de hospedagem da web).
KeepEmptyIfNoPassword=Deixar em branco se o usuário não tiver password
SaveConfigurationFile=Gravar configuração
ConfigurationSaving=A gravar...
ServerConnection=Conexão ao servidor
-DatabaseConnection=Conexão à base de dados
DatabaseCreation=Database criação
UserCreation=Usuário criação
CreateDatabaseObjects=Criação dos objetos na base de dados...
-ReferenceDataLoading=Dados de base a carregar...
TablesAndPrimaryKeysCreation=Tabelas e chaves primárias criação
-CreateTableAndPrimaryKey=Criar tabela %s
-CreateOtherKeysForTable=Crie chaves estrangeiras e índices para a tabela %s
-OtherKeysCreation=Chaves estrangeiras e índices criação
-FunctionsCreation=Funções criação
AdminAccountCreation=A criar login do Administradore
PleaseTypePassword=Por favor escreva uma password, passwords vazias não são permitidas !
PleaseTypeALogin=Por favor escreva um login !
PasswordsMismatch=As passwords diferem, tente novamente sff !
-SetupEnd=Fim da Configuração
SystemIsInstalled=Instalação completa.
SystemIsUpgraded=Dolibarr foi atualizado com êxito.
-YouNeedToPersonalizeSetup=Agora necessita de configurar o Dolibarr por forma a corresponder às suas necessidades (aspecto, funcionalidades, ...). Para tal clique no seguinte link:
AdminLoginCreatedSuccessfuly=Login de Administrador criado com sucesso.
GoToDolibarr=Vai para Dolibarr
GoToSetupArea=Prosseguir para a área de configuração
MigrationNotFinished=A versao do banco de dados nao e competamente atualizada, voce tera que aviar o processo de atualizacao novamente.
GoToUpgradePage=Vai para a pagina de atualizaçao novamente
-Examples=Exemplos
-WithNoSlashAtTheEnd=Sem a barra "/" no final
DirectoryRecommendation=É recomendado que você ponha esta directry das páginas da web diretório.
-LoginAlreadyExists=Já existe
DolibarrAdminLogin=Dolibarr admin login
AdminLoginAlreadyExists=Dolibarr conta administrador <b>' %s'</b> já existe.
WarningRemoveInstallDir=Atenção, por razões de segurança, uma vez que a instalação ou atualização estiver completa, você deve remover o <b>diretório</b> de <b>instalação ou renomeá-lo para install.lock a fim de evitar o seu uso malicioso.</b>
ThisPHPDoesNotSupportTypeBase=PHP Este sistema não suporta qualquer tipo de interface para acesso de dados %s
-FunctionNotAvailableInThisPHP=Não disponível neste PHP
-MigrateScript=Migrar script
-ChoosedMigrateScript=Escolhido migrar script
-DataMigration=Migração de dados
DatabaseMigration=Estrutura migração de dados
-ProcessMigrateScript=Script transformação
-ChooseYourSetupMode=Escolha o seu modo de configuração e clique em "Iniciar" ...
FreshInstall=Fresh instalar
-FreshInstallDesc=Utilize este modo, se esta for a primeira instalação. Se não, este modo pode reparar uma instalação anterior incompleto, mas se você deseja atualizar sua versão, selecione "Atualizar" modo.
Upgrade=Upgrade
UpgradeDesc=Use este modo se você tiver substituído Dolibarr antigos arquivos com arquivos de uma versão mais recente. Isto irá atualizar o seu banco de dados e dados.
-Start=Iniciar
InstallNotAllowed=Instalação não permitidas pela <b>conf.php</b> permissões
-NotAvailable=Não disponível
YouMustCreateWithPermission=Você deve criar o arquivo %s e definir permissões escrever sobre ele para instalar o servidor web durante o processo.
CorrectProblemAndReloadPage=Corrija o problema e pressione a tecla F5 para recarregar página.
-AlreadyDone=Já migrou
DatabaseVersion=Database versão
ServerVersion=Database server version
YouMustCreateItAndAllowServerToWrite=Você deve criar este diretório e para permitir que o servidor da web para escrever nela.
CharsetChoice=Conjunto de caracteres escolha
-CharacterSetClient=Conjunto de caracteres utilizados para páginas HTML geradas
-CharacterSetClientComment=Escolher conjunto de caracteres para exibir na web. <br/> Padrão proposto um conjunto de caracteres é o do seu banco de dados.
-DBSortingCollation=Caracteres triagem fim
-DBSortingCollationComment=Escolha página código que define o caráter triagem fim utilizado por base de dados. Este parâmetro é também chamado de "recolha" por alguns bancos de dados. <br/> Esse parâmetro não pode ser definido se de dados já existe.
-CharacterSetDatabase=Conjunto de caracteres para o banco de dados
-CharacterSetDatabaseComment=Escolher conjunto de caracteres queria para o banco de dados criação. <br/> Esse parâmetro não pode ser definido se de dados já existe.
-YouAskDatabaseCreationSoDolibarrNeedToConnect=Você pergunta para criar base de <b>dados %s,</b> mas, para isso, Dolibarr necessidade de se conectar ao servidor com o <b>super-usuário %s %s</b> permissões.
-YouAskLoginCreationSoDolibarrNeedToConnect=Você pergunta para criar base de dados <b>login %s,</b> mas, para isso, Dolibarr necessidade de se conectar ao servidor com o <b>super-usuário %s %s</b> permissões.
-BecauseConnectionFailedParametersMayBeWrong=Como conexão falhou, de acolhimento ou super usuário parâmetros devem ser errado.
-OrphelinsPaymentsDetectedByMethod=Orphelins pagamento detectado pelo método %s
-RemoveItManuallyAndPressF5ToContinue=Removê-lo manualmente e pressione F5 para continuar.
-KeepDefaultValuesWamp=Você usa o DoliWamp Setup Wizard, para valores propostos aqui já estão otimizados. Alterá-los apenas se souber o que você faz.
KeepDefaultValuesDeb=Voce esta usando o assistente de configuração do Dolibarr do pacote Linux (Ubuntu, Debian, Fedora...), portanto os valores propostos aqui estao ja optimizados. O unico parametro a se completar e a senha do administrador de banco de dados. Mude outros parametros somente se voce sabe o que esta fazendo.
-KeepDefaultValuesMamp=Você usa o DoliMamp Setup Wizard, para valores propostos aqui já estão otimizados. Alterá-los apenas se souber o que você faz.
KeepDefaultValuesProxmox=Voçê esta usando o asistente de configuração do Dolibarr da Proxmox aplicação virtual, portanto os valores propostos aqui estão ja otimizados. Mude-os somente se voçê sabe o que esta fazendo.
-FieldRenamed=Campo renomeado
-IfLoginDoesNotExistsCheckCreateUser=Se login não existe ainda, você deve verificar a opção "Criar usuário"
-ErrorConnection=Servidor <b>" %s",</b> nome do banco de dados <b>" %s",</b> login <b>" %s",</b> ou banco de dados senha pode estar errado ou PHP versão cliente pode ser muito velho para comparação de dados versão.
InstallChoiceRecommanded=Versao recomendada para instalação <b>%s</b> da sua versao corrente <b>%s</b>
InstallChoiceSuggested=<b>Escolha sugerida pelo sistema de installação</b>
MigrateIsDoneStepByStep=A versão (%s) alvo tem uma lacuna de varias versões, portanto o asistente de instalação retornara com a sugestão seguinte apos terminado esta instalação.
@@ -155,47 +96,26 @@ MigrationFinished=Migração terminada
LastStepDesc=<strong>Ultimo passo</strong>: Defina aqui o usuario e a senha que voce planeja usar para conectar-se ao software. Nao perca estas credenciais, pois sao da conta que administra todas as outras contas.
ActivateModule=Ativar modulo %s
ShowEditTechnicalParameters=Clique aqui para mostrar/editar parametros avançados (modo avançado)
-
-#########
-# upgrade
MigrationFixData=Correção para dados não normalizados
-MigrationOrder=Migração de dados para os clientes "ordens
-MigrationSupplierOrder=Migração de dados de Fornecedores' ordens
MigrationProposal=Migração de dados de propostas comerciais
MigrationInvoice=Migração de dados para os clientes "faturas
-MigrationContract=Migração de dados para os contratos
-MigrationSuccessfullUpdate=Atualização bem sucedida
MigrationUpdateFailed=Falied atualizar processo
MigrationRelationshipTables=Migração de dados para as tabelas de relação (%s)
-MigrationPaymentsUpdate=Pagamento correção de dados
-MigrationPaymentsNumberToUpdate=%s pagamento (s) para atualizar
-MigrationProcessPaymentUpdate=Atualização pagamento (s) %s
-MigrationPaymentsNothingToUpdate=Não há mais coisas para fazer
MigrationPaymentsNothingUpdatable=Não mais pagamentos que podem ser corrigidos
MigrationContractsUpdate=Contrato correção de dados
-MigrationContractsNumberToUpdate=%s contrato (s) para atualizar
-MigrationContractsLineCreation=Criar uma linha de contrato contrato ref %s
-MigrationContractsNothingToUpdate=Não há mais coisas para fazer
-MigrationContractsFieldDontExist=Campo fk_facture não existe mais. Nada a fazer.
MigrationContractsEmptyDatesUpdate=Contrato vazio data correção
MigrationContractsEmptyDatesUpdateSuccess=Contrato emtpy data correção feita com sucesso
MigrationContractsEmptyDatesNothingToUpdate=Nenhum contrato vazio data para corrigir
-MigrationContractsEmptyCreationDatesNothingToUpdate=Nenhum contrato data de criação para corrigir
MigrationContractsInvalidDatesUpdate=Bad data valor contrato correção
MigrationContractsInvalidDateFix=Corret contrato %s (Contrato date
-MigrationContractsInvalidDatesNumber=%s contratos modificados
MigrationContractsInvalidDatesNothingToUpdate=Não data com valor negativo para corrigir
MigrationContractsIncoherentCreationDateUpdate=Bad valor contrato data de criação correção
MigrationContractsIncoherentCreationDateUpdateSuccess=Bad valor contrato data de criação correção feita com sucesso
MigrationContractsIncoherentCreationDateNothingToUpdate=Não mau contrato data de criação de valor para corrigir
MigrationReopeningContracts=Abrir contrato encerrado pelo erro
-MigrationReopenThisContract=Reabra contrato %s
-MigrationReopenedContractsNumber=%s contratos modificados
MigrationReopeningContractsNothingToUpdate=Não encerrado contrato para abrir
MigrationBankTransfertsUpdate=Atualizar vínculos entre banco e uma transação bancária transferência
-MigrationBankTransfertsNothingToUpdate=Todas as ligações são até à data
MigrationShipmentOrderMatching=Sendings recepção atualização
-MigrationDeliveryOrderMatching=Entrega recepção atualização
MigrationDeliveryDetail=Entraga atualizada
MigrationStockDetail=Atualizar valores do estoque dos produtos
MigrationMenusDetail=Atualize menus das tabelas dinâmicas
@@ -205,7 +125,5 @@ MigrationProjectUserResp=Dados da migração do campo fk_user_resp de llx_projet
MigrationProjectTaskTime=Atualizar tempo gasto em sgundos
MigrationActioncommElement=Atualizar dados nas ações
MigrationPaymentMode=Migração de dados para o modo de pagamento
-MigrationCategorieAssociation=Migração de categorias
-
ShowNotAvailableOptions=Mostrar as opções não disponíveis
HideNotAvailableOptions=Esconder as opção não disponível
diff --git a/htdocs/langs/pt_BR/interventions.lang b/htdocs/langs/pt_BR/interventions.lang
index 2019b1645c07e64298b289f8974da00a42e571bb..bfd7757fb23a340b75f3a13830659deabd8fd486 100644
--- a/htdocs/langs/pt_BR/interventions.lang
+++ b/htdocs/langs/pt_BR/interventions.lang
@@ -1,40 +1,18 @@
# Dolibarr language file - Source file is en_US - interventions
-Intervention=Intervenção
-Interventions=Intervenções
-InterventionCard=Ficha de Intervenção
-NewIntervention=Nova Intervenção
-AddIntervention=Criar Intervenção
-ListOfInterventions=Lista de Intervenções
-EditIntervention=Editar
ActionsOnFicheInter=Açoes na intervençao
-LastInterventions=As %s últimas Intervenções
-AllInterventions=Todas as Intervenções
-CreateDraftIntervention=Criar Rascunho
CustomerDoesNotHavePrefix=O cliente não tem prefixoo de definido
InterventionContact=Contato Intervenção
-DeleteIntervention=Eliminar Intervenção
-ValidateIntervention=Confirmar Intervenção
ModifyIntervention=Modificar intervençao
-DeleteInterventionLine=Eliminar Linha de Intervenção
ConfirmDeleteIntervention=Tem certeza que quer eliminar esta intervenção?
ConfirmValidateIntervention=Tem certeza que quer Confirmar esta intervenção?
ConfirmModifyIntervention=Tem certeza que quer modificar esta intervenção?
ConfirmDeleteInterventionLine=Tem certeza que quer eliminar esta linha?
-NameAndSignatureOfInternalContact=Nome e Assinatura do Participante:
-NameAndSignatureOfExternalContact=Nome e Assinatura do Cliente:
-DocumentModelStandard=Modelo da Norma Intervenção
-InterventionCardsAndInterventionLines=Fichas e Linhas de Intervenção
-ClassifyBilled=Clasificar "Faturado"
StatusInterInvoiced=Faturado
RelatedInterventions=Intervençoes relativas
ShowIntervention=Mostrar intervençao
-##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Responsável do Seguimento da Intervenção
-TypeContact_fichinter_internal_INTERVENING=Interveniente
TypeContact_fichinter_external_BILLING=Contato do cliente da faturação da intervenção
TypeContact_fichinter_external_CUSTOMER=Contato do cliente do seguimento da intervenção
-# Modele numérotation
-ArcticNumRefModelDesc1=Modelo de numeração genérico
ArcticNumRefModelError=Ativação Impossível
PacificNumRefModelDesc1=Devolve o número com o formato %syymm-nnnn onde yy é o ano, mm. O mês e nnnn um contador seq�êncial sem ruptura e sem ficar a 0
PacificNumRefModelError=Uma fatura que começa por # $$syymm existe na base e é incompativel com esta numeração. Eliminia ou renomea-la para ativar este módulo.
diff --git a/htdocs/langs/pt_BR/languages.lang b/htdocs/langs/pt_BR/languages.lang
index c237b9e8dafb7865f753cd22dad2207208797aa3..b6de66e3bb30be4ef64d4dc884a64ee69cad66ca 100644
--- a/htdocs/langs/pt_BR/languages.lang
+++ b/htdocs/langs/pt_BR/languages.lang
@@ -1,9 +1,7 @@
# Dolibarr language file - Source file is en_US - languages
-
Language_ar_AR=Arabe
Language_ar_SA=Arabe
Language_bg_BG=Bulgaro
-Language_bs_BA=Bósnio
Language_ca_ES=Catalao
Language_cs_CZ=Tcheco
Language_da_DA=Danes
@@ -11,61 +9,33 @@ Language_da_DK=Danes
Language_de_DE=Alemao
Language_de_AT=Alemao (Austria)
Language_de_CH=Alemão (Suíça)
-Language_el_GR=Grego
Language_en_AU=Ingles (Australia)
Language_en_GB=Ingles (Renho Unido)
Language_en_IN=Ingles (India)
Language_en_NZ=Ingles (Nova Zelandia)
Language_en_SA=Ingles (Arabia Saudita)
Language_en_US=Ingles (Estados Unidos)
-Language_en_ZA=Inglês (África do Sul)
-Language_es_ES=Espanhol
Language_es_DO=Espanhol (República Dominicana)
-Language_es_AR=Espanhol (Argentina)
Language_es_CL=Espanhol (Chile)
-Language_es_HN=Espanhol (Honduras)
Language_es_MX=Espanhol (Mexico)
-Language_es_PY=Espanhol (Paraguai)
-Language_es_PE=Espanhol (Peru)
-Language_es_PR=Espanhol (Porto Rico)
Language_et_EE=Estone
-Language_eu_ES=Basco
Language_fa_IR=Persio
Language_fi_FI=Finlandes
Language_fr_BE=Fançes (Belgica)
Language_fr_CA=Françes (Canada)
Language_fr_CH=Françes (Suiça)
Language_fr_FR=Françes
-Language_fr_NC=Francês (Nova Caledónia)
Language_he_IL=Ebreo
-Language_hr_HR=Croata
Language_hu_HU=Ungeres
Language_id_ID=Indonésio
Language_is_IS=Islandes
-Language_it_IT=Italiano
Language_ja_JP=Japones
-Language_ko_KR=Coreano
-Language_lt_LT=Lituano
-Language_lv_LV=Letão
-Language_mk_MK=Macedónio
Language_nb_NO=Norveges (Bokmal)
-Language_nl_BE=Holandês (Bélgica)
Language_nl_NL=Holandês (Holanda)
Language_pl_PL=Polones
Language_pt_BR=Portugues (Brasil)
Language_pt_PT=Portugues
-Language_ro_RO=Romeno
-Language_ru_RU=Russo
Language_ru_UA=Russo (Ukrania)
-Language_tr_TR=Turco
-Language_sl_SI=Esloveno
-Language_sv_SV=Sueco
-Language_sv_SE=Sueco
-Language_sq_AL=Albanês
-Language_sk_SK=Eslovaco
Language_th_TH=Thai
-Language_uk_UA=Ucraniano
-Language_uz_UZ=Uzbeque
-Language_vi_VN=Vietnamita
Language_zh_CN=Chines
Language_zh_TW=Chines (Tradicional)
diff --git a/htdocs/langs/pt_BR/ldap.lang b/htdocs/langs/pt_BR/ldap.lang
index bad6ddd0bba281982cd7239d2a9d6c048fc70b8b..53e5d6957a567aecb076283f4f7b66415e362648 100644
--- a/htdocs/langs/pt_BR/ldap.lang
+++ b/htdocs/langs/pt_BR/ldap.lang
@@ -7,23 +7,10 @@ LdapUacf_DONT_EXPIRE_PASSWORD=A senha não caduca
LdapUacf_ACCOUNTDISABLE=A conta está desativada ao domínio
LDAPInformationsForThisContact=Informação da base de dados LDAP deste contato
LDAPInformationsForThisUser=Informação da base de dados LDAP deste usuário
-LDAPInformationsForThisGroup=Informação da base de dados LDAP deste grupo
-LDAPInformationsForThisMember=Informação da base de dados LDAP deste membro
-LDAPAttribute=Atributo LDAP
-LDAPAttributes=Atributos LDAP
-LDAPCard=Ficha LDAP
-LDAPRecordNotFound=Registo não encontrado na base de dados LDAP
LDAPUsers=Usuário na base de dados LDAP
-LDAPGroups=Grupos na base de dados LDAP
-LDAPFieldStatus=Estatuto
-LDAPFieldFirstSubscriptionDate=Data primeira adesão
LDAPFieldFirstSubscriptionAmount=Valor da Primeira Adesão
LDAPFieldLastSubscriptionDate=Data da Última Adesão
LDAPFieldLastSubscriptionAmount=Valor Última Adesão
SynchronizeDolibarr2Ldap=Sincronizar usuário (Dolibarr -> LDAP)
UserSynchronized=Usuário Sincronizado
-GroupSynchronized=Grupo sincronizado
-MemberSynchronized=Membro sincronizado
-ContactSynchronized=Contato sincronizado
-ForceSynchronize=forçar sincronização Dolibarr -> LDAP
ErrorFailedToReadLDAP=Erro na leitura do anuário LDAP. Verificar a configuração do módulo LDAP e a acessibilidade do anuário.
diff --git a/htdocs/langs/pt_BR/link.lang b/htdocs/langs/pt_BR/link.lang
index 8b1efb75ef372daf24c660017c22d0cda43189b8..c7f0b5b148eb758a4955fd20a4d7a7d59adba27d 100644
--- a/htdocs/langs/pt_BR/link.lang
+++ b/htdocs/langs/pt_BR/link.lang
@@ -1,8 +1,9 @@
+# Dolibarr language file - Source file is en_US - link
LinkANewFile=Link a new file/document
LinkedFiles=Linked files and documents
NoLinkFound=No registered links
LinkComplete=The file has been linked successfully
ErrorFileNotLinked=The file could not be linked
LinkRemoved=The link %s has been removed
-ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
-ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
+ErrorFailedToDeleteLink=Failed to remove link '<b>%s</b>'
+ErrorFailedToUpdateLink=Failed to update link '<b>%s</b>'
diff --git a/htdocs/langs/pt_BR/mailmanspip.lang b/htdocs/langs/pt_BR/mailmanspip.lang
index f19d9b799848bf751fc5e649cd8d985554580d8c..c557e75795016b27374335deaba197cdbf6b130c 100644
--- a/htdocs/langs/pt_BR/mailmanspip.lang
+++ b/htdocs/langs/pt_BR/mailmanspip.lang
@@ -1,27 +1,14 @@
# Dolibarr language file - Source file is en_US - mailmanspip
-MailmanSpipSetup=Configuração do módulo Mailman e SPIP
-MailmanTitle=Sistema de envio em massa Mailman
-TestSubscribe=Para testar a inscriçao nas listas Mailman
-TestUnSubscribe=Para testa a desenscriçao das listas do Mailman
-MailmanCreationSuccess=Teste de inscriçao executado com sucesso
+MailmanCreationSuccess=Teste de inscriçao executado com sucesso
MailmanDeletionSuccess=Teste de desenscriçao executado com sucesso
-SynchroMailManEnabled=O Mailman sera atualizado
SynchroSpipEnabled=O SPIP sera atualizado
-DescADHERENT_MAILMAN_ADMINPW=Senha do administrador Mailman
-DescADHERENT_MAILMAN_URL=URL para inscriçoes Mailman
-DescADHERENT_MAILMAN_UNSUB_URL=URL para desenscriçoes Mailman
DescADHERENT_MAILMAN_LISTS=Lista(s) para inscriçao automatica de novos membros (separado por virgula)
-SPIPTitle=Gerenciamento do conteudo do sistema SPIP
-DescADHERENT_SPIP_SERVEUR=Servidor SPIP
DescADHERENT_SPIP_DB=Nome do banco de dados SPIP
DescADHERENT_SPIP_USER=Login do banco de dados SPIP
DescADHERENT_SPIP_PASS=Senha do banco de dados SPIP
AddIntoSpip=Adicionar no SPIP
AddIntoSpipConfirmation=Tem certeza que quer adicionar este membro no SPIP ?
AddIntoSpipError=Falha em adicionar o usuario no SPIP
-DeleteIntoSpip=Remover do SPIP
DeleteIntoSpipConfirmation=Tem certeza que quer remover este membro do SPIP ?
DeleteIntoSpipError=Falha no suprimir o usuario do SPIP
SPIPConnectionFailed=Falha na conexao com o SPIP
-SuccessToAddToMailmanList=Adicao de %s na lista Mailman %s ou SPIP banco de dados completado
-SuccessToRemoveToMailmanList=Remoçao de %s na lista Mailman %s ou SPIP banco de dados completado
diff --git a/htdocs/langs/pt_BR/mails.lang b/htdocs/langs/pt_BR/mails.lang
index a411c0a72daca66d93a2577c57c8e4537c8c014b..71482c658bd15810aa71a3dd90a6f499eb9543b3 100644
--- a/htdocs/langs/pt_BR/mails.lang
+++ b/htdocs/langs/pt_BR/mails.lang
@@ -1,47 +1,10 @@
# Dolibarr language file - Source file is en_US - mails
-Mailing=Mailing
-EMailing=Mailing
-Mailings=Mailings
-EMailings=Mailings
-AllEMailings=Todos os E-Mailings
-MailCard=Ficha de Mailing
MailTargets=Destinatários
-MailRecipients=Dsetinatarios
MailRecipient=Destinatário
-MailTitle=Titulo
-MailFrom=Remetente
-MailErrorsTo=Erros a
-MailReply=Responder a
MailTo=Destinatário(s)
-MailCC=Cópia a
-MailCCC=Adicionar Cópia a
-MailTopic=Assunto do e-mail
-MailText=Mensagem
MailFile=Arquivo
-MailMessage=Mensagem do e-mail
-ShowEMailing=Mostrar E-Mailing
-ListOfEMailings=Lista de mailings
-NewMailing=Novo Mailing
-EditMailing=Editar Mailing
ResetMailing=Limpar Mailing
-DeleteMailing=Eliminar Mailing
-DeleteAMailing=Eliminar um Mailing
-PreviewMailing=Previsualizar um Mailing
-PrepareMailing=Preparar Mailing
-CreateMailing=Criar E-Mailing
-MailingDesc=Esta página permite enviar e-mails a um grupo de pessoas.
MailingResult=Resultado do envio de e-mails
-TestMailing=Teste mailing
-ValidMailing=Confirmar Mailing
-ApproveMailing=Aprovar Mailing
-MailingStatusDraft=Rascunho
-MailingStatusValidated=Validado
-MailingStatusApproved=Aprovado
-MailingStatusSent=Enviado
-MailingStatusSentPartialy=Enviado Parcialmente
-MailingStatusSentCompletely=Enviado Completamente
-MailingStatusError=Erro
-MailingStatusNotSent=Não Enviado
MailSuccessfulySent=E-mail enviado corretamente (de %s a %s)
MailingSuccessfullyValidated=Emailins validado com sucesso
MailUnsubcribe=Desenscrever
@@ -49,9 +12,7 @@ Unsuscribe=Desenscrever
MailingStatusNotContact=Nao contactar mais
ErrorMailRecipientIsEmpty=A endereço do destinatário está vazia
WarningNoEMailsAdded=nenhum Novo e-mail a Adicionar à lista destinatários.
-ConfirmValidMailing=Confirma a validação do mailing?
ConfirmResetMailing=Confirma a limpeza do mailing?
-ConfirmDeleteMailing=Confirma a eliminação do mailing?
NbOfRecipients=Número de destinatários
NbOfUniqueEMails=N� de e-mails únicos
NbOfEMails=N� de E-mails
@@ -59,9 +20,7 @@ TotalNbOfDistinctRecipients=Número de destinatários únicos
NoTargetYet=Nenhum destinatário definido
AddRecipients=Adicionar destinatários
RemoveRecipient=Eliminar destinatário
-CommonSubstitutions=Substituições comuns
YouCanAddYourOwnPredefindedListHere=Para Criar o seu módulo de seleção e-mails, tem que ir a htdocs/core/modules/mailings/README.
-EMailTestSubstitutionReplacedByGenericValues=Em modo teste, as Variávels de substituição são sustituidas por valores genéricos
MailingAddFile=Adicionar este Arquivo
NoAttachedFiles=Sem arquivos anexos
BadEMail=Valor errado para e-mail
@@ -70,9 +29,6 @@ ConfirmCloneEMailing=Voce tem certeza que quer clonar este e-mailing ?
CloneContent=Clonar mensagem
CloneReceivers=Clonar recebidores
DateLastSend=Data ultimo envio
-DateSending=Data envio
-SentTo=Enviado para <b>%s</b>
-MailingStatusRead=Ler
CheckRead=Ler recebidor
YourMailUnsubcribeOK=O e-mail <b>%s</b> foi removido com sucesso da lista
MailtoEMail=Hyper-link ao e-mail
@@ -87,11 +43,8 @@ RemindSent=%s lembrete(s) de envio
AllRecipientSelectedForRemind=Todos os endereços de e-mails dos representantes selecionados (note que será enviada uma mensagem por fatura)
NoRemindSent=Sem lembrete de e-mail enviado
ResultOfMassSending=Resultado do lembretes de envio em massa de e-mails
-
-# Libelle des modules de liste de destinataires mailing
MailingModuleDescContactCompanies=Contatos de Fornecedores (clientes potenciais, clientes, Fornecedores...)
MailingModuleDescDolibarrUsers=Usuários de Dolibarr que tem e-mail
-MailingModuleDescFundationMembers=Membros que tem e-mail
MailingModuleDescEmailsFromFile=E-Mails de um Arquivo (e-mail;Nome;Vários)
MailingModuleDescEmailsFromUser=Entrar e-mails de usuario (email;sobrenome;nome;outro)
MailingModuleDescContactsCategories=Fornecedores com e-mail (por categoria)
@@ -103,36 +56,25 @@ MailingModuleDescContactsByFunction=Contatos/Enderecos de terceiros (por posiç
LineInFile=Linha %s em arquivo
RecipientSelectionModules=Módulos de seleção dos destinatários
MailSelectedRecipients=Destinatários selecionados
-MailingArea=Área mailings
-LastMailings=Os %s últimos mailings
TargetsStatistics=Estatísticas destinatários
NbOfCompaniesContacts=Contatos únicos de empresas
MailNoChangePossible=Destinatários de um mailing validado não modificaveis
-SearchAMailing=Procurar um mailing
-SendMailing=Enviar mailing
-SendMail=Enviar e-mail
-SentBy=Enviado por
MailingNeedCommand=Para razões de segurança, o envio de um mailing em massa e melhor quando feito da linha de comando. Se voce tem uma, pergunte ao seu administrador de serviço de executar o comando seguinte para enviar o mailing em massa a todos os destinatarios:
MailingNeedCommand2=Pode enviar em linha adicionando o parâmetro MAILING_LIMIT_SENDBYWEB com um valor número que indica o máximo n� de e-mails enviados por Sessão.
ConfirmSendingEmailing=Caso voçê não pode ou prefere envia-los do seu www navegador, por favor confirme que voce tem certeza que quer enviar um mailing em massa do seu navegador ?
-LimitSendingEmailing=Observação: Envios online de mailings em massa são limitados por causa de segurança e tempo limite a n.<b>%s</b> destinatarios por sessão de envio.
-TargetsReset=Limpar lista
+LimitSendingEmailing=Observação: Envios de mailings em massa da interface web são feitas em varias vezes por causa de segurança e tempo limite, <b>%s</b> destinatarios por sessão de envio.
ToClearAllRecipientsClickHere=Para limpar a lista dos destinatários deste mailing, faça click ao botão
ToAddRecipientsChooseHere=Para Adicionar destinatários, escoja os que figuran em listas a continuação
NbOfEMailingsReceived=Mailings em massa recebidos
NbOfEMailingsSend=E-mails em massa enviados
-IdRecord=ID registo
-DeliveryReceipt=Recibo de recpção
YouCanUseCommaSeparatorForSeveralRecipients=Pode usar o caracter0 de separação <b>coma </b> para especificar multiplos destinatários.
TagCheckMail=Seguir quando o e-mail sera lido
TagUnsubscribe=Atalho para se desenscrever
TagSignature=Assinatura do remetente
TagMailtoEmail=E-mail destinatario
-# Module Notifications
-Notifications=Notificações
-NoNotificationsWillBeSent=Nenhuma notificação por e-mail está prevista para este evento e empresa
-ANotificationsWillBeSent=1 notificação vai a ser enviada por e-mail
-SomeNotificationsWillBeSent=%s Notificações vão ser enviadas por e-mail
-AddNewNotification=Ativar uma Nova pedido de notificação
-ListOfActiveNotifications=Lista das pedidos de Notificações ativas
+AddNewNotification=Ativar uma nova notificação email para alvo
+ListOfActiveNotifications=Listar todos os alvos ativos para notificação de email
ListOfNotificationsDone=Listar todas as notificações de e-mail enviadas
+MailSendSetupIs=Configuração do envio de e-mails foi configurado a '%s'. Este modo não pode ser usado para envios de massa de e-mails.
+MailSendSetupIs2=Voçê precisa primeiramente acessar com uma conta de Administrador o menu %sInicio - Configurações - EMails%s para mudar o parametro <strong>'%s'</strong> para usar o modo '%s'. Neste modo voçê pode entrar a configuração do servidor SMTP fornecido pelo seu Provedor de Acesso a Internet e usar a funcionalidade de envios de massa de EMails.
+MailSendSetupIs3=Se tiver perguntas sobre como configurar o seu servidor SMTP voçê pode perguntar %s.
diff --git a/htdocs/langs/pt_BR/main.lang b/htdocs/langs/pt_BR/main.lang
index 662ace989a34a7df6efadb0544ef66149aae6037..be5e7c3b1463197d3ead33cb17bfbebc311683b9 100644
--- a/htdocs/langs/pt_BR/main.lang
+++ b/htdocs/langs/pt_BR/main.lang
@@ -1,9 +1,5 @@
# Dolibarr language file - Source file is en_US - main
DIRECTION=ltr
-# Note for Chinese:
-# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
-# stsongstdlight or cid0cs are for simplified Chinese
-# To read Chinese pdf with Linux: sudo apt-get install poppler-data
FONTFORPDF=helvetica
FONTSIZEFORPDF=10
SeparatorDecimal=,
@@ -23,97 +19,53 @@ FormatDateHourSecShort=%d/%m/%Y %I:%M:%S %p
FormatDateHourTextShort=%d %b, %Y, %I:%M %p
FormatDateHourText=%d %B, %Y, %I:%M %p
DatabaseConnection=Login à Base de Dados
-NoTranslation=Sem tradução
NoRecordFound=Registro nao encontrado
NoError=Sem erro
-Error=Erro
-ErrorFieldRequired=O campo '%s' é obrigatório
ErrorFieldFormat=O campo '%s' tem um valor incorreto
ErrorFileDoesNotExists=O Arquivo %s não existe
ErrorFailedToOpenFile=Impossível abrir o arquivo %s
-ErrorCanNotCreateDir=Impossível criar a pasta %s
-ErrorCanNotReadDir=Impossível ler a pasta %s
-ErrorConstantNotDefined=Parâmetro %s não definido
-ErrorUnknown=Erro desconhecido
-ErrorSQL=Erro de SQL
ErrorLogoFileNotFound=O arquivo logo '%s' não se encontra
-ErrorGoToGlobalSetup=Ir á configuração ' Empresa/Instituição ' para corrigir
-ErrorGoToModuleSetup=Ir á configuração do módulo para corrigir
ErrorFailedToSendMail=Erro ao envio do e-mail (emissor
ErrorAttachedFilesDisabled=A Administração dos arquivos associados está desativada neste servidor
ErrorFileNotUploaded=O arquivo não foi possível transferir
-ErrorInternalErrorDetected=Erro detectado
-ErrorNoRequestRan=Nenhuma petição realizada
-ErrorWrongHostParameter=Parâmetro Servidor inválido
ErrorYourCountryIsNotDefined=O seu país não está definido. corrija indo a Configuração-Geral-Editar
ErrorRecordIsUsedByChild=Impossível de suprimir este registo. Esta sendo utilizado como pai pelo menos em um registo filho.
ErrorWrongValue=Valor incorreto
ErrorWrongValueForParameterX=Valor incorreto do parâmetro %s
-ErrorNoRequestInError=Nenhuma petição em erro
ErrorServiceUnavailableTryLater=Serviço não disponível atualmente. Volte a execução mais tarde.
-ErrorDuplicateField=Duplicado num campo único
-ErrorSomeErrorWereFoundRollbackIsDone=Encontraram-se alguns erros. Modificações desfeitas.
ErrorConfigParameterNotDefined=O parâmetro <b>%s</b> não está definido ao arquivo de configuração Dolibarr <b>conf.php</b>.
ErrorCantLoadUserFromDolibarrDatabase=Impossível encontrar o usuário <b>%s</b> na base de dados do Dolibarr.
ErrorNoVATRateDefinedForSellerCountry=Erro, nenhum tipo de ICMS definido para o país '%s'.
ErrorNoSocialContributionForSellerCountry=Erro, nenhum tipo de contribuição social definido para o pais '%s'.
ErrorFailedToSaveFile=Erro, o registo do arquivo falhou.
-ErrorOnlyPngJpgSupported=Erro, somente suportam os formatos de imagem jpg e png.
-ErrorImageFormatNotSupported=A sua versão PHP não suporta as funções de conVersão deste formato de imagen.
-SetDate=Definir data
SelectDate=Selecionar uma data
SeeAlso=Ver tambem %s
BackgroundColorByDefault=Cor do fundo padrão
+FileNotUploaded=O arquivo nao foi carregado
+FileUploaded=O arquivo foi carregado com sucesso
FileWasNotUploaded=O arquivo foi selecionado, mas nao foi ainda enviado. Clique no "Anexar arquivo" para proceder.
NbOfEntries=Nr. de entradas
GoToWikiHelpPage=Ler ajuda online ( necesita de acosso a internet)
GoToHelpPage=Consulte a ajuda (pode necessitar de acesso à internet)
-RecordSaved=Registo Guardado
RecordDeleted=Registro apagado
LevelOfFeature=Nível de funções
-NotDefined=Não Definida
DefinedAndHasThisValue=Definido e valor para
-IsNotDefined=indefinido
DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr está configurado em modo de autenticação <b>%s</b> ao arquivo de configuração <b>conf.php</b>.<br> Eso significa que a base de dados das Senhas é externa a Dolibarr, por eso toda modificação deste campo pode resultar sem efeito alguno.
-Administrator=Administrador
-Undefined=Não Definido
PasswordForgotten=Esqueceu de da sua senha?
-SeeAbove=Mencionar anteriormente
-HomeArea=Área Principal
LastConnexion=último login
PreviousConnexion=último login
ConnectedOnMultiCompany=Conectado no ambiente
-ConnectedSince=Conectado desde
-AuthenticationMode=Modo autenticação
-RequestedUrl=Url solicitada
DatabaseTypeManager=Tipo de gerente de base de dados
RequestLastAccess=Petição último acesso e a base de dados
RequestLastAccessInError=Petição último acesso e a base de dados errado
ReturnCodeLastAccessInError=Código devolvido último acesso e a base de dados errado
InformationLastAccessInError=informação sobre o último acesso e a base de dados errado
-DolibarrHasDetectedError=O Dolibarr detectou um erro técnico
-InformationToHelpDiagnose=É aqui que a informação pode ajudar no diagnóstico
-MoreInformation=Mais Informação
-TechnicalInformation=Informação técnica
-NotePublic=Nota (pública)
-NotePrivate=Nota (privada)
PrecisionUnitIsLimitedToXDecimals=Dolibarr está configurado para limitar a precisão dos preços unitários a <b>%s</b> Decimais.
-DoTest=Teste
-ToFilter=Filtrar
WarningYouHaveAtLeastOneTaskLate=Atenção, tem um elemento a menos que passou a data de tolerância.
yes=sim
-Yes=Sim
no=não
-No=Não
-All=Tudo
-Home=Inicio
-Help=Ajuda
OnlineHelp=Ajuda online
PageWiki=Pagina wiki
-Always=Sempre
-Never=Nunca
-Under=Baixo
-Period=Periodo
PeriodEndDate=Data final periodo
Activate=Ativar
Activated=Ativado
@@ -123,175 +75,53 @@ Enabled=Ativado
Deprecated=Obsoleto
Disable=Desativar
Disabled=Desativado
-Add=Adicionar
-AddLink=Adicionar link
-Update=Modificar
AddActionToDo=Adicionar ação a realizar
AddActionDone=Adicionar ação realizada
-Close=Fechar
-Close2=Fechar
-Confirm=Confirmar
-ConfirmSendCardByMail=Quer enviar esta ficha por e-mail?
-Delete=Eliminar
-Remove=Retirar
-Resiliate=Cancelar
-Cancel=Cancelar
-Modify=Modificar
-Edit=Editar
-Validate=Confirmar
-ToValidate=A Confirmar
-Save=Guardar
-SaveAs=Guardar como
TestConnection=Teste a login
-ToClone=Cópiar
ConfirmClone=Selecciones dados que deseja Cópiar.
-NoCloneOptionsSpecified=Não existem dados definidos para copiar
-Of=de
Go=Ir
Run=Attivo
-CopyOf=Cópia de
-Show=Ver
-ShowCardHere=Mostrar cartão
-Search=Procurar
SearchOf=Procurar
-Valid=Confirmar
-Approve=Aprovar
-ReOpen=Reabrir
Upload=Enviar Arquivo
-ToLink=Link
Select=Selecionar
-Choose=Escolher
-ChooseLangage=Escolher o seu idioma
Resize=Modificar tamanho
Recenter=Recolocar no centro
-Author=Autor
User=Usuário
Users=Usuário
-Group=Grupo
-Groups=Grupos
Password=Senha
PasswordRetype=Repetir Senha
NoteSomeFeaturesAreDisabled=Antenção, só poucos módulos/funcionalidade foram ativados nesta demo
-Name=Nome
-Person=Pessoa
-Parameter=Parâmetro
-Parameters=Parâmetros
-Value=Valor
-GlobalValue=Valor global
-PersonalValue=Valor Personalizado
-NewValue=Novo valor
CurrentValue=Valor atual
-Code=Código
-Type=Tipo
-Language=Idioma
-MultiLanguage=Multi Idioma
-Note=Nota
CurrentNote=Nota atual
-Title=Título
-Label=Etiqueta
-RefOrLabel=Ref. da etiqueta
-Info=Log
-Family=Familia
-Description=Descrição
-Designation=Designação
-Model=Modelo
DefaultModel=Modelo Padrão
Action=Ação
-About=Acerca de
-Number=Número
NumberByMonth=Numero por mes
-AmountByMonth=Valor por mês
-Numero=Número
Limit=Límite
-Limits=Limites
DevelopmentTeam=Equipe de Desenvolvimento
Logout=Sair
NoLogoutProcessWithAuthMode=No recurso de desconexão aplicativo com modo de autenticação
Connection=Login
-Setup=Configuração
-Alert=Alerta
-Previous=Anterior
-Next=Seguinte
-Cards=Fichas
-Card=Ficha
Now=Agora
-Date=Data
DateStart=Data Inicio
DateEnd=Data Fim
-DateCreation=Data de Criação
-DateModification=Data Modificação
-DateModificationShort=Data Modif.
DateLastModification=Data última Modificação
DateValidation=Data Validação
-DateClosing=Data de Encerramento
-DateDue=Data Vencimento
-DateValue=Data Valor
-DateValueShort=Data Valor
-DateOperation=Data Operação
-DateOperationShort=Data Op.
DateLimit=Data Límite
-DateRequest=Data Consulta
-DateProcess=Data Processo
-DatePlanShort=Data Planif.
-DateRealShort=Data Real
-DateBuild=Data da geração do Relatório
-DatePayment=Data de pagamento
-DurationYear=Ano
-DurationMonth=Mês
-DurationWeek=Semana
DurationDay=Día
-DurationYears=Anos
-DurationMonths=Meses
-DurationWeeks=Semanas
-DurationDays=Dias
-Year=Ano
-Month=Mês
-Week=Semana
Day=Día
-Hour=Hora
-Minute=Minuto
-Second=Segundo
-Years=Anos
-Months=Meses
-Days=Dias
days=Dias
-Hours=Horas
-Minutes=Minutos
-Seconds=Segundos
-Today=Hoje
-Yesterday=Ontem
-Tomorrow=Amanhã
Morning=Manha
-Afternoon=Tarde
Quadri=Trimistre
-MonthOfDay=Dia do mês
-HourShort=H
-Rate=Tipo
UseLocalTax=Incluindo taxa
-Bytes=Bytes
-KiloBytes=Kilobytes
-MegaBytes=Megabytes
-GigaBytes=Gigabytes
-TeraBytes=Terabytes
-b=b.
-Kb=Kb
-Mb=Mb
-Gb=Gb
Tb=Tb
-Cut=Cortar
Copy=Cópiar
-Paste=Colar
Default=Padrao
DefaultValue=Valor por default
-DefaultGlobalValue=Valor global
-Price=Preço
UnitPrice=Preço Unit.
-UnitPriceHT=Preço Base
UnitPriceTTC=Preço Unit. Total
PriceU=Preço Unit.
PriceUHT=Preço Unit.
PriceUTTC=Preço Unit. Total
-Amount=Valor
AmountInvoice=Valor Fatura
AmountPayment=Valor Pagamento
AmountHTShort=Valor (neto)
@@ -305,147 +135,53 @@ AmountLT1ES=Valor RE
AmountLT2ES=Valor IRPF
AmountTotal=Valor Total
AmountAverage=Valor médio
-PriceQtyHT=Preço para a quantidade total
-PriceQtyMinHT=Preço quantidade min total
-PriceQtyTTC=Preço total para a quantidade
-PriceQtyMinTTC=Preço quantidade min. total
-Percentage=Percentagem
-Total=Total
-SubTotal=Subtotal
TotalHTShort=Total (neto)
TotalTTCShort=Total (incl. taxas)
TotalHT=Valor
TotalHTforthispage=Total (sem impostos) desta pagina
TotalTTC=Total
-TotalTTCToYourCredit=Total a crédito
TotalVAT=Total do ICMS
TotalLT1=Total taxa 2
TotalLT2=Total taxa 3
TotalLT1ES=Total RE
-TotalLT2ES=Total IRPF
IncludedVAT=ICMS incluido
HT=Sem ICMS
TTC=ICMS Incluido
VAT=ICMS
-LT1ES=RE
-LT2ES=IRPF
VATRate=Taxa ICMS
-Average=Média
-Sum=Soma
-Delta=Divergencia
-Module=Módulo
-Option=Opção
-List=Lista
FullList=Lista Completa
-Statistics=Estatísticas
OtherStatistics=Outras estatisticas
-Status=Estado
+Favorite=Favorito
ShortInfo=Info.
-Ref=Ref.
RefSupplier=Ref. Fornecedor
RefPayment=Ref. Pagamento
-CommercialProposalsShort=Orçamentos
Comment=Comentario
Comments=Comentarios
ActionsToDo=Ações a realizar
ActionsDone=Ações realizadas
-ActionsToDoShort=A realizar
ActionsRunningshort=Iniciada
-ActionsDoneShort=Realizadas
ActionNotApplicable=Não aplicavel
ActionRunningNotStarted=A Iniciar
-ActionRunningShort=Iniciado
-ActionDoneShort=Terminado
ActionUncomplete=Imcompleto
CompanyFoundation=Companhia/Fundação
ContactsForCompany=Contatos desta empresa
ContactsAddressesForCompany=Contatos/Endereços do Cliente ou Fornecedor
-AddressesForCompany=Endereços para este terceiro
ActionsOnCompany=Ações nesta sociedade
ActionsOnMember=Eventos deste membro
NActions=%s ações
-NActionsLate=%s em atraso
-Filter=Filtro
-RemoveFilter=Eliminar filtro
-ChartGenerated=Gráficos gerados
-ChartNotGenerated=Gráfico não gerado
+RequestAlreadyDone=Pedido ja registrado
GeneratedOn=Gerado a %s
-Generate=Gerar
-Duration=Duração
-TotalDuration=Duração total
-Summary=Resumo
-MyBookmarks=Os Meus Favoritos
-OtherInformationsBoxes=Outras Caixas de informação
-DolibarrBoard=Indicadores
-DolibarrStateBoard=Estatísticas
-DolibarrWorkBoard=Indicadores de Trabalho
Available=Disponivel
NotYetAvailable=Ainda não disponível
NotAvailable=Não disponível
-Popularity=Popularidade
-Categories=Categorias
-Category=Categoria
-By=Por
-From=De
to=para
-and=e
-or=ou
-Other=Outro
-Others=Outros
-OtherInformations=Outras Informações
-Quantity=quantidade
-Qty=Quant.
-ChangedBy=Modificado por
-ReCalculate=Recalcular
-ResultOk=Éxito
-ResultKo=Erro
-Reporting=Relatório
-Reportings=Relatórios
-Draft=Rascunho
Drafts=Drafts
-Validated=Validado
-Opened=Aberto
-New=Novo
-Discount=Desconto
-Unknown=Desconhecido
-General=General
-Size=Tamanho
-Received=Recebido
-Paid=Pago
-Topic=Assunto
-ByCompanies=Por empresa
ByUsers=Por usuário
-Links=Links
-Link=Link
-Receipts=Recibos
-Rejects=Reprovado
Preview=Preview
-NextStep=Passo Seguinte
-PreviousStep=Passo Anterior
-Datas=Dados
-None=Nenhum
-NoneF=Nenhuma
-Late=Atraso
-Photo=Foto
-Photos=Fotos
-AddPhoto=Adicionar foto
Login=Login
CurrentLogin=Login atual
-January=Janeiro
-February=Fevereiro
-March=Março
-April=Abril
-May=Maio
-June=Junho
-July=Julho
-August=Agosto
-September=Setembro
-October=Outubro
-November=Novembro
-December=Dezembro
JanuaryMin=Jan
FebruaryMin=Fev
-MarchMin=Mar
AprilMin=Abr
MayMin=Mai
JuneMin=Jun
@@ -455,18 +191,6 @@ SeptemberMin=Set
OctoberMin=Out
NovemberMin=Nov
DecemberMin=Dez
-Month01=Janeiro
-Month02=Fevereiro
-Month03=Março
-Month04=Abril
-Month05=Maio
-Month06=Junho
-Month07=Julho
-Month08=Agosto
-Month09=Setembro
-Month10=Outubro
-Month11=Novembro
-Month12=Dezembro
MonthShort01=Jan
MonthShort02=Fev
MonthShort03=Mar
@@ -481,52 +205,18 @@ MonthShort11=Nov
MonthShort12=Dez
AttachedFiles=Arquivos e Documentos Anexos
FileTransferComplete=Foi transferido corretamente o Arquivo
-DateFormatYYYYMM=YYYY-MM
-DateFormatYYYYMMDD=YYYY-MM-DD
-DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
-ReportName=Nome do Relatório
ReportPeriod=Periodo de Análise
-ReportDescription=Descrição
-Report=Relatório
-Keyword=Chave
-Legend=Legenda
FillTownFromZip=Indicar Município
Fill=Preencher
Reset=Resetar
ShowLog=Ver Histórico
-File=Arquivo
Files=Arquivos
-NotAllowed=Não Autorizado
-ReadPermissionNotAllowed=Leitura não Autorizada
AmountInCurrency=Valores Apresentados em %s
-Example=Exemplo
-Examples=Exemplos
-NoExample=Sem Exemplo
-FindBug=Sinalizar um bug
NbOfThirdParties=Numero de Fornecedores
-NbOfCustomers=Numero de Clientes
-NbOfLines=Numeros de Linhas
NbOfObjects=Numero de Objetos
NbOfReferers=Numero de Referencias
Referers=Referindo-se objetos
-TotalQuantity=Quantidade Total
-DateFromTo=De %s a %s
-DateFrom=A partir de %s
-DateUntil=Até %s
-Check=Verificar
-Internal=Interno
-External=Externo
-Internals=Internos
-Externals=Externos
-Warning=Alerta
-Warnings=Alertas
-BuildPDF=Gerar o PDF
-RebuildPDF=Recriar o PDF
-BuildDoc=Gerar o doc
-RebuildDoc=Recriar o doc
-Entity=Entidade
Entities=Entidadees
-EventLogs=Log
CustomerPreview=Historico Cliente
SupplierPreview=Historico Fornecedor
AccountancyPreview=Historico Contabilidade
@@ -534,80 +224,26 @@ ShowCustomerPreview=Ver Historico Cliente
ShowSupplierPreview=Ver Historico Fornecedor
ShowAccountancyPreview=Ver Historico Contabilidade
ShowProspectPreview=Ver Historico Cliente Potencial
-RefCustomer=Ref. Cliente
-Currency=Moeda
-InfoAdmin=Informação para os administradores
-Undo=Desfazer
-Redo=Refazer
-ExpandAll=Expandir tudo
-UndoExpandAll=Anular Expansão
-Reason=Razão
-FeatureNotYetSupported=Funcionalidade ainda não suportada
-CloseWindow=Fechar Janela
-Question=Pregunta
-Response=Resposta
-Priority=Prioridade
SendByMail=Enviado por e-mail
-MailSentBy=Mail enviado por
-TextUsedInTheMessageBody=Texto utilizado no corpo da mensagem
-SendAcknowledgementByMail=Envio rec. por e-mail
-NoEMail=Sem e-mail
NoMobilePhone=Sem celular
Owner=Proprietário
-DetectedVersion=Versão Detectada
-FollowingConstantsWillBeSubstituted=As seguintes constantes serão substituidas pelo seu valor correspondente.
Refresh=Atualizar
-BackToList=Mostar Lista
-GoBack=Voltar
CanBeModifiedIfOk=Pode modificarse se é valido
CanBeModifiedIfKo=Pode modificarse senão é valido
-RecordModifiedSuccessfully=Registo modificado com êxito
RecordsModified=%s registros modificados
-AutomaticCode=Criação automática de código
-NotManaged=Não gerado
FeatureDisabled=Função Desativada
-MoveBox=Mover a Caixa %s
-Offered=Oferta
NotEnoughPermissions=Não tem permissões para esta ação
-SessionName=Nome Sessão
-Method=Método
-Receive=Recepção
-PartialWoman=Parcial
-PartialMan=Parcial
-TotalWoman=Total
-TotalMan=Total
-NeverReceived=Nunca Recebido
-Canceled=Cancelado
YouCanChangeValuesForThisListFromDictionarySetup=Voce pode modificar os valores para esta lista no menu Configuração - dicionario
-Color=Cor
-Documents=Documentos
DocumentsNb=Arquivos conectados (%s)
-Documents2=Documentos
-BuildDocuments=Documentos Gerados
UploadDisabled=Carregamento Desativada
-MenuECM=Documentos
-MenuAWStats=Estatisticas
-MenuMembers=Membros
-MenuAgendaGoogle=Agenda Google
-ThisLimitIsDefinedInSetup=Límite Dolibarr (menu inicio-configuração-segurança): %s Kb, PHP limit: %s Kb
-NoFileFound=Não existem documentos guardados nesta pasta
CurrentUserLanguage=Idioma atual
CurrentTheme=Tema atual
CurrentMenuManager=Administração do menu atual
DisabledModules=Módulos desativados
-For=Para
-ForCustomer=Para cliente
-Signature=Assinatura
HidePassword=Mostrar comando com senha oculta
UnHidePassword=Mostrar comando com senha e a vista
-Root=Raíz
-Informations=Informação
-Page=Página
-Notes=Notas
-AddNewLine=Adicionar nova linha
AddFile=Adicionar arquivo
ListOfFiles=Lista de arquivos disponiveis
-FreeZone=Entrada livre
FreeLineOfType=Entrada livre de tipo
CloneMainAttributes=Clonar o objeto com estes atributos
PDFMerge=Fusão de PDF
@@ -616,95 +252,50 @@ PrintContentArea=Mostrar pagina a se imprimir na area principal
MenuManager=Administração do menu
NoMenu=Sem sub-menu
WarningYouAreInMaintenanceMode=Atenção, voce esta no modo de manutenção, somente o login <b>%s</b> tem permissões para uso da aplicação no momento.
-CoreErrorTitle=Erro de sistema
-CoreErrorMessage=Occoreu erro. Verifique os arquivos de log ou contate seu administrador de sistema.
+CoreErrorMessage=Occoreu erro. Verifique os arquivos de log ou contate seu administrador de sistema.
CreditCard=Cartão de credito
FieldsWithAreMandatory=Campos com <b>%s</b> são obrigatorios
FieldsWithIsForPublic=Campos com <b>%s</b> são mostrados na lista publica de membros. Se não deseja isto, deselecione a caixa "publico".
AccordingToGeoIPDatabase=(conforme a convenção GeoIP)
-Line=Linha
NotSupported=Não suportado
RequiredField=Campo obrigatorio
-Result=Resultado
-ToTest=Teste
ValidateBefore=Precisa de um cartão valido antes de usar esta função
-Visibility=Visibilidade
-Private=Privado
Hidden=Escondido
Resources=Resorsas
-Source=Fonte
-Prefix=Prefixo
-Before=Antes
-After=Depois
IPAddress=endereco IP
Frequency=Frequencia
IM=Mensagems instantaneas
-NewAttribute=Novo atributo
AttributeCode=Codigo do atributo
OptionalFieldsSetup=Configuração dos atributos extra
URLPhoto=URL da photo/logo
SetLinkToThirdParty=Atalho para outro terceiro
CreateDraft=Criar RascunhoCriar rascunho
-ClickToEdit=Clique para editar
+SetToDraft=Voltar para modo rascunho
ObjectDeleted=Objeto %s apagado
-ByCountry=Por país
-ByTown=Por cidade
-ByDate=Por data
ByMonthYear=Por mes/ano
ByYear=Por ano
ByMonth=Por mes
ByDay=Por día
BySalesRepresentative=Por vendedor representante
-LinkedToSpecificUsers=Conectado com um contato particular do usuario
+LinkedToSpecificUsers=Conectado com um contato particular do usuario
DeleteAFile=Apagar arquivo
-ConfirmDeleteAFile=Voce tem certeza que quer apagar este arquivo
-NoResults=Sem resultados
+ConfirmDeleteAFile=Voce tem certeza que quer apagar este arquivo
ModulesSystemTools=Ferramentas de modulos
-Test=Teste
-Element=Elemento
NoPhotoYet=Sem fotos disponiveis no momento
HomeDashboard=Resumo de inicio
Deductible=Deduzivel
from=de
toward=para
-Access=Acesso
HelpCopyToClipboard=Use Ctrl+C para copiar para o clipboard
SaveUploadedFileWithMask=Salvar arquivo no servidor com nome "<strong>%s</strong>" (alternativamente "%s")
OriginFileName=Nome original do arquivo
SetDemandReason=Escolher fonte
-SetBankAccount=Define Bank Account
-AccountCurrency=Account Currency
+SetBankAccount=Definir conta bancaria
+AccountCurrency=Moeda conta
ViewPrivateNote=Ver anotaçoes
XMoreLines=%s linha(s) escondidas
PublicUrl=URL pública
-AddBox=Add box
-
-# Week day
-Monday=Segunda-feira
-Tuesday=Terça-feira
-Wednesday=Quarta-feira
-Thursday=Quinta-feira
-Friday=Sexta-feira
+AddBox=Adicionar caixa
+SelectElementAndClickRefresh=Selecionar um elemento e clickar atualizar
Saturday=Sabado
-Sunday=Domingo
-MondayMin=Seg
-TuesdayMin=Ter
-WednesdayMin=Qua
-ThursdayMin=Qui
-FridayMin=Sex
SaturdayMin=Sab
-SundayMin=Dom
-Day1=Segunda-Feira
-Day2=Terça-Feira
-Day3=Quarta-Feira
-Day4=Quinta-Feira
-Day5=Sexta-Feria
-Day6=Sábado
-Day0=Domingo
-ShortMonday=Seg
-ShortTuesday=Ter
-ShortWednesday=Qua
-ShortThursday=Qui
-ShortFriday=Sex
-ShortSaturday=Sab
-ShortSunday=Dom
diff --git a/htdocs/langs/pt_BR/margins.lang b/htdocs/langs/pt_BR/margins.lang
index 093c530bbec051b0db1fa4a8b29629e2e81fc36e..aad281078303d1eb0014ab7820a24b711a616663 100644
--- a/htdocs/langs/pt_BR/margins.lang
+++ b/htdocs/langs/pt_BR/margins.lang
@@ -1,11 +1,6 @@
-# Dolibarr language file - Source file is en_US - marges
-
-Margin=Margem
+# Dolibarr language file - Source file is en_US - margins
Margins=Margems
TotalMargin=Total margem
-MarginOnProducts=Margem / Produtos
-MarginOnServices=Margem / Serviços
-MarginRate=Taxa de margem
MarkRate=Taxa de marca
DisplayMarginRates=Visualizar taxas de margem
DisplayMarkRates=Visualizar taxas de aumento
@@ -17,8 +12,6 @@ ProductMargins=Margem de produtos
CustomerMargins=Margems de clientes
SalesRepresentativeMargins=Tolerância aos representante de vendas
ProductService=Produto ou serviço
-AllProducts=Todos os produtos e serviços
-ChooseProduct/Service=Escolher produto ou serviço
StartDate=Data inicio
EndDate=Data fim
Launch=Inicio
@@ -29,13 +22,13 @@ UseDiscountAsProduct=Como o produto
UseDiscountAsService=Como serviço
UseDiscountOnTotal=Em sub-total
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Define se um desconto global e tratado como o produto, serviço, ou somente sob o sub-total na margem.
-MARGIN_TYPE=Tipo de margem
MargeBrute=Margem grosa
MargeNette=Mergem neta
-MARGIN_TYPE_DETAILS=Margem grosa: Preço de venda - Preço de compra<br/>Margem neta: Preço de venda - Preço de custo
-CostPrice=Preço de custo
-BuyingCost=Preço de custo
+MARGIN_TYPE_DETAILS=Margem grosa: Preço de venda - Preço de compra<br/>Margem neta: Preço de venda - Preço de custo
UnitCharges=Taxas unitárias
Charges=Despesas
AgentContactType=Tipo contato do agente comercial
-AgentContactTypeDetails=Define o tipo de contato (conectado as faturas) sera usado para relatorio de margem dos agentes comerciais
+AgentContactTypeDetails=Defina o tipo de contato (conectado coma as faturas) sera usado para o relatorio de margem dos representantes
+rateMustBeNumeric=Rata deve ser um valor numerico
+markRateShouldBeLesserThan100=Rata marcada teria que ser menor do que 100
+ShowMarginInfos=Mostrar informações de margems
diff --git a/htdocs/langs/pt_BR/members.lang b/htdocs/langs/pt_BR/members.lang
index bd6c5e7969e5fc46c5998febfa51d6a582573514..49fd906d30b29afe64ef87f4e0e2841ce2c66c71 100644
--- a/htdocs/langs/pt_BR/members.lang
+++ b/htdocs/langs/pt_BR/members.lang
@@ -11,31 +11,14 @@ UserNotLinkedToMember=Usuário não vinculado a um associado
ThirdpartyNotLinkedToMember=Fornecedores não ligados a um membro
MembersTickets=Etiquetas de associado
FundationMembers=Membros da fundação
-Attributs=Atributos
-ErrorMemberTypeNotDefined=Não foi indicado o tipo de membro
-ListOfPublicMembers=Lista de Membros públicos
-ListOfValidatedPublicMembers=Lista de Membros públicos validados
-ErrorThisMemberIsNotPublic=Este membro não é público
ErrorMemberIsAlreadyLinkedToThisThirdParty=Outro membro já está vinculado a um terceiro. Remover este link em primeiro lugar porque um terceiro não pode ser ligado a apenas um membro (e vice-versa).
ErrorUserPermissionAllowsToLinksToItselfOnly=Por razões de segurança, você deve ter permissões para editar todos os usuários sejam capazes de ligar um membro a um usuário que não é seu.
ThisIsContentOfYourCard=Este é os detalhes do seu cartão
CardContent=Conteúdo da sua ficha de membro
-SetLinkToUser=Link para um usuário Dolibarr
-SetLinkToThirdParty=Link para um fornecedor Dolibarr
-MembersCards=Cartões de Membros
-MembersList=Lista de Membros
-MembersListToValid=Lista de Membros rascunho (a Confirmar)
-MembersListValid=Lista de Membros validados
-MembersListUpToDate=Lista dos Membros válidos ao día de adesão
-MembersListNotUpToDate=Lista dos Membros válidos não ao día de adesão
MembersListResiliated=Lista dos Membros cancelados
-MembersListQualified=Lista dos Membros qualificados
-MenuMembersToValidate=Membros rascunho
-MenuMembersValidated=Membros validados
MenuMembersUpToDate=Membros ao día
MenuMembersNotUpToDate=Membros não ao día
MenuMembersResiliated=Membros cancelados
-MembersWithSubscriptionToReceive=Membros com assinatura para receber
DateAbonment=data filiação
DateSubscription=data filiação
DateNextSubscription=data próxima filiação
@@ -43,136 +26,74 @@ DateEndSubscription=data final filiação
EndSubscription=fim filiação
SubscriptionId=Id adesão
MemberId=Id adesão
-NewMember=Novo membro
-NewType=Novo tipo de membro
-MemberType=Tipo de Membro
-MemberTypeId=ID tipo de membro
-MemberTypeLabel=Etiqueta tipo de membro
-MembersTypes=Tipos de Membros
MembersAttributes=Atributos Membros
SearchAMember=procurar um membro
MemberStatusDraft=rascunho (a Confirmar)
-MemberStatusDraftShort=A Confirmar
-MemberStatusActive=Validado (em espera de filiação )
-MemberStatusActiveShort=Validado
MemberStatusActiveLate=filiação não à día
MemberStatusActiveLateShort=não à día
MemberStatusPaid=Assinatura em dia
MemberStatusPaidShort=Até à data
MemberStatusResiliated=membro dado de baixa
-MemberStatusResiliatedShort=De baixa
-MembersStatusToValid=Membros rascunho
-MembersStatusToValidShort=Membros rascunho
-MembersStatusValidated=Membros validados
MembersStatusPaid=Assinatura em dia
MembersStatusPaidShort=Até à data
MembersStatusNotPaid=Assinatura desatualizado
MembersStatusNotPaidShort=Expirada
MembersStatusResiliated=Membros cancelados
MembersStatusResiliatedShort=Membros cancelados
-NewCotisation=Nova filiação
PaymentSubscription=Subscrição de Pagamento
EditMember=edição membro
SubscriptionEndDate=data final filiação
-MembersTypeSetup=configuração dos tipos de Membros
-NewSubscription=Nova filiação
NewSubscriptionDesc=Este formulário permite que você grave a sua assinatura como um novo membro da fundação. Se você quiser renovar a sua assinatura (se já for membro), por favor, entre em contato com Conselho de Fundadores não por e-mail.
-Subscription=Filiação
Subscriptions=Filiações
SubscriptionLate=Em Atraso
SubscriptionNotReceived=filiação não recibida
SubscriptionLateShort=em atraso
SubscriptionNotReceivedShort=não recibida
ListOfSubscriptions=Lista de Filiações
-SendCardByMail=Enviar ficha
-AddMember=Adicionar membro
+AddMember=Criar membro
NoTypeDefinedGoToSetup=nenhum tipo de membro definido. ir a configuração -> Tipos de Membros
-NewMemberType=Novo tipo de membro
-WelcomeEMail=E-mail
-SubscriptionRequired=Sujeito a cotação
EditType=edição do tipo de membro
-DeleteType=Eliminar
-VoteAllowed=Voto autorizado
Physical=Físico
Moral=Moral
MorPhy=Moral/Físico
Reenable=Reativar
ResiliateMember=Baixar um membro
ConfirmResiliateMember=Tem certeza que quer cancelar este membro?
-DeleteMember=Eliminar um membro
ConfirmDeleteMember=Tem certeza que quer eliminar este membro (Eliminar um membro elimina também todas as suas honorários)?
-DeleteSubscription=Eliminar uma filiação
ConfirmDeleteSubscription=Tem certeza que quer eliminar esta filiação?
Filehtpasswd=Arquivo htpasswd
-ValidateMember=Confirmar um membro
ConfirmValidateMember=Tem certeza que quer Confirmar a este membro?
FollowingLinksArePublic=os vínculos seguintes são páginas acessiveis a todos e não protegidas por Nenhuma habilitação Dolibarr.
PublicMemberList=Lista público de Membros
BlankSubscriptionForm=Formulário de inscrição
BlankSubscriptionFormDesc=Dolibarr pode fornecer uma URL pública para permitir que os visitantes externos de pedir para se inscrever para a fundação. Se um módulo de pagamento on-line estiver ativado, uma forma de pagamento também será fornecido automaticamente.
EnablePublicSubscriptionForm=Habilite a forma pública auto-assinatura
-MemberPublicLinks=Likns/páginas publicas
ExportDataset_member_1=Membros e Filiações
-ImportDataset_member_1=Membros
-LastMembers=os %s últimos Membros
-LastMembersModified=os %s últimos Membros modificados
LastSubscriptionsModified=Assinaturas Últimas modificadas
-AttributeName=Nome do atributo
-String=Cadeia
-Text=Texto largo
-Int=Numérico
-Date=Data
-DateAndTime=data e hora
-PublicMemberCard=Ficha pública membro
MemberNotOrNoMoreExpectedToSubscribe=não submetida a cotação
-AddSubscription=Adicionar filiação
-ShowSubscription=Mostrar filiação
+AddSubscription=Criar subscripção
MemberModifiedInDolibarr=membro modificado em Dolibarr
-SendAnEMailToMember=Enviar e-mail de informação à membro (E-mail: <b>%s</b>)
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Assunto do e-mail recebido em caso de auto-inscrição de um convidado
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail recebido em caso de auto-inscrição de um convidado
DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Assunto do email em caso de inscrição automática
DescADHERENT_AUTOREGISTER_MAIL=Email a enviar em caso de convite para inscrição automática
-DescADHERENT_MAIL_VALID_SUBJECT=assunto do e-mail de validação de membro
-DescADHERENT_MAIL_VALID=E-mail de validação de membro
-DescADHERENT_MAIL_COTIS_SUBJECT=assunto do e-mail de validação de cotação
-DescADHERENT_MAIL_COTIS=E-mail de validação de uma filiação
-DescADHERENT_MAIL_RESIL_SUBJECT=assunto de e-mail de baixa
-DescADHERENT_MAIL_RESIL=E-mail de baixa
-DescADHERENT_MAIL_FROM=E-mail emissor para os e-mails automáticos
-DescADHERENT_ETIQUETTE_TYPE=Formato etiquetas
DescADHERENT_ETIQUETTE_TEXT=Texto impresso em folhas de endereço de membros
DescADHERENT_CARD_TYPE=Formato da página fichas
-DescADHERENT_CARD_HEADER_TEXT=Texto a imprimir na parte superior do cartão de membro
-DescADHERENT_CARD_TEXT=Texto a imprimir ao cartão de membro
DescADHERENT_CARD_TEXT_RIGHT=Texto impresso em cartões de membros (alinhar à direita)
-DescADHERENT_CARD_FOOTER_TEXT=Texto a imprimir na parte inferior do cartão de membro
GlobalConfigUsedIfNotDefined=Texto definido na configuração do módulo fundação será usada se não for definido aqui
MayBeOverwrited=Este texto pode ser sobrescrito pelo valor definido para o tipo de membro
-ShowTypeCard=Ver tipo '%s'
HTPasswordExport=geração Arquivo htpassword
NoThirdPartyAssociatedToMember=nenhum Fornecedor associado a este membro
ThirdPartyDolibarr=Fornecedores Dolibarr
-MembersAndSubscriptions= Membros e Subscrições
+MembersAndSubscriptions=Membros e Subscrições
MoreActions=Ação complementar em gravação
MoreActionsOnSubscription=Ação complementar, sugerido por padrão durante a gravação de uma assinatura
-MoreActionBankDirect=Criar um registro de transação direto na conta
-MoreActionBankViaInvoice=Criar uma fatura e pagamento por conta
-MoreActionInvoiceOnly=Criar uma fatura sem pagamento
LinkToGeneratedPages=Gerar cartões de visitas
LinkToGeneratedPagesDesc=Esta tela permite gerar arquivos PDF com cartões de visita para todos os seus membros ou um membro particular.
DocForAllMembersCards=Gerar cartões de visita para todos os membros
DocForOneMemberCards=Gerar cartões de visita para um determinado membro
DocForLabels=Gerar folhas de endereço
-SubscriptionPayment=Pagamento Assinatura
LastSubscriptionDate=Data da Última Adesão
LastSubscriptionAmount=Valor Última Adesão
-MembersStatisticsByCountries=Membros estatísticas por país
-MembersStatisticsByState=Membros estatísticas por estado / província
-MembersStatisticsByTown=Membros estatísticas por cidade
MembersStatisticsByRegion=Membros por região estatísticas
-MemberByRegion=Membros por região
-NbOfMembers=Número de membros
NoValidatedMemberYet=Nenhum membro validados encontrado
MembersByCountryDesc=Esta tela mostrará estatísticas sobre usuários por países. Gráfico depende, contudo, do Google serviço gráfico on-line e está disponível apenas se uma conexão à Internet é está funcionando.
MembersByStateDesc=Esta tela mostrará estatísticas sobre usuários por estado / província / cantão.
@@ -180,22 +101,13 @@ MembersByTownDesc=Esta tela mostrará estatísticas sobre usuários por cidade.
MembersStatisticsDesc=Escolha as estatísticas que você quer ler ...
MenuMembersStats=Estatísticas
LastMemberDate=Data do membro
-Nature=Tipo de produto
Public=Informações são públicas
-Exports=Exportações
NewMemberbyWeb=Novo membro adicionado. Aguardando aprovação
NewMemberForm=Formulário para novo membro
-SubscriptionsStatistics=Estatísticas sobre assinaturas
NbOfSubscriptions=Número de inscrições
-AmountOfSubscriptions=Quantidade de assinaturas
TurnoverOrBudget=Volume de negócios (para uma empresa) ou de orçamento (para uma fundação)
-DefaultAmount=Quantidade padrão de assinatura
CanEditAmount=Visitante pode escolher/editar quantidade da sua subscrição
MEMBER_NEWFORM_PAYONLINE=Ir na página de pagamento online integrado
-Associations=Fundações
-Collectivités=Organizações
-Particuliers=Pessoal
-Entreprises=Empresas
DOLIBARRFOUNDATION_PAYMENT_FORM=Para fazer o seu pagamento de assinatura usando uma transferência bancária, consulte a página <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> Para pagar utilizando um cartão de crédito ou Paypal, clique no botão na parte inferior desta página. <br>
ByProperties=Por características
MembersStatisticsByProperties=Membros estatísticas por características
diff --git a/htdocs/langs/pt_BR/opensurvey.lang b/htdocs/langs/pt_BR/opensurvey.lang
index 3b8473f88745b7d65025ab8ed982c78be9922614..c595c56280fe19a1ef36c2a3b2715410bef522f9 100644
--- a/htdocs/langs/pt_BR/opensurvey.lang
+++ b/htdocs/langs/pt_BR/opensurvey.lang
@@ -1,66 +1,27 @@
# Dolibarr language file - Source file is en_US - opensurvey
-Survey=Enquete
-Surveys=Enquetes
-OrganizeYourMeetingEasily=Organize suas reuniões e enquetes facilmente. Em primeiro lugar selecione o tipo de enquete...
-NewSurvey=Nova enquete
-NoSurveysInDatabase=%s enquete(s) na base de dados.
-OpenSurveyArea=Área de enquetes
-AddACommentForPoll=Você pode adicionar um comentário na enquete...
-AddComment=Adicionar comentário
CreatePoll=Criar uma enquete
PollTitle=Titulo da enquete
-ToReceiveEMailForEachVote=Receba um e-mail a cada novo voto
TypeDate=Modelo para datas
TypeClassic=Modelo padrão
-OpenSurveyStep2=Selecione os dias livres (cinza). Os dias escolhidos são verdes. Você pode desmarcar um dia previamente selecionado, clicando novamente sobre ele
RemoveAllDays=Remova todos os dias
-CopyHoursOfFirstDay=Copiar horários do primeiro dia
-RemoveAllHours=Apagar todos os horários
-SelectedDays=Dias selecionados
TheBestChoice=A melhor escolha no momento é
TheBestChoices=As melhores escolhas no momento são
-with=com
-OpenSurveyHowTo=Se você quiser votar nesta enquete, você tem que preencher o seu nome, escolha as opções que se encaixam melhor para você e confirme com o botão de mais no final da linha.
-CommentsOfVoters=Comentários dos votantes
ConfirmRemovalOfPoll=Você tem certeza que deseja remover esta enquete (e todos os votos)
RemovePoll=Remover enquete
-UrlForSurvey=URL para obter um acesso direto à pesquisa
-PollOnChoice=Você está criando uma enquete e se quiser ainda pode optar por votos multi escolhas em cada item. Basta entrar com o tipo de resposta para o voto:
-CreateSurveyDate=Criar uma enquete para datas
-CreateSurveyStandard=Criar uma enquete padrão
CheckBox=Caixa de resposta simples
YesNoList=Escolher (nulo/sim/não)
PourContreList=Escolher (nulo/a favor/contra)
-AddNewColumn=Adicionar nova coluna
-TitleChoice= Escolha a resposta
ExportSpreadsheet=Exportar resultado para planilha
-ExpireDate=Data Limite
-NbOfSurveys=Número de enquetes
NbOfVoters=Nr. de eleitores
SurveyResults=Resultado
-PollAdminDesc=Você está autorizado a alterar todas as linhas da votação desta enquete, com o botão "Editar". Você pode, também remover uma coluna ou uma linha com o %s. Você também pode adicionar uma nova coluna com o %s.
-5MoreChoices=Mais 5 opções
-Abstention=Abstenção
-Against=Contra
YouAreInivitedToVote=Você foi convidado para votar nesta enquete
-VoteNameAlreadyExists=Este nome já foi usada na enquete
ErrorPollDoesNotExists=Erro, enquete <strong>%s</strong> não existe.
-OpenSurveyNothingToSetup=Não há nenhuma configuração específica a fazer.
-PollWillExpire=Sua votação expira automaticamente em <strong>%s</strong> dias após a última data preenchida na enquete.
-AddADate=Adicionar uma data
-AddStartHour=Adicionar hora de início
AddEndHour=Adicionar hora final
votes=voto(s)
NoCommentYet=Nenhum comentário foi publicado para este voto ainda
CanEditVotes=É possível alterar voto dos demais
CanComment=Os eleitores podem comentar na enquete
CanSeeOthersVote=Os eleitores podem ver os votos de outras pessoas
-SelectDayDesc=Em cada dia selecionado, você pode escolher ou não preencher os horários com o seguinte formato:<br>- vazio,<br>- "8h", "8H" ou "08:00" horário de início da reunião, <br>- "8-11", "8h-11h", "8H-11H" ou "8:00-11:00" horário de início da reunião e do termino,<br> - "8h15-11h15", "8h15-11H15 " ou " 8:15-11:15 " mesma funcionalidade, mas com preenchimento dos minutos.
-BackToCurrentMonth=Voltar para o mês atual
-ErrorOpenSurveyFillFirstSection=Você não preencheu o primeiro passo para criação da enquete
ErrorOpenSurveyOneChoice=Digite pelo menos uma opção
ErrorOpenSurveyDateFormat=A data deve ter o formato YYYY-MM-DD
-ErrorInsertingComment=Houve um erro ao inserir o seu comentário
-MoreChoices=Digite mais opções para os votos
SurveyExpiredInfo=O período de votação da enquete expirou.
-EmailSomeoneVoted=%s preencheu uma linha.\nVocê pode encontrar sua enquete no link:\n%s
diff --git a/htdocs/langs/pt_BR/orders.lang b/htdocs/langs/pt_BR/orders.lang
index 9e85157ef4463122f12ee06c579fb247d9efb563..ccf3c96b8bcbf8cd9b210fd4812520f1d3c37d4f 100644
--- a/htdocs/langs/pt_BR/orders.lang
+++ b/htdocs/langs/pt_BR/orders.lang
@@ -1,90 +1,27 @@
# Dolibarr language file - Source file is en_US - orders
OrdersArea=Área de Pedidos de Clientes
-SuppliersOrdersArea=Área de Pedidos a Fornecedores
-OrderCard=Ficha Pedido
OrderId=ID Pedido
-Order=Pedido
-Orders=Pedidos
OrderLine=Linha de Comando
-OrderFollow=Seguimento
-OrderDate=Data Pedido
OrderToProcess=Pedido a se processar
-NewOrder=Novo Pedido
-ToOrder=Realizar Pedido
-MakeOrder=Realizar Pedido
-SupplierOrder=Pedido a Fornecedor
-SuppliersOrders=Pedidos a Fornecedores
-SuppliersOrdersRunning=Pedidos a Fornecedores em Curso
CustomerOrder=Pedido de Cliente
-CustomersOrders=Pedidos de Clientes
-CustomersOrdersRunning=Pedidos de Clientes em Curso
-CustomersOrdersAndOrdersLines=Pedidos de Clientes e Linhas de Pedido
-OrdersToValid=Pedidos a Confirmar
OrdersToBill=Pedidos por Faturar
-OrdersInProcess=Pedidos em Processo
-OrdersToProcess=Pedidos a Processar
SuppliersOrdersToProcess=Pedidos de fornecedor a se processar
-StatusOrderCanceledShort=Anulado
-StatusOrderDraftShort=Rascunho
-StatusOrderValidatedShort=Validado
StatusOrderSentShort=Em processo
StatusOrderSent=Envio em processo
-StatusOrderOnProcessShort=Em curso
-StatusOrderProcessedShort=Processado
StatusOrderToBillShort=Entregue
StatusOrderToBill2Short=A se faturar
-StatusOrderApprovedShort=Aprovado
-StatusOrderRefusedShort=Reprovado
-StatusOrderToProcessShort=A Processar
-StatusOrderReceivedPartiallyShort=Recebido Parcialmente
-StatusOrderReceivedAllShort=Recebido
-StatusOrderCanceled=Anulado
-StatusOrderDraft=Rascunho (a Confirmar)
-StatusOrderValidated=Validado
-StatusOrderOnProcess=Em processo
-StatusOrderProcessed=Processado
StatusOrderToBill=A Faturar
StatusOrderToBill2=A Faturar
-StatusOrderApproved=Aprovado
-StatusOrderRefused=Reprovado
-StatusOrderReceivedPartially=Recebido Parcialmente
-StatusOrderReceivedAll=Recebido
ShippingExist=Existe envio
DraftOrWaitingApproved=Rascunho aprovado mas ainda não controlado
-DraftOrWaitingShipped=Rascunho o validado mas ainda não expedido
MenuOrdersToBill=Pedidos por Faturar
-MenuOrdersToBill2=Pedidos a se faturar
-SearchOrder=Procurar um Pedido
SearchACustomerOrder=Procure um pedido do cliente
-ShipProduct=Enviar Produto
-Discount=Desconto
-CreateOrder=Criar Pedido
-RefuseOrder=Rejeitar o Pedido
-ApproveOrder=Aceitar o Pedido
-ValidateOrder=Confirmar o Pedido
UnvalidateOrder=Desaprovar pedido
-DeleteOrder=Eliminar o pedido
-CancelOrder=Anular o Pedido
-AddOrder=Criar Pedido
-AddToMyOrders=Adicionar os meus Pedidos
-AddToOtherOrders=Adicionar a outros pedidos
+AddOrder=Criar ordem
AddToDraftOrders=Adicionar a projeto de pedido
-ShowOrder=Mostrar Pedido
-NoOpenedOrders=Nenhum pedido em aberto
-NoOtherOpenedOrders=Nenhum outro pedido aberto
NoDraftOrders=Não há projetos de pedidos
-OtherOrders=Outros Pedidos
-LastOrders=Os %s últimos pedidos
-LastModifiedOrders=Os %s últimos pedidos modificados
LastClosedOrders=Os últimos %s Pedidos
-AllOrders=Todos os Pedidos
-NbOfOrders=Número de Pedidos
-OrdersStatistics=Estatísticas de pedidos
-OrdersStatisticsSuppliers=Estatísticas de Pedidos a Fornecedores
-NumberOfOrdersByMonth=Número de Pedidos por Mês
AmountOfOrdersByMonthHT=Numero de pedidos por mes (sem impostos)
-ListOfOrders=Lista de Pedidos
-CloseOrder=Fechar Pedido
ConfirmCloseOrder=Tem certeza de que deseja fechar este pedido? Quando um pedido é fechado, ele só pode ser cobrado.
ConfirmCloseOrderIfSending=Tem certeza de que deseja fechar este pedido? Veve fechar no somente quando todos os transfretes marítimos são feitos.
ConfirmDeleteOrder=Tem certeza que quer eliminar este pedido?
@@ -95,26 +32,13 @@ ConfirmMakeOrder=Tem certeza que quer confirmar este pedido em data de<b>%s</b>
GenerateBill=Faturar
ClassifyShipped=Clasificar entregue
ClassifyBilled=Classificar "Faturado"
-ComptaCard=Ficha Contabilidade
-DraftOrders=Rascunhos de Pedidos
-RelatedOrders=Pedidos Anexos
-OnProcessOrders=Pedidos em Processo
-RefOrder=Ref. Pedido
-RefCustomerOrder=Ref. Pedido Cliente
-RefCustomerOrderShort=Ref. Ped. Cliente
-SendOrderByMail=Enviar pedido por e-mail
ActionsOnOrder=Ações sobre o pedido
NoArticleOfTypeProduct=Não existe artigos de tipo 'produto' e por tanto expedidos neste pedido
-OrderMode=Método de pedido
-AuthorRequest=Autor/Solicitante
UseCustomerContactAsOrderRecipientIfExist=Utilizar endereço do contato do cliente de seguimento cliente se está definido em vez do Fornecedor como destinatário dos pedidos
-RunningOrders=Pedidos em Curso
UserWithApproveOrderGrant=Usuários autorizados a aprovar os pedidos.
-PaymentOrderRef=Pagamento de Pedido %s
CloneOrder=Copiar o Pedido
ConfirmCloneOrder=Tem certeza de que deseja clonar este<b>%s</b> ?
DispatchSupplierOrder=Receber pedido de fornecedor %s
-##### Types de contacts #####
TypeContact_commande_internal_SALESREPFOLL=Responsável do seguimento do pedido do cliente
TypeContact_commande_internal_SHIPPING=Representante seguindo o envio
TypeContact_commande_external_BILLING=Contato fatura cliente
@@ -125,36 +49,19 @@ TypeContact_order_supplier_internal_SHIPPING=Representante seguindo o envio
TypeContact_order_supplier_external_BILLING=Contato fatura fornecedor
TypeContact_order_supplier_external_SHIPPING=Contato envio fornecedor
TypeContact_order_supplier_external_CUSTOMER=Contato fornecedor seguindo o pedido
-
-Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constante COMMANDE_SUPPLIER_ADDON não definida
-Error_COMMANDE_ADDON_NotDefined=Constante COMMANDE_ADDON não definida
Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Erro na carga do Arquivo módulo '%s'
Error_FailedToLoad_COMMANDE_ADDON_File=Erro na carga de arquivo módulo '%s'
Error_OrderNotChecked=Nenhum pedido seleçionado para se faturar
-# Sources
-OrderSource0=Orçamento Proposto
-OrderSource1=Internet
-OrderSource2=Campanha por correio
OrderSource3=Campanha telefônica
-OrderSource4=Campanha por fax
-OrderSource5=Comercial
-OrderSource6=Revistas
-QtyOrdered=Quant. Pedida
AddDeliveryCostLine=Adicionar uma linha de despesas de fretes indicando o peso do pedido
-# Documents models
PDFEinsteinDescription=Modelo de pedido completo (logo...)
PDFEdisonDescription=O modelo simplificado do pedido
PDFProformaDescription=A proforma fatura completa (logomarca...)
-# Orders modes
-OrderByMail=Correio
-OrderByFax=Fax
OrderByEMail=E-mail
OrderByWWW=Online
-OrderByPhone=Telefone
CreateInvoiceForThisCustomer=Faturar pedidos
NoOrdersToInvoice=Nenhum pedido faturavel
CloseProcessedOrdersAutomatically=Clasificar "processados" os pedidos selecionados.
-MenuOrdersToBill2=Pedidos a se faturar
OrderCreation=Criação de pedidos
Ordered=Pedido
OrderCreated=Seus pedidos foram criados
diff --git a/htdocs/langs/pt_BR/oscommerce.lang b/htdocs/langs/pt_BR/oscommerce.lang
deleted file mode 100644
index 3df1b08721261c3af4454815164d0246fd6e1f33..0000000000000000000000000000000000000000
--- a/htdocs/langs/pt_BR/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=Configuração do módulo OS Commerce
-OSCommerceSetupSaved=Configuração OS Commerce guardada
-OSCommerceServer=Nome/IP servidor da base de dados OS commerce
-OSCommerceDatabaseName=Nome da base de dados OS Commerce
-OSCommercePrefix=Prefixo Tabelas OS Commerce
-OSCommerceUser=Usuário da base de dados OS Commerce
diff --git a/htdocs/langs/pt_BR/other.lang b/htdocs/langs/pt_BR/other.lang
index 76796886a59cc787e8287ebebcc145f8f890ded1..dbbed148c067f2814f85c9b006e18db1aa104eea 100644
--- a/htdocs/langs/pt_BR/other.lang
+++ b/htdocs/langs/pt_BR/other.lang
@@ -1,14 +1,11 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=Código Segurança
-Calendar=Calendário
-AddTrip=Criar Deslocamento
-Tools=Utilidades
-ToolsDesc=Esta area e dedicada para o grupo de ferramentas varias não disponivel em outros menus.<br><br>Estas ferramentas podem se acionar atraves do menu ao lado.
+ToolsDesc=Esta area e dedicada para o grupo de ferramentas varias não disponivel em outros menus.<br><br>Estas ferramentas podem se acionar atraves do menu ao lado.
Birthday=Aniversário
BirthdayDate=Data de aniversário
DateToBirth=Data de nascimento
-BirthdayAlertOn= Alerta de aniversário ativo
-BirthdayAlertOff= Alerta de aniversário desativado
+BirthdayAlertOn=Alerta de aniversário ativo
+BirthdayAlertOff=Alerta de aniversário desativado
Notify_FICHINTER_VALIDATE=Intervenção validada
Notify_FICHINTER_SENTBYMAIL=Intervenção enviada por e-mail
Notify_BILL_VALIDATE=Fatura cliente validada
@@ -23,7 +20,6 @@ Notify_WITHDRAW_TRANSMIT=Revogação de transmissão
Notify_WITHDRAW_CREDIT=Revogação de credito
Notify_WITHDRAW_EMIT=Revogação de performance
Notify_ORDER_SENTBYMAIL=Pedido cliente enviado por e-mail
-Notify_COMPANY_CREATE=Terceiro criado
Notify_COMPANY_SENTBYMAIL=E-mails enviados a partir do cartão de terceiros
Notify_PROPAL_SENTBYMAIL=Proposta comercial enviada por e-mail
Notify_BILL_PAYED=Fatura cliente paga
@@ -35,12 +31,9 @@ Notify_BILL_SUPPLIER_VALIDATE=Fatura fornecedor validada
Notify_BILL_SUPPLIER_PAYED=Fatura fornecedor paga
Notify_BILL_SUPPLIER_SENTBYMAIL=Fatura fornecedor enviada por e-mail
Notify_BILL_SUPPLIER_CANCELED=Fornecedor fatura cancelada
-Notify_CONTRACT_VALIDATE=Contrato validado
Notify_FICHEINTER_VALIDATE=Intervenção validada
Notify_SHIPPING_VALIDATE=Envio validado
Notify_SHIPPING_SENTBYMAIL=Envio enviado por e-mail
-Notify_MEMBER_VALIDATE=Membro validado
-Notify_MEMBER_MODIFY=Membro modificado
Notify_MEMBER_SUBSCRIPTION=Membro inscrito
Notify_MEMBER_RESILIATE=Membro resiliado
Notify_MEMBER_DELETE=Membro apagado
@@ -48,13 +41,9 @@ Notify_PROJECT_CREATE=criação de projeto
Notify_TASK_CREATE=Tarefa criada
Notify_TASK_MODIFY=Tarefa alterada
Notify_TASK_DELETE=Tarefa excluída
-NbOfAttachedFiles=Número Arquivos/Documentos Anexos
+SeeModuleSetup=Ver modulo configurações
TotalSizeOfAttachedFiles=Tamanho Total dos Arquivos/Documentos Anexos
-MaxSize=Tamanho Máximo
-AttachANewFile=Adicionar Novo Arquivo/Documento
LinkedObject=Arquivo Anexo
-Miscellaneous=Diversos
-NbOfActiveNotifications=Número Notificações
PredefinedMailTest=Esse e um teste de envio.⏎\nAs duas linhas estao separadas por retono de linha.⏎\n⏎\n__SIGNATURE__
PredefinedMailTestHtml=Esse e um email de <b>teste</b> (a palavra test deve ser em bold).<br>As duas linhas estao separadas por retorno de linha.<br><br>__SIGNATURE__
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ Você vai encontrar aqui a factura __ FACREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__
@@ -75,65 +64,30 @@ DemoCompanyShopWithCashDesk=Administração de uma loja com Caixa
DemoCompanyProductAndStocks=Administração de uma PYME com venda de produtos
DemoCompanyAll=Administração de uma PYME com Atividades multiplos (todos Os módulos principais)
GoToDemo=Acessar ao demo
-CreatedBy=Criado por %s
-ModifiedBy=Modificado por %s
-ValidatedBy=Validado por %s
-CanceledBy=Anulado por %s
ClosedBy=Encerrado por %s
+CreatedById=Id usuario que criou
+ModifiedById=Id usuario que fiz a ultima alteração
+ValidatedById=Id usuario que validou
+CanceledById=Id usuario que cancelou
+ClosedById=Id usuario que fecho
+CreatedByLogin=Login usuario que criou
+ModifiedByLogin=Login usuario que fiz a ultima alteração
+ValidatedByLogin=Login usuario que foi validado
+CanceledByLogin=Login usuario que cancelou
+ClosedByLogin=Login usuario que fechou
FileWasRemoved=o Arquivo foi eliminado
DirWasRemoved=a pasta foi eliminado
FeatureNotYetAvailableShort=Disponível numa próxima versão
FeatureNotYetAvailable=Funcionalidade não disponível nesta versão
FeatureExperimental=Funcionalidade experimental. não é estável nesta versão
FeatureDevelopment=Funcionalidade em Desenvolvimento. não estável nesta versão
-FeaturesSupported=Funcionalidades suportadas
-Width=Largura
-Height=Altura
-Depth=Fundo
-Top=Topo
-Bottom=Fundo
Left=Esquerda
Right=Direita
-CalculatedWeight=Peso calculado
-CalculatedVolume=Volume calculado
-Weight=Peso
-TotalWeight=Peso total
-WeightUnitton=Toneladas
-WeightUnitkg=kg
-WeightUnitg=g
-WeightUnitmg=mg
-WeightUnitpound=libra
-Length=Comprimento
-LengthUnitm=m
-LengthUnitdm=dm
LengthUnitcm=cm
LengthUnitmm=mm
Surface=Area
-SurfaceUnitm2=m2
-SurfaceUnitdm2=dm2
-SurfaceUnitcm2=cm2
-SurfaceUnitmm2=mm2
-SurfaceUnitfoot2=ft2
-SurfaceUnitinch2=in2
-Volume=Volume
-TotalVolume=Volume total
-VolumeUnitm3=m3
-VolumeUnitdm3=dm3
-VolumeUnitcm3=cm3
-VolumeUnitmm3=mm3
-VolumeUnitfoot3=ft3
-VolumeUnitinch3=in3
-VolumeUnitounce=onça
-VolumeUnitlitre=litro
VolumeUnitgallon=gallão
-Size=Tamanho
-SizeUnitm=m
-SizeUnitdm=dm
-SizeUnitcm=cm
-SizeUnitmm=mm
-SizeUnitinch=polegada
SizeUnitfoot=pe
-SizeUnitpoint=ponto
BugTracker=Incidências
SendNewPasswordDesc=Este formulário permite enviar uma Nova senha. Será enviado ao e-mail do usuário<br>a modificação da senha não será efetiva até que o usuário click no link de confirmação neste e-mail.<br>Verifique sua caixa de correio.
BackToLoginPage=Voltar e a página de login
@@ -141,16 +95,9 @@ AuthenticationDoesNotAllowSendNewPassword=o modo de autentificação de Dolibarr
EnableGDLibraryDesc=deve ativar o instalar a Bibliotéca GD na sua PHP para poder ativar esta Opção
EnablePhpAVModuleDesc=deve instalar um módulo PHP compatible com a sua antivírus. (Clamav : php4-clamavlib ó php5-clamavlib)
ProfIdShortDesc=<b>Prof Id %s</b> é uma informação dePendente do país do Fornecedor.<br>Por Exemplo, para o país <b>%s</b>, é o código <b>%s</b>.
-DolibarrDemo=Demo de Dolibarr ERP/CRM
-StatsByNumberOfUnits=Estatísticas em número de unidades de produto/serviço
-StatsByNumberOfEntities=Estatísticas em número de identidadees referentes
-NumberOfProposals=Número de Orçamentos nos últimos 12 meses
-NumberOfCustomerOrders=Número de pedidos de clientes nos últimos 12 meses
NumberOfCustomerInvoices=Número de faturas a clientes nos últimos 12 meses
NumberOfSupplierOrders=Numero de pedidos dos fornecedores nos ultimos 12 meses
NumberOfSupplierInvoices=Número de faturas de Fornecedores nos últimos 12 meses
-NumberOfUnitsProposals=Número de unidades nos Orçamentos nos últimos 12 meses
-NumberOfUnitsCustomerOrders=Número de unidades nos pedidos de clientes nos últimos 12 meses
NumberOfUnitsCustomerInvoices=Número de unidades em faturas a clientes nos últimos 12 meses
NumberOfUnitsSupplierOrders=Numero de unidades nos pedidos a fornecedor nos ultimos 12 meses
NumberOfUnitsSupplierInvoices=Número de unidades em faturas de Fornecedores nos últimos 12 meses
@@ -158,15 +105,9 @@ EMailTextInterventionValidated=A intervenção %s foi validada
EMailTextInvoiceValidated=A fatura %s foi validada.
EMailTextProposalValidated=A proposta %s foi validada.
EMailTextOrderValidated=O pedido %s foi validado.
-EMailTextOrderApproved=Pedido %s Aprovado
-EMailTextOrderApprovedBy=Pedido %s Aprovado por %s
-EMailTextOrderRefused=Pedido %s Reprovado
-EMailTextOrderRefusedBy=Pedido %s Reprovado por %s
-EMailTextExpeditionValidated=O envio %s foi validado.
ImportedWithSet=Data importacao
DolibarrNotification=Notificação automatica
ResizeDesc=Insira a nova largura <b>OU</b> o novo peso. A proporção sera mantida durante a transformacao...
-NewLength=Nova largura
NewHeight=Nova altrua
NewSizeAfterCropping=Nova dimensao depois do recorte
DefineNewAreaToPick=Definir nova area na imagem para escolher ( click esquerdo na imagem e depois arastar ate o canto oposto)
@@ -179,48 +120,32 @@ ClickHere=Clickque aqui
UseAdvancedPerms=Use as permissões avançadas de algums modulos
FileFormat=Arquivo formato
SelectAColor=Escolha a cor
-AddFiles=Adicionar arquivos
StartUpload=Iniciar o "upload"
CancelUpload=Cancelar o "upload"
FileIsTooBig=Tamanho do arquivo grande de mais
-PleaseBePatient=Por favor aguarde....
RequestToResetPasswordReceived=Recebemos a pedido de mudar a sua senha do Dolibarr
NewKeyIs=Estas sao as suas novas chaves de acesso
NewKeyWillBe=Sua nova chave de acesso do software sera
ClickHereToGoTo=Clickar aqui para ir a %s
YouMustClickToChange=Voce tem que clickar no seguinte atalho para validar a sua troca de senha
ForgetIfNothing=Se voce nao pediu esta mudanca, simplismente esquece deste email. Suas credenciais estao seguras.
-
-##### Calendar common #####
AddCalendarEntry=Adicionar entrada ao calendário
-NewCompanyToDolibarr=Empresa %s Cadastrada
-ContractValidatedInDolibarr=Contrato %s Confirmado
-ContractCanceledInDolibarr=Contrato %s Cancelado
-ContractClosedInDolibarr=Contrato %s Encerrado
-PropalClosedSignedInDolibarr=Orçamento %s Assinado
-PropalClosedRefusedInDolibarr=Orçamento %s rejeitado
-PropalValidatedInDolibarr=Orçamento %s Validado
-InvoiceValidatedInDolibarr=Fatura %s Confirmada
-InvoicePaidInDolibarr=Fatura %s modificada em paga in Dolibarr
-InvoiceCanceledInDolibarr=Fatura %s Cancelada
-PaymentDoneInDolibarr=Pagamento %s Realizado
-CustomerPaymentDoneInDolibarr=Pagamento do cliente %s
-SupplierPaymentDoneInDolibarr=Pagamento a fornecedor %s
-MemberValidatedInDolibarr=Membro %s Confirmado
-MemberResiliatedInDolibarr=Membro %s Baixado
-MemberDeletedInDolibarr=Membro %s Excluido
-MemberSubscriptionAddedInDolibarr=Inscrição do membro % adicionada
-ShipmentValidatedInDolibarr=Envio %s validado em Dolibarr
-ShipmentDeletedInDolibarr=Envio %s cancelado de Dolibarr
-##### Export #####
+ContractValidatedInDolibarr=Contrato %s validado
+ContractCanceledInDolibarr=Contrato %s cancelado
+ContractClosedInDolibarr=Contrato %s fechado
+PropalClosedSignedInDolibarr=Proposta %s assinada
+PropalClosedRefusedInDolibarr=Proposta %s declinada
+PropalClassifiedBilledInDolibarr=Proposta %s classificada faturada
+InvoicePaidInDolibarr=Fatura %s marcada paga
+InvoiceCanceledInDolibarr=Fatura %s cancelada
+PaymentDoneInDolibarr=Pagamento %s effetuado
+CustomerPaymentDoneInDolibarr=PAgamento do cliente %s effetuado
+SupplierPaymentDoneInDolibarr=Pagamento do fornecedor %s effetuado
+MemberValidatedInDolibarr=Membro %s validado
+MemberResiliatedInDolibarr=Membro %s baixado
+MemberDeletedInDolibarr=Membro %s cancelado
+MemberSubscriptionAddedInDolibarr=Inscrição do membo %s adicionada
+ShipmentValidatedInDolibarr=Envio %s validado
+ShipmentDeletedInDolibarr=Envio %s cancelado
Export=Exportar
-ExportsArea=Área de Exportações
-AvailableFormats=Formatos disponíveis
-LibraryUsed=Bibliotéca utilizada
-LibraryVersion=Versão
-ExportableDatas=dados exportáveis
NoExportableData=não existe dados exportáveis (sem módulos com dados exportáveis gastodos, necessitam de permissões)
-ToExport=Exportar
-NewExport=Nova Exportação
-##### External sites #####
-ExternalSites=Sites externos
diff --git a/htdocs/langs/pt_BR/paybox.lang b/htdocs/langs/pt_BR/paybox.lang
index 95d125d8fddad206106b7c873e84a725c4ef9b4e..383d49a131ff174d947291b7d818dfcc270431e3 100644
--- a/htdocs/langs/pt_BR/paybox.lang
+++ b/htdocs/langs/pt_BR/paybox.lang
@@ -1,19 +1,13 @@
# Dolibarr language file - Source file is en_US - paybox
-PayBoxSetup=Configuração do módulo PayBox
PayBoxDesc=Este módulo oferece uma página de pagamento atravé do fornecedor <a href
FollowingUrlAreAvailableToMakePayments=As seguintes URL estão disponíveis para permitir a um cliente efetuar um pagamento
PaymentForm=Formulário de Pagamento
WelcomeOnPaymentPage=Bem Vindos a Nossos serviços de pagamento on-line
ThisScreenAllowsYouToPay=Esta página lhe permite fazer seu pagamento on-line destinado a %s.
ThisIsInformationOnPayment=Aqui está a informação sobre o pagamento a realizar
-ToComplete=A completar
-YourEMail=E-Mail de confirmação de pagamento
Creditor=Beneficiário
-PaymentCode=Código de pagamento
PayBoxDoPayment=Continuar o pagamento com cartão
YouWillBeRedirectedOnPayBox=Va a ser redirecionado a a página segura de Paybox para indicar seu cartão de crédito
-PleaseBePatient=Espere uns segundos
-Continue=Continuar
ToOfferALinkForOnlinePayment=URL para %s pagamento
ToOfferALinkForOnlinePaymentOnOrder=URL que oferece uma interface de pagamento on-line %s baseada no valor de un pedido de cliente
ToOfferALinkForOnlinePaymentOnInvoice=URL que oferece uma interface de pagamento on-line %s baseada no valor de uma fatura
@@ -26,7 +20,7 @@ YourPaymentHasBeenRecorded=Esta pagina confirma que o seu pagamento foi registra
YourPaymentHasNotBeenRecorded=Seu pagamento nao foi registrado e a transaçao foi cancelada. Obrigado.
AccountParameter=Parametros da conta
UsageParameter=Parametros de uso
-InformationToFindParameters=Ajuda a buscar suas %s informaçoes da conta
+InformationToFindParameters=Ajuda a buscar suas %s informaçoes da conta
PAYBOX_CGI_URL_V2=URL do Paybox CGI modulo para pagamento
VendorName=Nome do vendedor
CSSUrlForPaymentForm=CSS style sheet URL para modelo de pagamento
@@ -35,3 +29,6 @@ MessageKO=Mensagem na página de retorno de pagamento cancelado
NewPayboxPaymentReceived=Novo pagamento recebido Paybox
NewPayboxPaymentFailed=Novo pagamento Paybox tentou, mas não conseguiu
PAYBOX_PAYONLINE_SENDEMAIL=Aviso por e-mail depois de um pagamento (sucesso ou falha)
+PAYBOX_PBX_SITE=Valor para PBX SITE
+PAYBOX_PBX_RANG=Valor para PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Valor para PBX ID
diff --git a/htdocs/langs/pt_BR/paypal.lang b/htdocs/langs/pt_BR/paypal.lang
index 4e9e60ebe80e69c4f550fc87cfc8742554a5c565..c9d3eba7af7cc37c520110be0e2e336fcbf7235c 100644
--- a/htdocs/langs/pt_BR/paypal.lang
+++ b/htdocs/langs/pt_BR/paypal.lang
@@ -6,20 +6,18 @@ PaypalDoPayment=Pagar com Paypal
PaypalCBDoPayment=Pagar com cartao de credito
PAYPAL_API_SANDBOX=Modo teste/caixa de areia
PAYPAL_API_USER=API usuario
-PAYPAL_API_PASSWORD=API senha
PAYPAL_API_SIGNATURE=API assinatura
PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Oferecer pagamento "integral" (Cartao de credito + Paypal) ou somente "Paypal"
PaypalModeIntegral=Integralmente
-PaypalModeOnlyPaypal=Somente Paypal
+PaypalModeOnlyPaypal=Somente Paypal
PAYPAL_CSS_URL=URL opcional do CSS estilos na pagina de pagamento
ThisIsTransactionId=Id da transaçao: <b>%s</b>
PAYPAL_ADD_PAYMENT_URL=Adicionar URL do pagamento Paypal quando se envia o documento por e-mail
-PAYPAL_IPN_MAIL_ADDRESS=Endereço e-mail para notificaçao instantanea do pagamento (IPN)
+PAYPAL_IPN_MAIL_ADDRESS=Endereço e-mail para notificaçao instantanea do pagamento (IPN)
PredefinedMailContentLink=Clique no link seguro abaixo para fazer o pagamento (PayPal) se nao esta ainda effetuado.⏎\n⏎\n%s⏎\n⏎\n
YouAreCurrentlyInSandboxMode=No momento esta no modo "caixa de areia"
-NewPaypalPaymentReceived=Novo pagamento Paypal recebido
NewPaypalPaymentFailed=Tentado novo pagamento Paypal mas sem hesito.
PAYPAL_PAYONLINE_SENDEMAIL=Endereço e-mail para aviso apos o pagamento (positivo ou nao)
ReturnURLAfterPayment=Retornar URL após o pagamento
ValidationOfPaypalPaymentFailed=Validação do pagamento do Paypal falhou
-PaypalConfirmPaymentPageWasCalledButFailed= Pagamento completo mas nenhum pagamento foi recebido no PayPal
+PaypalConfirmPaymentPageWasCalledButFailed=Pagamento completo mas nenhum pagamento foi recebido no PayPal
diff --git a/htdocs/langs/pt_BR/products.lang b/htdocs/langs/pt_BR/products.lang
index 9384b6dd0f37627252d07e77394571c115298855..a44226c4a388c32744546a3e2449da611c74934d 100644
--- a/htdocs/langs/pt_BR/products.lang
+++ b/htdocs/langs/pt_BR/products.lang
@@ -1,173 +1,74 @@
# Dolibarr language file - Source file is en_US - products
ProductRef=Ref produto.
ProductLabel=Nome do Produto
-ProductServiceCard=Ficha Produto/Serviço
-Products=Produtos
-Services=Serviços
-Product=Produto
-Service=Serviço
-ProductId=ID Produto/Serviço
-Create=Criar
-Reference=Referencia
-NewProduct=Novo Produto
-NewService=Novo Serviço
-ProductCode=Código Produto
-ServiceCode=Código Serviço
ProductVatMassChange=Mudança VAT Massa
ProductVatMassChangeDesc=Esta página pode ser utilizado para modificar uma taxa VAT definido em produtos ou serviços a partir de um valor para outro. Atenção, esta mudança é feita em todos os banco de dados.
-MassBarcodeInit=Inicialização de código de barras.
+MassBarcodeInit=Inicialização de código de barras.
MassBarcodeInitDesc=Esta página pode ser usado para inicializar um código de barras em objetos que não têm código de barras definidas. Verifique antes que a instalação do módulo de código de barras é completa.
ProductAccountancyBuyCode=Codigo contabilidade (compras)
ProductAccountancySellCode=Codigo contabilidade (vendas)
-ProductOrService=Produto ou Serviço
-ProductsAndServices=Produtos e Serviços
-ProductsOrServices=Produtos ou Serviços
-ProductsAndServicesOnSell=Produtos e Serviços de Venda
-ProductsAndServicesNotOnSell=Produtos e Serviços Fora de Venda
-ProductsAndServicesStatistics=Estatísticas Produtos e Serviços
-ProductsStatistics=Estatísticas Produtos
-ProductsOnSell=Produtos em Venda
-ProductsNotOnSell=Produtos Fora de Venda
ProductsOnSellAndOnBuy=Produtos não para venda ou compra
-ServicesOnSell=Serviços em Venda
-ServicesNotOnSell=Serviços Fora de Venda
ServicesOnSellAndOnBuy=Serviços não para venda ou compra
-InternalRef=Referencia Interna
LastRecorded=últimos Produtos/Serviços em Venda Registados
LastRecordedProductsAndServices=Os %s últimos Produtos/Perviços Registados
LastModifiedProductsAndServices=Os %s últimos Produtos/Serviços Registados
LastRecordedProducts=Os %s últimos Produtos Registados
LastRecordedServices=Os %s últimos Serviços Registados
LastProducts=últimos Produtos
-CardProduct0=Ficha do Produto
-CardProduct1=Ficha do Serviço
-CardContract=Ficha do Contrato
-Warehouse=Armazém
-Warehouses=Armazens
-WarehouseOpened=Armazém Aberto
-WarehouseClosed=Armazém Encerrado
-Stock=Estoque
-Stocks=Estoques
-Movement=Movimento
-Movements=Movimentos
-Sell=Vendas
-Buy=Compras
OnSell=Para Venda
OnBuy=Para compra
-NotOnSell=Fora de Venda
ProductStatusOnSell=Para Venda
-ProductStatusNotOnSell=Fora de Venda
ProductStatusOnSellShort=Para Venda
-ProductStatusNotOnSellShort=Fora de venda
ProductStatusOnBuy=Para compra
ProductStatusNotOnBuy=Não para-se comprar
ProductStatusOnBuyShort=Para compra
ProductStatusNotOnBuyShort=Não para-se comprar
-UpdatePrice=Alterar preço
-AppliedPricesFrom=Preço de venda válido a partir de
SellingPrice=Preço de Venda
SellingPriceHT=Preço de venda (sem taxas)
SellingPriceTTC=Preço de venda (incl. taxas)
-PublicPrice=Preço público
CurrentPrice=Preço atual
NewPrice=Novo Preço
MinPrice=Preço mínimo de venda
MinPriceHT=Minimo preço de venda (líquido de imposto)
MinPriceTTC=Minimo preço de venda (inc. taxa)
CantBeLessThanMinPrice=O preço de venda não deve ser inferior ao mínimo para este produto (%s ICMS)
-ContractStatus=Estado de contrato
-ContractStatusClosed=Encerrado
-ContractStatusRunning=Em Serviço
-ContractStatusExpired=Expirado
-ContractStatusOnHold=Fora de serviço
-ContractStatusToRun=A colocar em serviço
-ContractNotRunning=Este contrato não está em serviço
-ErrorProductAlreadyExists=Um produto com a referencia %s já existe.
+ContractStatusToRun=Para començar
ErrorProductBadRefOrLabel=O valor da referencia ou etiqueta é incorreto
ErrorProductClone=Aconteceu um problema durante a clonação do produto ou serviço.
-Suppliers=Fornecedores
-SupplierRef=Ref. fornecedor
-ShowProduct=Mostrar produto
-ShowService=Mostrar serviço
-ProductsAndServicesArea=Área de Produtos e Serviços
-ProductsArea=Área de Produtos
-ServicesArea=Área de Serviços
-AddToMyProposals=Adicionar aos meus Orçamentos
-AddToOtherProposals=Adicionar a Outros Orçamentos
+ErrorPriceCantBeLowerThanMinPrice=Erro Preço nao pode ser menor do preço minimo.
AddToMyBills=Adicionar às minhas faturas
AddToOtherBills=Adicionar a Outras faturas
-CorrectStock=Corrigir estoque
-AddPhoto=Adicionar uma foto
-ListOfStockMovements=Lista de movimentos de estoque
-BuyingPrice=Preço de compra
-SupplierCard=Ficha fornecedor
-CommercialCard=Ficha comercial
AllWays=Rota para encontrar o sua produto ao estoque
NoCat=O sua produto não pertence a nenhuma categoria
-PrimaryWay=Rota Primaria:
-PriceRemoved=Preço eliminado
-BarCode=Código de barras
-BarcodeType=Tipo de código de barras
-SetDefaultBarcodeType=Defina o tipo de código de barras
-BarcodeValue=Valor do código de barras
NoteNotVisibleOnBill=Nota (Não é visivel as faturas, orçamentos, etc.)
-CreateCopy=Criar Cópia
-ServiceLimitedDuration=Sim o serviço é de Duração limitada :
MultiPricesAbility=Vários preços por produto / serviço
MultiPricesNumPrices=Numero de preços
MultiPriceLevelsName=Categoria de preços
-AssociatedProductsAbility=Ativar produtos associados
-AssociatedProducts=Produtos associados
-AssociatedProductsNumber=N� de produtos associados
-ParentProductsNumber=Numero de produto virtual pai
-IfZeroItIsNotAVirtualProduct=Se 0, este produto não e produto virtual
-IfZeroItIsNotUsedByVirtualProduct=Se 0, este produto nao e usado por nenhum produto virtual
-EditAssociate=Associar
-Translation=Tradução
-KeywordFilter=Filtro por Chave
+AssociatedProductsAbility=Activar a função do pacote virtual
+AssociatedProducts=Pacote produto
+AssociatedProductsNumber=Numero de produtos compondo este pacote virtual do produto
+ParentProductsNumber=Numero de pacotes pais do produto
+IfZeroItIsNotAVirtualProduct=Se 0, este produto não e um pacote virtual do produto
+IfZeroItIsNotUsedByVirtualProduct=Se 0, este produto não e usado em nenhum pacote virtual do produto
CategoryFilter=Filtro por categoria
-ProductToAddSearch=Procurar produtos a Adicionar
-AddDel=Adicionar/Retirar
-Quantity=Quantidade
-NoMatchFound=Não foram encontrados resultados
ProductAssociationList=Lista de produtos/serviços associados : Nome do produto/servisio (quantidade afetada)
-ProductParentList=Lista de produtos/servicos virtuais com este produto como componente
+ProductParentList=Lista de pacote produtos/serviços com este produto como componente
ErrorAssociationIsFatherOfThis=Um dos produtos selecionados é pai do produto em curso
-DeleteProduct=Eliminar um produto/serviço
ConfirmDeleteProduct=? Tem certeza que quer eliminar este produto/serviço?
-ProductDeleted=O produto/serviço "%s" foi eliminado da base de dados.
-DeletePicture=Eliminar uma foto
-ConfirmDeletePicture=? Tem certeza que quer eliminar esta foto?
-ExportDataset_produit_1=Produtos e Serviços
-ExportDataset_service_1=Serviços
-ImportDataset_produit_1=Produtos
-ImportDataset_service_1=Serviços
-DeleteProductLine=Eliminar linha de produto
ConfirmDeleteProductLine=Tem certeza que quer eliminar esta linha de produto?
-NoProductMatching=Nenhum produto/serviço responde à criterio
-MatchingProducts=Produtos/Serviços encontrados
NoStockForThisProduct=Não existe estoque deste produto
NoStock=Sem estoque
-Restock=Recolocar
-ProductSpecial=Especial
QtyMin=Quantidade min
-PriceQty=Preço para a quantidade
PriceQtyMin=Preco para esta qtd min. (sem desconto)
VATRateForSupplierProduct=Percentual ICMS (para este fornecedor/produto)
DiscountQtyMin=Desconto padrao para qtd
-NoPriceDefinedForThisSupplier=Nenhum Preço/Quant. definido para este fornecedor/produto
-NoSupplierPriceDefinedForThisProduct=Nenhum Preço/Quant. Fornecedor definida para este produto
-RecordedProducts=Produtos em venda
RecordedServices=Serviços gravados
-RecordedProductsAndServices=Produtos/Serviços para Venda
PredefinedProductsToSell=Produtos pré-definidas para vender
PredefinedServicesToSell=Serviços predefinidos para vender
PredefinedProductsAndServicesToSell=Produtos / serviços pré-definidas para vender
PredefinedProductsToPurchase=Produto pré-definidas para compra
PredefinedServicesToPurchase=Serviços pré-definidos para compra
PredefinedProductsAndServicesToPurchase=Produtos / serviços predefinidos para compra.
-GenerateThumb=Gerar a etiqueta
-ProductCanvasAbility=Usar as extensões especiais "canvas"
ServiceNb=Serviço n� %s
ListProductServiceByPopularity=Lista de produtos/serviços por popularidade
ListProductByPopularity=Lista de produtos por popularidade
@@ -178,7 +79,7 @@ CloneProduct=Clonar produto ou serviço
ConfirmCloneProduct=Voce tem certeza que deseja clonar o produto ou servico <b>%s</b> ?
CloneContentProduct=Clonar todas as principais informações de um produto/serviço
ClonePricesProduct=Clonar principais informações e preços
-CloneCompositionProduct=Produtos / serviços copias virtuais
+CloneCompositionProduct=Clonar produto/serviço empacotado
ProductIsUsed=Este produto é usado
NewRefForClone=Ref. do novo produto/serviço
CustomerPrices=Preços de clientes
@@ -194,16 +95,12 @@ AddThisProductCard=Criar ficha produto
HelpAddThisProductCard=Esta opção permite de criar ou clonar um produto caso nao exista.
AddThisServiceCard=Criar ficha serviço
HelpAddThisServiceCard=Esta opção permite de criar ou clonar um serviço caso o mesmo não existe.
-CurrentProductPrice=Preço atual
AlwaysUseNewPrice=Usar sempre preço atual do produto/serviço
AlwaysUseFixedPrice=Usar preço fixo
-PriceByQuantity=Preço por quantidade
PriceByQuantityRange=Intervalo de quantidade
ProductsDashboard=Resumo de produtos/serviços
-UpdateOriginalProductLabel=Modificar etiqueta original
HelpUpdateOriginalProductLabel=Permite editar o nome do produto
-### composition fabrication
-Building=Produção e despacho de items
+Building=Produção e despacho de items
Build=Produzir
BuildIt=Produzir & Enviar
BuildindListInfo=Quantidade disponivel para produção por cada estoque (coloque 0 para nenhuma ação)
@@ -212,7 +109,6 @@ UnitPmp=Unidades VWAP
CostPmpHT=Total unidades VWAP
ProductUsedForBuild=Automaticamente consumidos pela produção
ProductBuilded=Produção completada
-ProductsMultiPrice=Produto multi-preço
ProductsOrServiceMultiPrice=Preços Clientes (de produtos ou serviços, multi-preços)
ProductSellByQuarterHT=Total de produtos vendidos no trimestre
ServiceSellByQuarterHT=Total de servicos vendidos no trimestre
@@ -233,9 +129,10 @@ DefinitionOfBarCodeForThirdpartyNotComplete=Definição do código ou valor do c
BarCodeDataForProduct=Informações de código de barras do produto% s:
BarCodeDataForThirdparty=Informações de código de barras do fornecedor:
ResetBarcodeForAllRecords=Definir o valor de código de barras para todos os registros (isto também irá repor valor de código de barras já definido com novos valores)
-PriceByCustomer=Preço por cliente
PriceCatalogue=Preço único por produto / serviço
PricingRule=As regras de tarifação
AddCustomerPrice=Adicione preço por parte dos clientes
ForceUpdateChildPriceSoc=Situado mesmo preço em outros pedidos dos clientes
PriceByCustomerLog=Preço por cliente
+MinimumPriceLimit=Preço minimo nao pode ser inferior a %s
+MinimumRecommendedPrice=Preço minimo recomendado e: %s
diff --git a/htdocs/langs/pt_BR/projects.lang b/htdocs/langs/pt_BR/projects.lang
index b6a3119b993c9048df26e95fd6b9357479136124..9c4a65dbfba055cbd0ee7f7033bd9da005c3f129 100644
--- a/htdocs/langs/pt_BR/projects.lang
+++ b/htdocs/langs/pt_BR/projects.lang
@@ -1,8 +1,5 @@
# Dolibarr language file - Source file is en_US - projects
-RefProject=Ref. do projeto
ProjectId=Id do projeto
-Project=Projeto
-Projects=Projetos
SharedProject=A todos
PrivateProject=Contatos do projeto
MyProjectsDesc=Exibe apenas os projetos que você for um contato (independente do tipo).
@@ -12,86 +9,54 @@ MyTasksDesc=Esta exibição é limitado a projetos ou tarefas que você é um co
TasksPublicDesc=Essa exibição apresenta todos os projetos e tarefas que você tem permissão para ler.
TasksDesc=Essa exibição apresenta todos os projetos e tarefas (suas permissões de usuário concede-lhe ver tudo).
Myprojects=Os Meus Projetos
-ProjectsArea=Área de Projetos
-NewProject=Novo Projeto
-AddProject=Criar Projeto
-DeleteAProject=Eliminar um Projeto
-DeleteATask=Eliminar uma Tarefa
+AddProject=Criar projeto
ConfirmDeleteAProject=Tem certeza que quer eliminar este projeto?
ConfirmDeleteATask=Tem certeza que quer eliminar esta tarefa?
OfficerProject=Responsável do Projeto
LastProjects=Os %s últimos Projetos
-AllProjects=Todos os Projetos
-ProjectsList=Lista de Projetos
ShowProject=Adicionar Projeto
-SetProject=Definir Projeto
-NoProject=Nenhum Projeto Definido
NbOpenTasks=No Tarefas Abertas
NbOfProjects=No de Projetos
TimeSpent=Tempo Dedicado
TimesSpent=Tempo gasto
RefTask=Ref. Tarefa
-LabelTask=Etiqueta de Tarefa
TaskTimeSpent=O tempo gasto nas tarefas
TaskTimeUser=Usuário
-TaskTimeNote=Nota
-TaskTimeDate=Data
NewTimeSpent=Novo Tempo Dedicado
MyTimeSpent=O Meu Tempo Dedicado
MyTasks=As minhas Tarefas
-Tasks=Tarefas
-Task=Tarefa
TaskDateStart=Data de início da tarefa
TaskDateEnd=Data final da tarefa
-TaskDescription=Descrição da tarefa
-NewTask=Nova Tarefa
-AddTask=Adicionar Tarefa
+AddTask=Criar tarefa
AddDuration=Indicar Duração
-Activity=Atividade
-Activities=Tarefas/Atividades
MyActivity=A Minha Atividade
MyActivities=Minhas Tarefas/Atividades
MyProjects=Os Meus Projetos
-DurationEffective=Duração Efetiva
-Progress=Progresso
ProgressDeclared=o progresso declarado
ProgressCalculated=calculado do progresso
-Time=Tempo
-ListProposalsAssociatedProject=Lista de Orçamentos Associados ao Projeto
ListOrdersAssociatedProject=Lista de Pedidos Associados ao Projeto
-ListInvoicesAssociatedProject=Lista de Faturas Associadas ao Projeto
-ListPredefinedInvoicesAssociatedProject=Lista de Faturas a Clientes Predefinidas Associadas ao Projeto
-ListSupplierOrdersAssociatedProject=Lista de Pedidos a Fornecedores Associados ao Projeto
ListSupplierInvoicesAssociatedProject=Lista de Faturas de Fornecedor Associados ao Projeto
-ListContractAssociatedProject=Lista de Contratos Associados ao Projeto
-ListFichinterAssociatedProject=Lista de intervenções associadas ao projeto
ListTripAssociatedProject=Lista de viagens e despesas associadas com o projeto
-ListActionsAssociatedProject=Lista de eventos associados ao projeto
ActivityOnProjectThisWeek=Atividade ao Projeto esta Semana
ActivityOnProjectThisMonth=Atividade ao Projeto este Mês
ActivityOnProjectThisYear=Atividade ao Projeto este Ano
ChildOfTask=Link da Tarefa
NotOwnerOfProject=Não é responsável deste projeto privado
-AffectedTo=Atribuido a
CantRemoveProject=Este projeto não pode ser eliminado porque está referenciado por muito objetos (facturas, pedidos e outros). ver a lista no separador referencias.
ValidateProject=Validar projeto
ConfirmValidateProject=Você tem certeza que deseja validar esse projeto?
-CloseAProject=Fechar projeto
ConfirmCloseAProject=Tem certeza de que quer encerrar esse projeto?
ReOpenAProject=Abrir projeto
ConfirmReOpenAProject=Tem certeza de que quer voltar a abrir este projeto?
ProjectContact=Contatos do projeto
ActionsOnProject=Eventos do projeto
YouAreNotContactOfProject=Você não é um contato deste projeto privado
-DeleteATimeSpent=Excluir o tempo gasto
ConfirmDeleteATimeSpent=Tem certeza de que deseja excluir este tempo?
-DoNotShowMyTasksOnly=Veja também as tarefas não alocada para mim
-ShowMyTasksOnly=Ver apenas tarefas que me forem atribuídos
-TaskRessourceLinks=Recursos
-ProjectsDedicatedToThisThirdParty=Projetos dedicados a este terceiro
+DoNotShowMyTasksOnly=Ver tambem tarefas não associadas comigo
+ShowMyTasksOnly=Ver so minhas tarefas
NoTasks=Não há tarefas para este projeto
LinkedToAnotherCompany=Ligado a outros terceiros
-TaskIsNotAffectedToYou=Tarefa não alocado para você
+TaskIsNotAffectedToYou=Tarefas não associadas a voce
ErrorTimeSpentIsEmpty=Tempo gasto está vazio
ThisWillAlsoRemoveTasks=Esta ação também vai apagar todas as tarefas do projeto <b>(tarefas% s</b> no momento) e todas as entradas de tempo gasto.
IfNeedToUseOhterObjectKeepEmpty=Se alguns objetos (nota fiscal, ordem, ...), pertencentes a um terceiro, deve estar vinculado ao projeto de criar, manter este vazio para que o projeto de vários fornecedores.
@@ -104,12 +69,9 @@ CloneTaskFiles=Copia(s) do(s) arquivo(s) do projeto(s) finalizado
ConfirmCloneProject=Tem certeza que deseja copiar este projeto?
ProjectReportDate=Alterar a data da tarefa de acordo com a data de início do projeto
ErrorShiftTaskDate=Impossível mudar data da tarefa de acordo com a nova data de início do projeto
-ProjectsAndTasksLines=Projetos e tarefas
-ProjectCreatedInDolibarr=Projeto %s criado
TaskCreatedInDolibarr=Tarefa %s criada
TaskModifiedInDolibarr=Tarefa %s alterada
TaskDeletedInDolibarr=Tarefa %s excluída
-##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Chefe de projeto
TypeContact_project_external_PROJECTLEADER=Chefe de projeto
TypeContact_project_internal_PROJECTCONTRIBUTOR=Colaborador
@@ -120,11 +82,12 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Colaborador
TypeContact_project_task_external_TASKCONTRIBUTOR=Colaborador
SelectElement=Selecionar componente
AddElement=Link para componente
-# Documents models
+UnlinkElement=Desligar elemento
DocumentModelBaleine=Modelo de relatório de um projeto completo (logo. ..)
-PlannedWorkload = carga horária planejada
-WorkloadOccupation= Carga horária empregada
+PlannedWorkload =carga horária planejada
+WorkloadOccupation=Carga horária empregada
ProjectReferers=Fazendo referência a objetos
SearchAProject=Buscar um projeto
ProjectMustBeValidatedFirst=O projeto tem que primeiramente ser validado
ProjectDraft=Rascunhos de projetos
+FirstAddRessourceToAllocateTime=Associar recurso para alocar tempo
diff --git a/htdocs/langs/pt_BR/propal.lang b/htdocs/langs/pt_BR/propal.lang
index 7b11b13a1984e57d27eed474d72335fe48d7c7fb..760efce5296ede81e054644c177f8dc27db5a8bd 100644
--- a/htdocs/langs/pt_BR/propal.lang
+++ b/htdocs/langs/pt_BR/propal.lang
@@ -1,78 +1,26 @@
# Dolibarr language file - Source file is en_US - propal
-Proposals=Orçamentos
-Proposal=Orçamento
-ProposalShort=Proposta
-ProposalsDraft=Orçamentos Rascunho
-ProposalDraft=Orçamento Rascunho
-ProposalsOpened=Orçamentos Abertos
-Prop=Orçamentos
-CommercialProposal=Orçamento
-CommercialProposals=Orçamentos
ProposalCard=Cartao de proposta
-NewProp=Novo Orçamento
-NewProposal=Novo Orçamento
-NewPropal=Novo Orçamento
-Prospect=Cliente Potencial
-ProspectList=Lista de Clientes Potenciais
-DeleteProp=Eliminar Orçamento
-ValidateProp=Confirmar Orçamento
-AddProp=Criar Orçamento
+AddProp=Criar proposta
ConfirmDeleteProp=Tem certeza que quer eliminar este orçamento?
ConfirmValidateProp=Tem certeza que quer Confirmar este orçamento?
LastPropals=Os %s últimos Orçamentos
LastClosedProposals=Os últimos Orçamentos Encerrados
LastModifiedProposals=As últimas %s propostas modificadas
-AllPropals=Todos Os Orçamentos
LastProposals=últimos Orçamentos
-SearchAProposal=Procurar um Orçamento
-ProposalsStatistics=Estatísticas de Orçamentos
-NumberOfProposalsByMonth=Número por Mês
AmountOfProposalsByMonthHT=Valor por Mês (sem ICMS)
-NbOfProposals=Número Orçamentos
-ShowPropal=Ver Orçamento
-PropalsDraft=Rascunho
-PropalsOpened=Abertos
PropalsNotBilled=Não Faturados
-PropalStatusDraft=Rascunho (a Confirmar)
-PropalStatusValidated=Validado (Orçamento Aberto)
-PropalStatusOpened=Validado (Orçamento Aberto)
-PropalStatusClosed=Encerrado
PropalStatusSigned=Assinado (A Faturar)
PropalStatusNotSigned=Sem Assinar (Encerrado)
PropalStatusBilled=Faturado
-PropalStatusDraftShort=Rascunho
-PropalStatusValidatedShort=Validado
-PropalStatusOpenedShort=Aberto
PropalStatusClosedShort=Encerrado
-PropalStatusSignedShort=Assinado
-PropalStatusNotSignedShort=Sem Assinar
PropalStatusBilledShort=Faturado
PropalsToClose=Orçamentos a Fechar
PropalsToBill=Orçamentos Assinados a Faturar
-ListOfProposals=Lista de Orçamentos
ActionsOnPropal=Ações sobre o Orçamento
-NoOpenedPropals=Sem Orçamentos Abertos
-NoOtherOpenedPropals=Nenhum outro orçamento aberto
-RefProposal=Ref. Orçamento
-SendPropalByMail=Enviar Orçamento por E-mail
-FileNotUploaded=Não foi Carregado o Arquivo
-FileUploaded=O Arquivo foi carregado corretamente
-AssociatedDocuments=Documentos Associados ao Orçamento :
ErrorCantOpenDir=Impossível Abrir a Pasta
DatePropal=Data da Proposta
-DateEndPropal=Válido até
-DateEndPropalShort=Data Fim
-ValidityDuration=Duração da Validade
CloseAs=Fechado como
-ClassifyBilled=Classificar Faturado
BuildBill=Criar Fatura
-ErrorPropalNotFound=Orçamento %s Inexistente
-Estimate=Orçamento:
-EstimateShort=Orç.
-OtherPropals=Outros Orçamentos
-AddToDraftProposals=Adicionar a projeto de proposta
-NoDraftProposals=Não há projetos de propostas
-CopyPropalFrom=Criar orçamento por Cópia de um existente
CreateEmptyPropal=Criar orçamento a partir da Lista de produtos predefinidos
DefaultProposalDurationValidity=Prazo de validez por default (em dias)
UseCustomerContactAsPropalRecipientIfExist=Utilizar endereço contato de seguimento de cliente definido em vez do endereço do Fornecedor como destinatário dos Orçamentos
@@ -84,19 +32,10 @@ ProposalLine=Linha da Proposta
AvailabilityPeriod=Data de aprontamento
SetAvailability=Atrazo de entrega
AfterOrder=Apos o pedido
-##### Availability #####
-AvailabilityTypeAV_NOW=Imediato
-AvailabilityTypeAV_1W=1 semana
-AvailabilityTypeAV_2W=2 semanas
-AvailabilityTypeAV_3W=3 semanas
AvailabilityTypeAV_1M=1 mes
-##### Types de contacts #####
TypeContact_propal_internal_SALESREPFOLL=Representante seguindo a proposta
TypeContact_propal_external_BILLING=Contato da fatura cliente
-TypeContact_propal_external_CUSTOMER=Contato cliente seguindo a proposta
-# Document models
-DocModelAzurDescription=Modelo de orçamento completo (logo...)
-DocModelJauneDescription=Modelo de Orçamento Jaune
+TypeContact_propal_external_CUSTOMER=Contato cliente seguindo a proposta
DefaultModelPropalCreate=Criaçao modelo padrao
DefaultModelPropalToBill=Modelo padrao no fechamento da proposta comercial ( a se faturar)
DefaultModelPropalClosed=Modelo padrao no fechamento da proposta comercial (nao faturada)
diff --git a/htdocs/langs/pt_BR/resource.lang b/htdocs/langs/pt_BR/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..ac5195cbe84a817551ffbab6e1f6969d3ea12787
--- /dev/null
+++ b/htdocs/langs/pt_BR/resource.lang
@@ -0,0 +1,27 @@
+# Dolibarr language file - Source file is en_US - resource
+MenuResourceIndex=Recursos
+MenuResourceAdd=Novo recurso
+MenuResourcePlanning=Planejamento de recurso
+DeleteResource=Remover recurso
+ConfirmDeleteResourceElement=Confirmar remoção do recurso para este elemento
+NoResourceInDatabase=Nenhum recurso na base de dados
+NoResourceLinked=Nenhum recurso vinculado
+ResourcePageIndex=Lista de recursos
+ResourceSingular=Recurso
+ResourceCard=Cartao recursos
+AddResource=Criar recurso
+ResourceFormLabel_ref=Nome do recurso
+ResourceType=Tipo de recurso
+ResourceFormLabel_description=Descrição do recurso
+ResourcesLinkedToElement=Recursos vinculados ao elemento
+ShowResourcePlanning=Mostrar planejamento do recurso
+GotoDate=Ir para data
+ResourceElementPage=Elemento recursos
+ResourceCreatedWithSuccess=Recurso criado com sucesso
+ResourceLinkedWithSuccess=Recurso conectado com sucesso
+TitleResourceCard=Cartao recurso
+ConfirmDeleteResource=Confirme para remover este recurso
+RessourceSuccessfullyDeleted=Recurso removido com sucesso
+DictionaryResourceType=Tipo de recurso
+DictionaryEMailTemplates=Modelos de Emails
+SelectResource=Selecionar recurso
diff --git a/htdocs/langs/pt_BR/salaries.lang b/htdocs/langs/pt_BR/salaries.lang
index 6a69041ef3076e26f58779d1805fc2baba0d79c3..ae54678cc61b28574584051a8e5652f54edc8191 100644
--- a/htdocs/langs/pt_BR/salaries.lang
+++ b/htdocs/langs/pt_BR/salaries.lang
@@ -1,8 +1,4 @@
-# Dolibarr language file - Source file is en_US - users
-Salary=Salário
-Salaries=Salários
-Employee=Empregado
+# Dolibarr language file - Source file is en_US - salaries
NewSalaryPayment=Novo pagamento de salário
SalaryPayment=Pagamento de salário
SalariesPayments=Pagamentos de salários
-ShowSalaryPayment=Mostrar pagamento de salário
diff --git a/htdocs/langs/pt_BR/sendings.lang b/htdocs/langs/pt_BR/sendings.lang
index 91ca6e88639e1cb008080e54523d8c168a3c7cdd..a17cd46bf391693a79af7be529a0c929e21bd9bf 100644
--- a/htdocs/langs/pt_BR/sendings.lang
+++ b/htdocs/langs/pt_BR/sendings.lang
@@ -1,43 +1,10 @@
# Dolibarr language file - Source file is en_US - sendings
RefSending=Ref. Envio
-Sending=Envio
-Sendings=Envios
-Shipment=Envio
-Shipments=Envios
-Receivings=Recepções
SendingsArea=Área Envios
-ListOfSendings=Lista de Envios
-SendingMethod=Método de Envio
-SendingReceipt=Entrega
LastSendings=Os %s últimos Envios
-SearchASending=Procurar Envio
-StatisticsOfSendings=Estatísticas de Envios
-NbOfSendings=Número de Envios
-NumberOfShipmentsByMonth=Número de envios por mês
-SendingCard=Ficha de Envio
-NewSending=Novo Envio
-CreateASending=Criar um Envio
-CreateSending=Criar Envio
-QtyOrdered=Quant. Pedida
-QtyShipped=Quant. Enviada
-QtyToShip=Quant. a Enviar
QtyReceived=Quant. Recibida
KeepToShip=Fica por Enviar
-OtherSendingsForSameOrder=Outros Envios deste Pedido
-DateSending=Data de Expedição
-DateSendingShort=Data de Expedição
-SendingsForSameOrder=Expedições deste Pedido
-SendingsAndReceivingForSameOrder=Envios e Recepções deste pedido
-SendingsToValidate=Envios a Confirmar
-StatusSendingCanceled=Cancelado
-StatusSendingDraft=Rascunho
StatusSendingValidated=Validado (produtos a enviar o enviados)
-StatusSendingProcessed=Processado
-StatusSendingCanceledShort=Cancelado
-StatusSendingDraftShort=Rascunho
-StatusSendingValidatedShort=Validado
-StatusSendingProcessedShort=Processado
-SendingSheet=Ficha de envio
Carriers=Transportadoras
Carrier=Transportadora
CarriersArea=Área Transportadoras
@@ -45,30 +12,28 @@ NewCarrier=Novo Transportadora
ConfirmDeleteSending=Tem certeza que quer eliminar esta expedição?
ConfirmValidateSending=Tem certeza que quer Confirmar esta expedição?
ConfirmCancelSending=Tem certeza que quer anular esta expedição?
-GenericTransport=Transporte Genérico
-Enlevement=Pick-up por o Cliente
-DocumentModelSimple=Modelo Simples
DocumentModelMerou=Modelo A5 Merou
WarningNoQtyLeftToSend=Atenção, nenhum produto à espera de ser enviado.
StatsOnShipmentsOnlyValidated=Estatisticas referentes os envios , mas somente validados. Data usada e data da validacao do envio ( a data planejada da entrega nao e sempre conhecida).
DateDeliveryPlanned=Data de entrega planejada
DateReceived=Data de entrega recebida
SendShippingByEMail=Envio enviado por e-mail
-SendShippingRef=Enviar envio %s
+SendShippingRef=Submeter para envio %s
ActionsOnShipping=Eventos no envio
LinkToTrackYourPackage=Atalho para rastreamento do pacote
ShipmentCreationIsDoneFromOrder=No momento a criaçao de um novo envio e feito da ficha de pedido.
RelatedShippings=Envios relativos
ShipmentLine=Linha de envio
CarrierList=Lista de transportadoras
-
-# Sending methods
+SendingRunning=Produto da ordem do cliente ja enviado
+SuppliersReceiptRunning=Produto do pedido do fornecedor ja recebido
SendingMethodCATCH=Remoção pelo cliente
SendingMethodTRANS=Transportadora
SendingMethodCOLSUI=Acompanhamento
-# ModelDocument
DocumentModelSirocco=Modelo de Documento Sirocco
DocumentModelTyphon=Modelo de Documento Typhon
Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constante EXPEDITION_ADDON_NUMBER nao definida
SumOfProductVolumes=Soma do volume dos pedidos
SumOfProductWeights=Soma do peso dos produtos
+DetailWarehouseNumber=Detalhes do estoque
+DetailWarehouseFormat=W:%s (Qtd : %d)
diff --git a/htdocs/langs/pt_BR/sms.lang b/htdocs/langs/pt_BR/sms.lang
index 6143de383226e2f85f25ffec6418e4dc5919dbad..fe0e300bf2b79a06e472c5d3bf44c91a169c78eb 100644
--- a/htdocs/langs/pt_BR/sms.lang
+++ b/htdocs/langs/pt_BR/sms.lang
@@ -1,18 +1,12 @@
# Dolibarr language file - Source file is en_US - sms
-Sms=Sms
SmsSetup=Configuraçao sms
SmsDesc=Esta pagina permite definir as opçoes globais para os SMS
SmsCard=Cartao SMS
AllSms=Todas as campnhas SMS
SmsTargets=Alvos
SmsRecipients=Alvos
-SmsRecipient=Alvo
SmsTitle=Descriçao
-SmsFrom=Remetente
-SmsTo=Alvo
SmsTopic=Topico do SMS
-SmsText=Mensagem
-SmsMessage=Mensagem SMS
ShowSms=Mostrar SMS
ListOfSms=Listar campanhas SMS
NewSms=Nova campanha SMS
@@ -27,27 +21,13 @@ SmsResult=Resultado do envio SMS
TestSms=Testar SMS
ValidSms=Validar SMS
ApproveSms=Aprovar SMS
-SmsStatusDraft=Rascunho
-SmsStatusValidated=Validado
-SmsStatusApproved=Aprovado
-SmsStatusSent=Enviado
-SmsStatusSentPartialy=Enviado parcialmente
-SmsStatusSentCompletely=Enviado completamente
-SmsStatusError=Erro
SmsStatusNotSent=Nao enviado
SmsSuccessfulySent=SMS enviado coretamente (de %s a %s)
ErrorSmsRecipientIsEmpty=Numero de alvos vazio
WarningNoSmsAdded=Falta numero telefone para adicionar a lista de alvos
ConfirmValidSms=Voce confiram a validaçao desta campanha ?
-ConfirmResetMailing=Atençao, se voce reinicializar a campanha SMS <b>%s</b>, voce permitira o envio de masa da mesma pela segunda vez. E veramente isto o que se quer ?
-ConfirmDeleteMailing=Voce confirma a remoçao da campanha ?
-NbOfRecipients=Numero de alvos
NbOfUniqueSms=Nr. de numeros telefonicos unicos
NbOfSms=Numero de numeros telefonicos
ThisIsATestMessage=Isto e uma mensagem de teste
-SendSms=Enviar SMS
SmsInfoCharRemain=Nr de caracteres restantes
-SmsInfoNumero= (formato internacional ex: +33899701761)
-DelayBeforeSending=Atraso antes de enviar (minutos)
-SmsNoPossibleRecipientFound=Nenhum alvo disponível. Verifique a configuração do seu provedor de SMS.
-
+SmsInfoNumero=(formato internacional ex: +33899701761)
diff --git a/htdocs/langs/pt_BR/stocks.lang b/htdocs/langs/pt_BR/stocks.lang
index c0183f790da27b872df8fba1174ad2a8b403e8ff..62b718a2a79bcd861b14e77eebb41e320d9dcca2 100644
--- a/htdocs/langs/pt_BR/stocks.lang
+++ b/htdocs/langs/pt_BR/stocks.lang
@@ -9,45 +9,28 @@ WarehouseOpened=Armazém Aberto
WarehouseClosed=Armazém Encerrado
WarehouseSource=Armazém Origem
WarehouseSourceNotDefined=Sem armazém definido,
-AddOne=Adicionar um
-WarehouseTarget= Destino do armazenamento
+WarehouseTarget=Destino do armazenamento
ValidateSending=Confirmar Envio
CancelSending=Cancelar Envio
DeleteSending=Eliminar Envio
Stock=Estoque
Stocks=Estoques
-Movement=Movimento
-Movements=Movimentos
ErrorWarehouseRefRequired=Nome de referência do armazenamento é necessária
ErrorWarehouseLabelRequired=A etiqueta do armazenamento é obrigatória
CorrectStock=Corrigir Estoque
ListOfWarehouses=Lista de armazenamento
-ListOfStockMovements=Lista de movimentos de stock
-StocksArea=Área estoques
-Location=Localização
-LocationSummary=Nome abreviado da localização
+StocksArea=Area de estoque
NumberOfDifferentProducts=Número de produtos diferentes
-NumberOfProducts=Numero total de produtos
-LastMovement=Último movimento
-LastMovements=Últimos movimentos
-Units=Unidades
-Unit=Unidade
StockCorrection=Correção estoque
StockTransfer=Banco de transferência
-StockMovement=Transferencia
StockMovements=Movimentos de estoque
LabelMovement=Etiqueta Movimento
-NumberOfUnit=Número de peças
UnitPurchaseValue=Preço de compra da unidade
TotalStock=Total em estoque
StockTooLow=Estoque insuficiente
StockLowerThanLimit=Da ação inferior limite de alerta
-EnhancedValue=Valor
-PMPValue=Valor (PMP)
-PMPValueShort=PMP
EnhancedValueOfWarehouses=Valor de estoques
UserWarehouseAutoCreate=Criar existencias automaticamente na criação de um usuário
-QtyDispatched=Quantidade desagregada
OrderDispatch=Recepção de estoques
RuleForStockManagementDecrease=Regra de Administração de decrementos de estoque
RuleForStockManagementIncrease=Regra de Administração de incrementos de estoque
@@ -59,9 +42,7 @@ ReStockOnValidateOrder=Incrementar os estoques físicos sobre os pedidos
ReStockOnDispatchOrder=Aumentar os estoques reais no envio manual para armazenamento, depois de receber ordem fornecedor
ReStockOnDeleteInvoice=Aumentar os estoques reais sobre exclusão fatura
OrderStatusNotReadyToDispatch=Não tem ordem ainda não ou nato tem um status que permite envio de produtos em para armazenamento.
-StockDiffPhysicTeoric=Motivo da diferença entre valores físicos e teóricos
NoPredefinedProductToDispatch=Não há produtos pré-definidos para este objeto. Portanto, não envio em estoque é necessária.
-DispatchVerb=Expedição
StockLimitShort=Limite para alerta
StockLimit=Limite de estoque para alerta
PhysicalStock=Estoque físico
@@ -78,8 +59,6 @@ WarehousesAndProducts=Armazenamento de produtos
AverageUnitPricePMPShort=Preço médio de entrada
AverageUnitPricePMP=Preço médio de entrada
SellPriceMin=Venda Preço unitário
-EstimatedStockValueSellShort=Valor para vender
-EstimatedStockValueSell=Valor para vender
EstimatedStockValueShort=O valor das ações de entrada
EstimatedStockValue=O valor das ações de entrada
DeleteAWarehouse=Excluir um arquivo
@@ -103,7 +82,6 @@ CurentlyUsingVirtualStock=Estoque virtual
CurentlyUsingPhysicalStock=Estoque físico
RuleForStockReplenishment=Regra para as ações de reposição
SelectProductWithNotNullQty=Selecione pelo menos um produto com um qty não nulo e um fornecedor
-AlertOnly= Só Alertas
WarehouseForStockDecrease=Os arquivos serão utilizados para redução estoque
WarehouseForStockIncrease=O arquivos serão utilizados para aumento de
ForThisWarehouse=Para este armazenamento
@@ -111,7 +89,7 @@ ReplenishmentStatusDesc=Esta lista de todos os produtos com um estoque menor do
ReplenishmentOrdersDesc=Esta lista de todos os pedidos de fornecedores esta aberto
Replenishments=Reconstituições
NbOfProductBeforePeriod=Quantidade de produtos em estoque antes do período selecionado
-NbOfProductAfterPeriod=Quantidade de produtos em estoque período selecionado depois
+NbOfProductAfterPeriod=Quantidade de produtos em estoque período selecionado depois
MassMovement=Movimento de massas
MassStockMovement=Movimento de estoque em massa
SelectProductInAndOutWareHouse=Selecione um produto, uma quantidade, um armazém de origem e um armazém de destino e clique em "% s". Uma vez feito isso para todos os movimentos necessários, clique em "% s".
@@ -121,5 +99,4 @@ StockMovementRecorded=Movimentos de estoque gravados
RuleForStockAvailability=Regras sobre os requisitos de ações
StockMustBeEnoughForInvoice=Banco de nível deve ser o suficiente para adicionar o produto / serviço em fatura
StockMustBeEnoughForOrder=Banco de nível deve ser o suficiente para adicionar o produto / serviço em ordem
-StockMustBeEnoughForShipment= Banco de nível deve ser o suficiente para adicionar o produto / serviço no transporte
-
+StockMustBeEnoughForShipment=Banco de nível deve ser o suficiente para adicionar o produto / serviço no transporte
diff --git a/htdocs/langs/pt_BR/suppliers.lang b/htdocs/langs/pt_BR/suppliers.lang
index 566987d55a225a0ae21f791d6d6c1b1a1c0da392..747ddb02476d50fd6de29128b24812e279e82c30 100644
--- a/htdocs/langs/pt_BR/suppliers.lang
+++ b/htdocs/langs/pt_BR/suppliers.lang
@@ -1,42 +1,22 @@
# Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Fornecedores
-Supplier=Fornecedor
-AddSupplier=Adicionar Fornecedor
-SupplierRemoved=Fornecedor Eliminado
+AddSupplier=Criar fornecedor
SuppliersInvoice=Faturas do Fornecedor
-NewSupplier=Novo Fornecedor
-History=Histórico
-ListOfSuppliers=Lista de Fornecedores
-ShowSupplier=Mostrar Fornecedor
-OrderDate=Data Pedido
-BuyingPrice=Preço de Compra
BuyingPriceMin=Preco de compra minimo
BuyingPriceMinShort=Preco de compra min
TotalBuyingPriceMin=Total de precos de compra dos subprodutos
SomeSubProductHaveNoPrices=Algums dos sub-produtos nao tem um preco definido
-AddSupplierPrice=Adicionar Preço de Fornecedor
-ChangeSupplierPrice=Modificar Preço de Fornecedor
-ErrorQtyTooLowForThisSupplier=Quantidade insuficiente para este fornecedor
-ErrorSupplierCountryIsNotDefined=O país deste fornecedor não está definido, corrija na sua ficha
ProductHasAlreadyReferenceInThisSupplier=Este produto já tem uma referencia neste fornecedor
ReferenceSupplierIsAlreadyAssociatedWithAProduct=Esta referencia de fornecedor ja esta asociada com a referenca: %s
-NoRecordedSuppliers=Sem Fornecedores Registados
-SupplierPayment=Pagamento a Fornecedor
-SuppliersArea=Área Fornecedores
-RefSupplierShort=Ref. Fornecedor
Availability=Entrega
ExportDataset_fournisseur_1=Faturas de Fornecedores e Linhas de Fatura
ExportDataset_fournisseur_2=Faturas Fornecedores e Pagamentos
ExportDataset_fournisseur_3=Ordems de fornecedor e linhas de ordem
-ApproveThisOrder=Aprovar este Pedido
ConfirmApproveThisOrder=Tem certeza que quer aprovar este pedido?
-DenyingThisOrder=Negar este Pedido
ConfirmDenyingThisOrder=Tem certeza que quer negar este pedido?
ConfirmCancelThisOrder=Tem certeza que quer cancelar este pedido?
-AddCustomerOrder=Criar Pedido do Cliente
AddCustomerInvoice=Criar Fatura para o Cliente
-AddSupplierOrder=Criar Pedido a Fornecedor
AddSupplierInvoice=Criar Fatura do Fornecedor
-ListOfSupplierProductForSupplier=Lista de produtos e preços do fornecedor <b>%s</b>
NoneOrBatchFileNeverRan=Nenhum lote ou <b>%s</b> não foi executado recentemente
SentToSuppliers=Enviado para fornecedores
+ListOfSupplierOrders=Lista de pedidos do fornecedor
+MenuOrdersSupplierToBill=Pedidos a se faturar do foprnecedor
diff --git a/htdocs/langs/pt_BR/trips.lang b/htdocs/langs/pt_BR/trips.lang
index c236b55cb3c8606015a7f3e9e8506a9ec4be101f..8af39e7001d74a8be15d652ee8253f6e3467e94b 100644
--- a/htdocs/langs/pt_BR/trips.lang
+++ b/htdocs/langs/pt_BR/trips.lang
@@ -2,20 +2,15 @@
Trip=Deslocamento
Trips=Deslocamentos
TripsAndExpenses=Deslocamentos e Despesas
-TripsAndExpensesStatistics=Estatisticas de viagems e despesas
+TripsAndExpensesStatistics=Estatisticas de viagems e despesas
TripCard=Ficha de Deslocamento
-AddTrip=Adicionar Deslocamento
+AddTrip=Criar viagem
ListOfTrips=Lista de Deslocamentos
-ListOfFees=Lista de Taxas
NewTrip=Nova Deslocamento
-CompanyVisited=Empresa/Instituição Visitada
Kilometers=Kilometros
FeesKilometersOrAmout=Quantidade de Kilometros
DeleteTrip=Eliminar Deslocamento
ConfirmDeleteTrip=Tem certeza que quer eliminar esta deslocamento?
-TF_OTHER=Outro
-TF_LUNCH=Alimentação
-TF_TRIP=Viagem
-ListTripsAndExpenses=Lista de viagens e despesas
ExpensesArea=Area de viagems e despesas
SearchATripAndExpense=Buscar para uma viagem ou despesa
+ClassifyRefunded=Classificar 'Rembolsado'
diff --git a/htdocs/langs/pt_BR/users.lang b/htdocs/langs/pt_BR/users.lang
index 6f4039834419dc5afe105771eb70ce714f0a3935..71a6fdf979014c972428c94a7e2b54225e336a60 100644
--- a/htdocs/langs/pt_BR/users.lang
+++ b/htdocs/langs/pt_BR/users.lang
@@ -2,10 +2,7 @@
HRMArea=área de gestão de recursos humanos
UserCard=Ficha de Usuário
ContactCard=Ficha de Contato
-GroupCard=Ficha de Grupo
NoContactCard=Nenhum cartão para os contatos
-Permission=Permissão
-Permissions=Permissões
EditPassword=Alterar senha
SendNewPassword=Enviar nova senha
ReinitPassword=Gerar nova senha
@@ -35,14 +32,11 @@ ConfirmEnableGroup=Você tem certeza que quer reativar o grupo <b>%s</b> ?
ConfirmReinitPassword=Você tem certeza que quer gerar uma nova senha para o usuário <b>%s</b> ?
ConfirmSendNewPassword=Você tem certeza que quer enviar uma nova senha para o usuário <b>%s</b> ?
NewUser=Novo usuário
-CreateUser=Criar usuário
SearchAGroup=Buscar um grupo
SearchAUser=Buscar um usuário
LoginNotDefined=O usuário não está definido
NameNotDefined=O nome não está definido
ListOfUsers=Lista de usuário
-Administrator=Administrador
-SuperAdministrator=Super Administrador
SuperAdministratorDesc=Administrador geral
AdministratorDesc=Entidade do administrador
DefaultRights=Permissões por Padrao
@@ -57,13 +51,11 @@ RemoveFromGroup=Remover do grupo
PasswordChangedAndSentTo=Senha alterada e enviada a <b>%s</b>.
PasswordChangeRequestSent=Solicitação para alterar a senha para <b>%s</b> enviada a <b>%s</b>.
MenuUsersAndGroups=Usuários e Grupos
-LastGroupsCreated=Os %s últimos grupos criados
LastUsersCreated=Os %s últimos usuários criados
ShowGroup=Visualizar grupo
ShowUser=Visualizar usuário
NonAffectedUsers=Usuários não atribuídos
UserModified=Usuário modificado com sucesso
-GroupModified=Grupo modificado com sucesso
PhotoFile=Arquivo de foto
UserWithDolibarrAccess=Usuário com acesso ao Dolibarr
ListOfUsersInGroup=Lista de usuários deste grupo
@@ -80,20 +72,14 @@ CreateDolibarrThirdParty=Criar um fornecedor
LoginAccountDisable=A conta está desativada, indique um Novo login para a ativar.
LoginAccountDisableInDolibarr=A conta está desativada no Dolibarr
LoginAccountDisableInLdap=A conta está desativada ao domínio
-UsePersonalValue=Utilizar valores personalizados
-GuiLanguage=Idioma do Interface
-InternalUser=Usuário Interno
-MyInformations=A Minha Informação
ExportDataset_user_1=Usuários e Atributos
DomainUser=Usuário de Domínio
Reactivate=Reativar
CreateInternalUserDesc=Este formulario permite criar um usuario interno a sua compania/fundação. Para criar um usuario externo (cliente, fornecedor, ...), use o botão 'Criar usuario Dolibarr' da ficha de contatos dos terceiro..
InternalExternalDesc=Um usuário <b>interno</b> é um usuário que pertence à sua Empresa/Instituição.<br>Um usuário <b>externo</b> é um usuário cliente, fornecedor ou outro.<br><br>Nos 2 casos, as permissões de Usuários definem os direitos de acesso, mas o usuário externo pode além disso ter um gerente de menus diferente do usuário interno (ver Inicio - configuração - visualização)
PermissionInheritedFromAGroup=A permissão dá-se já que o herda de um grupo ao qual pertence o usuário.
-Inherited=Herdado
UserWillBeInternalUser=Usuario criado sera um usuario interno (porque nao esta conectado a um particular terceiro)
UserWillBeExternalUser=Usuario criado sera um usuario externo (porque esta conectado a um particular terceiro)
-IdPhoneCaller=ID chamador (telefone)
UserLogged=Usuário %s Conectado
UserLogoff=Usuario %s desconectou
NewUserCreated=Usuário %s Criado
@@ -102,20 +88,17 @@ EventUserModified=Usuário %s Modificado
UserDisabled=Usuário %s Desativado
UserEnabled=Usuário %s Ativado
UserDeleted=Usuário %s Eliminado
-NewGroupCreated=Grupo %s Criado
-GroupModified=Grupo modificado com sucesso
-GroupDeleted=Grupo %s Eliminado
ConfirmCreateContact=Tem certeza que quer criar uma conta para este contato?
ConfirmCreateLogin=Tem certeza de que deseja criar uma conta para este membro?
ConfirmCreateThirdParty=Tem certeza que quer criar um Fornecedor para este membro?
-LoginToCreate=Login a Criar
NameToCreate=Nome do Fornecedor a Criar
YourRole=Suas funções
YourQuotaOfUsersIsReached=Sua cota de usuarios ativos atingida !
-NbOfUsers=N. de usuarios
+NbOfUsers=N. de usuarios
DontDowngradeSuperAdmin=Somente um Super Administrador pode rebaixar um Super Administrador
-HierarchicalResponsible=Responsabilidade hierárquica
HierarchicView=Visão hierárquica
UseTypeFieldToChange=Use campo Tipo para mudar
OpenIDURL=URL do OpenID
LoginUsingOpenID=Usar o OpenID para efetuar o login
+WeeklyHours=Horas semanais
+ColorUser=Cor do usuario
diff --git a/htdocs/langs/pt_BR/withdrawals.lang b/htdocs/langs/pt_BR/withdrawals.lang
index e288e999d4e26e3baae992eeb6f1c42dde5dd09f..08653c368d45955dab092bceefab6a748dd0f05c 100644
--- a/htdocs/langs/pt_BR/withdrawals.lang
+++ b/htdocs/langs/pt_BR/withdrawals.lang
@@ -1,31 +1,19 @@
# Dolibarr language file - Source file is en_US - withdrawals
StandingOrdersArea=Área ordens permanentes
CustomersStandingOrdersArea=Área de Débitos Diretos de Clientes
-StandingOrders=Débitos Diretos
-StandingOrder=Débitos Diretos
NewStandingOrder=Novo Débito Direto
StandingOrderToProcess=A Processar
-StandingOrderProcessed=Processado
-Withdrawals=Levantamentos
-Withdrawal=Levantamento
-WithdrawalsReceipts=Ordens de Levantamento
-WithdrawalReceipt=Ordem de Levantamento
-WithdrawalReceiptShort=Ordem
-LastWithdrawalReceipts=As %s últimas ordens de levantamento
WithdrawedBills=Faturas de Levantamentos
-WithdrawalsLines=Linhas de Levantamento
-RequestStandingOrderToTreat=Pedidos de Débitos Diretos a Tratar
-RequestStandingOrderTreated=Pedidos de Débitos Diretos Processados
+RequestStandingOrderToTreat=Pedido de processamento das ordems abertas
+RequestStandingOrderTreated=Pedido para ordems abertas processado
CustomersStandingOrders=Débitos Diretos de Clientes
CustomerStandingOrder=Débito Direto de Cliente
NbOfInvoiceToWithdraw=Nb. da fatura para realizar pedido
NbOfInvoiceToWithdrawWithInfo=Nb. da fatura para realizar pedido para os clientes com informações de conta bancária definida
InvoiceWaitingWithdraw=Faturas em Espera de Levantamento
-AmountToWithdraw=Quantidade a Levantar
WithdrawsRefused=Débitos Diretos Rejeitados
NoInvoiceToWithdraw=Nenhuma fatura a cliente com modo de pagamento 'Débito Directo' em espera. Ir ao separador 'Débito Directo' na ficha da fatura para fazer um pedido.
ResponsibleUser=Usuário Responsável dos Débitos Diretos
-WithdrawalsSetup=Configuração dos Débitos Diretos
WithdrawStatistics=Estatísticas de Débitos Diretos
WithdrawRejectStatistics=Estatísticas de Débitos Diretos Rejeitados
LastWithdrawalReceipt=Os %s últimos Débitos Diretos Recebidos
@@ -37,22 +25,13 @@ ClassCredited=Classificar Acreditados
ClassCreditedConfirm=Você tem certeza que querer marcar este pagamento como realizado em a sua conta bancaria?
TransData=Data da transferência
TransMetod=Método de transferência
-Send=Enviar
-Lines=Linhas
StandingOrderReject=Emitir uma recusa
-InvoiceRefused=Nota Fiscal recusada
WithdrawalRefused=Retirada recusada
WithdrawalRefusedConfirm=Você tem certeza que quer entrar com uma rejeição de retirada para a sociedade
-RefusedData=Data de rejeição
-RefusedReason=Motivo da rejeição
RefusedInvoicing=Cobrança da rejeição
NoInvoiceRefused=Não carregue a rejeição
-InvoiceRefused=Nota Fiscal recusada
-Status=Estado
-StatusUnknown=Desconhecido
StatusWaiting=Aguardando
StatusTrans=Enviado
-StatusCredited=Creditado
StatusRefused=Negado
StatusMotif0=Não especificado
StatusMotif1=Saldo insuficiente
@@ -60,31 +39,22 @@ StatusMotif2=Solicitação contestada
StatusMotif3=Não há pedido de retirada
StatusMotif4=Pedido do Cliente
StatusMotif5=RIB inutilizável
-StatusMotif6=Conta sem saldo
-StatusMotif7=Decisão Judicial
StatusMotif8=Outras razões
CreateAll=Retirar tudo
CreateGuichet=Apenas do escritório
-CreateBanque=Apenas banco
OrderWaiting=Aguardando resolução
NotifyTransmision=Retirada de Transmissão
-NotifyEmision=Emissões de retirada
+NotifyEmision=Emissões de retirada
NotifyCredit=Revogação de crédito
NumeroNationalEmetter=Nacional Número Transmissor
-PleaseSelectCustomerBankBANToWithdraw=Selecione informações sobre conta bancária do cliente para retirar
-WithBankUsingRIB=Para contas bancárias usando RIB
-WithBankUsingBANBIC=Para contas bancárias usando IBAN / BIC / SWIFT
BankToReceiveWithdraw=Conta bancária para receber saques
CreditDate=A crédito
-WithdrawalFileNotCapable=Não foi possível gerar arquivo recibo de retirada para o seu país
ShowWithdraw=Mostrar Retire
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=No entanto, se fatura não tem pelo menos um pagamento retirada ainda processado, não vai ser definido como pago para permitir a gestão de remoção prévia.
DoStandingOrdersBeforePayments=Essa guia permite que você solicite uma ordem permanente. Depois de concluído, você pode digitar o pagamento para fechar a fatura.
WithdrawalFile=Arquivo Retirada
SetToStatusSent=Defina o status "arquivo enviado"
ThisWillAlsoAddPaymentOnInvoice=Isto também se aplica aos pagamentos de faturas e classificá-los como "Paid"
-
-### Notifications
InfoCreditSubject=Pagamento pendente pelo banco
InfoCreditMessage=O pedido pendente foi pago pelo banco <br> Dados de pagamento:% s
InfoTransSubject=Transmissão de pedido pendente para o banco
diff --git a/htdocs/langs/pt_BR/workflow.lang b/htdocs/langs/pt_BR/workflow.lang
index f90ce09f782061683a439dde0757062a883e8e6a..1f532022dee5cf02c039f54b434ff61ab8c7c948 100644
--- a/htdocs/langs/pt_BR/workflow.lang
+++ b/htdocs/langs/pt_BR/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
WorkflowSetup=Configuração do módulo de Fluxo de Trabalho
WorkflowDesc=Este módulo foi projetado para modificar o comportamento de ações automáticas dentro a aplicação. Por padrão, o fluxo de trabalho e abilitado (você faz as coisas em ordem que você quiser). Você pode habilitar ações automáticas que são de seu interesse.
ThereIsNoWorkflowToModify=Não há fluxo de trabalho que você pode modificar para o módulo que você ativou.
diff --git a/htdocs/langs/pt_PT/accountancy.lang b/htdocs/langs/pt_PT/accountancy.lang
index 8cab9d2b651d75b0721d76fda619e2034e4509b4..99a473d063b1627444beb62e9fc9407d9ac35f82 100644
--- a/htdocs/langs/pt_PT/accountancy.lang
+++ b/htdocs/langs/pt_PT/accountancy.lang
@@ -1,158 +1,158 @@
# Dolibarr language file - en_US - Accounting Expert
CHARSET=UTF-8
-Accounting=Accounting
-Globalparameters=Global parameters
-Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
-Menuaccount=Accounting accounts
-Menuthirdpartyaccount=Thirdparty accounts
-MenuTools=Tools
-
-ConfigAccountingExpert=Configuration of the module accounting expert
-Journaux=Journals
-JournalFinancial=Financial journals
-Exports=Exports
-Modelcsv=Model of export
-Selectmodelcsv=Select a model of export
-Modelcsv_normal=Classic export
-Modelcsv_CEGID=Export towards CEGID Expert
-BackToChartofaccounts=Return chart of accounts
-Back=Return
-
-Definechartofaccounts=Define a chart of accounts
-Selectchartofaccounts=Select a chart of accounts
-Validate=Validate
-Addanaccount=Add an accounting account
-AccountAccounting=Accounting account
-Ventilation=Ventilation
-ToDispatch=To dispatch
-Dispatched=Dispatched
-
-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
-TradeMargin=Trade margin
-Reports=Reports
-ByCustomerInvoice=By invoices customers
-ByMonth=By Month
-NewAccount=New accounting account
-Update=Update
-List=List
-Create=Create
-UpdateAccount=Modification of an accounting account
-UpdateMvts=Modification of a movement
-WriteBookKeeping=Record accounts in general ledger
-Bookkeeping=General ledger
-AccountBalanceByMonth=Account balance by month
-
-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
-Line=Line
-
-CAHTF=Total purchase supplier HT
-InvoiceLines=Lines of invoice to be ventilated
-InvoiceLinesDone=Ventilated lines of invoice
-IntoAccount=In the accounting account
-
-Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
-
-Processing=Processing
-EndProcessing=The end of processing
-AnyLineVentilate=Any lines to ventilate
-SelectedLines=Selected lines
-Lineofinvoice=Line of invoice
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
-
-ACCOUNTING_SEPARATORCSV=Separator CSV
-
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
-
-AccountLength=Length of the accounting accounts shown in Dolibarr
-AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
-
-ACCOUNTING_SELL_JOURNAL=Sell journal
-ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
-ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
-ACCOUNTING_SOCIAL_JOURNAL=Social journal
-
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
-ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait
-
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
-
-Doctype=Type of document
-Docdate=Date
-Docref=Reference
-Numerocompte=Account
-Code_tiers=Thirdparty
-Labelcompte=Label account
-Debit=Debit
-Credit=Credit
-Amount=Amount
-Sens=Sens
-Codejournal=Journal
-
-DelBookKeeping=Delete the records of the general ledger
-
-SellsJournal=Sells journal
-PurchasesJournal=Purchases journal
-DescSellsJournal=Sells journal
-DescPurchasesJournal=Purchases journal
-BankJournal=Bank journal
-DescBankJournal=Bank journal including all the types of payments other than cash
-CashJournal=Cash journal
-DescCashJournal=Cash journal including the type of payment cash
-
-CashPayment=Cash Payment
-
-SupplierInvoicePayment=Payment of invoice supplier
-CustomerInvoicePayment=Payment of invoice customer
-
-ThirdPartyAccount=Thirdparty account
-
-NewAccountingMvt=New movement
-NumMvts=Number of movement
-ListeMvts=List of the movement
-ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-
-ReportThirdParty=List thirdparty account
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
-
-ListAccounts=List of the accounting accounts
-
-Pcgversion=Version of the plan
-Pcgtype=Class of account
-Pcgsubtype=Under class of account
-Accountparent=Root of the account
-Active=Statement
-
-NewFiscalYear=New fiscal year
-
-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
-TotalVente=Total turnover HT
-TotalMarge=Total sales margin
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+Accounting=contabilidade
+Globalparameters=Parâmetros Globais
+Chartofaccounts=Plano de contas
+Fiscalyear=Anos fiscais
+Menuaccount=contas contabilisticas
+Menuthirdpartyaccount=Contas de terceiros
+MenuTools=Ferramentas
+
+ConfigAccountingExpert=A configuração do módulo especialista em contabilidade
+Journaux=Diarios
+JournalFinancial=Diarios financeiros
+Exports=exportados
+Modelcsv=Modelo de exportação
+Selectmodelcsv=selecionar modelo de exportação
+Modelcsv_normal=exportação classica
+Modelcsv_CEGID=Exportação em direção Especialista CEGID
+BackToChartofaccounts=Voltar ao plano de contas
+Back=Voltar
+
+Definechartofaccounts=Defenir plano de contas
+Selectchartofaccounts=Selecione plano de contas
+Validate=Valide
+Addanaccount=Adicione uma conta contabilistica
+AccountAccounting=Conta contabilistica
+Ventilation=Separação
+ToDispatch=A despachar
+Dispatched=Despachado
+
+CustomersVentilation=Separação de Cliente
+SuppliersVentilation=Separação de Fornecedor
+TradeMargin=Margem de distribuição
+Reports=Relatórios
+ByCustomerInvoice=Por fatura de cliente
+ByMonth=Por mês
+NewAccount=Nova Conta Contabilistica
+Update=Atualizar
+List=Lista
+Create=Criar
+UpdateAccount=Modificação de conta contabilistica
+UpdateMvts=modificação de movimento
+WriteBookKeeping= Gravar conta em contabilidade geral
+Bookkeeping=Contabilidade geral
+AccountBalanceByMonth=Balanço de contas mensal
+
+AccountingVentilation=contabilidade desagregada
+AccountingVentilationSupplier=Contabilidade desagregada de Fornecedor
+AccountingVentilationCustomer=Contabilidade desagregada de Cliente
+Line=Linha
+
+CAHTF=Total de compras fornecedor HT
+InvoiceLines=Linhas de fatura a ser limpa
+InvoiceLinesDone=Linhas limpas de fatura
+IntoAccount=Na conta de contabilidade
+
+Ventilate=Limpar
+VentilationAuto=Desagregação automática
+
+Processing=Processando
+EndProcessing=Fim de processamento
+AnyLineVentilate=Alguma linha para limpar
+SelectedLines=Selecione a linha
+Lineofinvoice=Linha de fatura
+VentilatedinAccount=Limpo com succeso na conta de contabilidade
+NotVentilatedinAccount=Por limpar na conta de contabilidade
+
+ACCOUNTING_SEPARATORCSV=Separador CSV
+
+ACCOUNTING_LIMIT_LIST_VENTILATION=Número de elementos a ser mostrado por página (máxima recomendada: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Comece a classificação das páginas repartição "Tem que repartir" pelos elementos mais recentes
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Comece a triagem das páginas repartidas "repartir " pelos elementos mais recentes
+
+AccountLength=Comprimento das contas de contabilidade mostradas em Dolibarr
+AccountLengthDesc=Função que permite simular um comprimento de conta contábil, substituindo espaços pela figura zero. Esta função só toca a tela, ele não modifica as contas contábeis registradas no Dolibarr. Para a exportação, esta função é necessária para ser compatível com determinado software.
+ACCOUNTING_LENGTH_GACCOUNT=Comprimento de conta geral
+ACCOUNTING_LENGTH_AACCOUNT=Comprimento de conta de terceiros
+
+ACCOUNTING_SELL_JOURNAL=Diário de vendas
+ACCOUNTING_PURCHASE_JOURNAL=Diário de compras
+ACCOUNTING_BANK_JOURNAL=diário de bancos
+ACCOUNTING_CASH_JOURNAL=diário de caixa
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Diário de diversos
+ACCOUNTING_SOCIAL_JOURNAL=Diário social
+
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Conta de transferencia
+ACCOUNTING_ACCOUNT_SUSPENSE=conta de espera
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT= Conta de contabilidade padrão para produtos comprados (se não for definido na folha de produto)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Conta de contabilidade padrão para produtos vendidos (se não for definido na folha de produto)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Conta de contabilidade padrão para compra de serviços (se não for definido na folha de serviços)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Conta de contabilidade padrão para serviços vendidos (se não for definido na folha de serviços)
+
+Doctype=Tipo de documento
+Docdate=Data
+Docref=Referencia
+Numerocompte=Conta
+Code_tiers=Terceiros
+Labelcompte=Etiqueta de conta
+Debit=Débito
+Credit=Crédito
+Amount=Valor
+Sens=Sentido
+Codejournal=Diário
+
+DelBookKeeping=Apagar os registos em Contabilidade geral
+
+SellsJournal=Diário de vendas
+PurchasesJournal=Diário de compras
+DescSellsJournal=Diário de vendas
+DescPurchasesJournal=Diário de compras
+BankJournal=Diário de bancos
+DescBankJournal=Diário de bancos incluindo todos os tipos de pagamentos excepto em moeda
+CashJournal=Diário de caixa
+DescCashJournal=Diário de caixa incluído pagamentos em moeda
+
+CashPayment=Pagamento em moeda
+
+SupplierInvoicePayment=Pagamento de fatura de fornecedor
+CustomerInvoicePayment=Pagamento de fatura de cliente
+
+ThirdPartyAccount=Conta de terceiros
+
+NewAccountingMvt=Novo movimento
+NumMvts=Numero de movimentos
+ListeMvts=Lista de movimentos
+ErrorDebitCredit=Débito e crédito não pode ter um valor, ao mesmo tempo
+
+ReportThirdParty=Lista de contas de terceiros
+DescThirdPartyReport=Consulte aqui a lista terceiros, clientes e de fornecedores e as suas contas contábeis
+
+ListAccounts=Lista de contas contabeis
+
+Pcgversion=Versão do plano
+Pcgtype=Classe de conta
+Pcgsubtype=sub-classe de conta
+Accountparent=raiz da conta
+Active=Declaração
+
+NewFiscalYear=Novo ano fiscal
+
+DescVentilCustomer=Consulte aqui a repartição anual das contas de faturas a clientes
+TotalVente=Volume de negócios de HT
+TotalMarge=Margem total de vendas
+DescVentilDoneCustomer=Consulte aqui a lista das linhas de facturas a clientes e as suas conta de contabilidade
+DescVentilTodoCustomer=Alinhar suas linhas de fatura do cliente com uma conta de contabilidade
+ChangeAccount=Alterar a conta contábil para linhas selecionadas por conta:
Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
-DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Consulte aqui a desagregação anual das suas faturas de fornecedores
+DescVentilTodoSupplier=Verifique as suas linhas da fatura de fornecedor com a conta de contabilidade
+DescVentilDoneSupplier=Consulte as suas linhas da fatura de fornecedor com a conta de contabilidade
-ValidateHistory=Validate Automatically
+ValidateHistory=Validação automatica
-ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+ErrorAccountancyCodeIsAlreadyUse=Erro, Não pode apagar uma conta em uso
-FicheVentilation=Ventilation card
+FicheVentilation=Carta de desagregação
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index bb9d495ca4cbf20b1208c48611201e87c9a446d7..11a91816da82ff6779e78a378c92fdbb60c0f580 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -437,8 +437,8 @@ Module52Name=Stocks de produtos
Module52Desc=Gestão de stocks de produtos
Module53Name=Serviços
Module53Desc=Gestão de serviços
-Module54Name=Contratos
-Module54Desc=Gestão de contratos
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=Códigos de barras
Module55Desc=Gestão dos códigos de barras
Module56Name=Central Telefónica
@@ -475,8 +475,8 @@ Module320Name=Ligações RSS
Module320Desc=Criação de ligações de informação RSS nas janelas do ERP
Module330Name=Favoritos
Module330Desc=Gestão de Favoritos
-Module400Name=Projectos
-Module400Desc=Gestão dos projectos nos outros módulos
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=Webcalendar
Module410Desc=Interface com calendario Webcalendar
Module500Name=Special expenses (tax, social contributions, dividends)
@@ -484,7 +484,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di
Module510Name=Salários
Module510Desc=Management of employees salaries and payments
Module600Name=Notificações
-Module600Desc=Envío de Notificações (por correio electrónico) sobre os eventos de trabalho ERP/CRM
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Bolsas
Module700Desc=Gestão de Bolsas
Module1200Name=Mantis
@@ -514,16 +514,16 @@ Module5000Name=Multi-empresa
Module5000Desc=Permite-lhe gerir várias empresas
Module6000Name=Fluxo de Trabalho
Module6000Desc=Gestão do fluxo de trabalho
-Module20000Name=Férias
-Module20000Desc=Declare and follow employees holidays
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
Module39000Name=Product batch
Module39000Desc=Batch number, eat-by and sell-by date management on products
Module50000Name=Paybox
Module50000Desc=Módulo para oferecer uma página de pagamento online por cartão de crédito com paybox
Module50100Name=Caixa
Module50100Desc=Caixa registadora
-Module50200Name= Paypal
-Module50200Desc= Módulo para oferecer uma página de pagamento online por cartão de crédito com Paypal
+Module50200Name=Paypal
+Module50200Desc=Módulo para oferecer uma página de pagamento online por cartão de crédito com Paypal
Module50400Name=Accounting (advanced)
Module50400Desc=Accounting management (double parties)
Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=Consultar Débitos Directos
Permission152=Configurar Débitos Directos
Permission153=Consultar Débitos Directos
Permission154=Crédito / recusar recibos de ordens permanentes
-Permission161=Consultar contratos de serviço
-Permission162=Criar/Modificar contratos de serviço
-Permission163=Activar os serviços de um contrato
-Permission164=Desactivar os serviços de um contrato
-Permission165=Eliminar contratos
-Permission171=Ler deslocação
-Permission172=Criar/Modificar deslocação
-Permission173=Eliminar deslocação
-Permission178=Exportar deslocação
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Read trips and expenses (own and his subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
Permission180=Consultar Fornecedores
Permission181=Consultar pedidos a Fornecedores
Permission182=Criar/Modificar pedidos a Fornecedores
@@ -671,7 +672,7 @@ Permission300=Consultar códigos de barra
Permission301=Criar/Modificar códigos de barra
Permission302=Eliminar código de barras
Permission311=Consultar Serviços
-Permission312=Assignar Serviço ao Contrato
+Permission312=Assign service/subscription to contract
Permission331=Consultar Favoritos
Permission332=Criar/Modificar Favoritos
Permission333=Eliminar Favoritos
@@ -701,8 +702,8 @@ Permission701=Consultar Bolsas
Permission702=Criar/Modificar Bolsas
Permission703=Eliminar Bolsas
Permission1001=Consultar stocks
-Permission1002=Criar/Modificar stocks
-Permission1003=Eliminar stocks
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=Consultar movimientos de stock
Permission1005=Criar/Modificar movimentos de stock
Permission1101=Consultar ordens de envío
@@ -1038,7 +1039,6 @@ YesInSummer=Sim no verão
OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
SuhosinSessionEncrypt=Session storage encrypted by Suhosin
ConditionIsCurrently=Condition is currently %s
-TestNotPossibleWithCurrentBrowsers=A detecção automática não é possível
YouUseBestDriver=You use driver %s that is best driver available currently.
YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=Devolve um código contabilistico composto de 401 segu
ModuleCompanyCodePanicum=Devolve um código contabilistico vazio.
ModuleCompanyCodeDigitaria=Devolve um código contabilistico composto por o código do Terceiro. O código está formado por caracter ' C ' na primeira posição seguido dos 5 primeiros caracteres do código do Terceiro.
UseNotifications=Usar Notificações
-NotificationsDesc=A função das Notificações permite enviar automáticamente um correio electrónico para um determinado evento ERP/CRM em empresas configuradas
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
ModelModules=Documentos modelos
DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
WatermarkOnDraft=Marca d'
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=Possibilidade de seleccionar uma direcção de envío
UseOptionLineIfNoQuantity=Uma linha de producto/serviço que tem uma quantidade nula, considera-se como uma Opção
FreeLegalTextOnProposal=Texto livre em Orçamentos
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=Configuração do módulo pedidos
OrdersNumberingModules=Módulos de numeração dos pedidos
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list
ValidOrderAfterPropalClosed=Confirmar o pedido depois de fechar o orçamento, permite não passar por um pedido provisório
FreeLegalTextOnOrders=Texto livre em pedidos
WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
##### Clicktodial #####
ClickToDialSetup=Configuração do módulo Click To Dial
ClickToDialUrlDesc=Efectue uma chamada, fazendo click no icon (URL) do telefone . <br>a 'url completa da chamada será: URL?login
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=Módulos de numeração das fichas de intervenção
TemplatePDFInterventions=Modelo de documentos das fichas de intervenção
WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
##### Contracts #####
-ContractsSetup=Contratos de instalação do módulo
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=Contratos de numeração módulos
TemplatePDFContracts=Contracts documents models
FreeLegalTextOnContracts=Free text on contracts
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Ficheiros do tipo %s não são comprimidos pelo servido
CacheByServer=Cache by server
CacheByClient=Cache by browser
CompressionOfResources=Compressão das respostas HTTP
-TestNotPossibleWithCurrentBrowsers=A detecção automática não é possível
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=Configuração do módulo produtos
ServiceSetup=Serviços de instalação do módulo
@@ -1382,9 +1384,10 @@ MailingSetup=configuração do módulo E-Mailing
MailingEMailFrom=E-Mail emissor (From) dos correios enviados por E-Mailing
MailingEMailError=Retorno EMail (Erros a) para e-mails com erros
##### Notification #####
-NotificationSetup=Configuração do módulo Notificações
+NotificationSetup=EMail notification module setup
NotificationEMailFrom=E-Mail emissor (From) dos correios enviados a traves de Notificações
-ListOfAvailableNotifications=Lista de notificações disponíveis (Esta lista depende módulos ativados)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
##### Sendings #####
SendingsSetup=Configuração do módulos envíos
SendingsReceiptModel=Modelo da ficha de expedição
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=A ligação ao servidor '%s' sobre a base '%s' pelo Utilizador
OSCommerceTestKo1=A ligação ao servidor '%s' sobre a base '%s' por o Utilizador '%s' não se pode efectuar.
OSCommerceTestKo2=A ligação ao servidor '%s' pelo Utilizador '%s' falhou.
##### Stock #####
-StockSetup=Configuração do módulo Stocks
-UserWarehouse=Utilizar os stocks pessoais de Utilizadores
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=Menu Eliminado
TreeMenu=Estructura dos menus
@@ -1478,11 +1482,14 @@ ClickToDialDesc=Este módulo permite juntar um icon depois do número de telefon
##### Point Of Sales (CashDesk) #####
CashDesk=Pontos de vendas
CashDeskSetup=Configuração do módulo de Caixa Registadora
-CashDeskThirdPartyForSell=Terceiro genérico a usar para as vendas
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Conta de efectivo que se utilizará para as vendas
CashDeskBankAccountForCheque= Conta a ser usada para receber pagamentos através de cheques
CashDeskBankAccountForCB= Conta a ser usada para receber pagamentos em dinheiro ou por cartões de crédito
-CashDeskIdWareHouse=Armazém que é utilizado para as vendas
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Configuração do Modulo de Favoritos
BookmarkDesc=Este módulo permite gerir as ligações e acessos directos. Também permite adicionar qualquer página do ERP/CRM ou o link web ao menu de acesso rápido na esquerda.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Delete fiscal year
ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
Opened=Opened
Closed=Closed
-
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
diff --git a/htdocs/langs/pt_PT/agenda.lang b/htdocs/langs/pt_PT/agenda.lang
index 1363003e274ade2eed01c616e73bc8605e872031..2b8af93edaed0dcd62aa5fa79c944e0e6a70498d 100644
--- a/htdocs/langs/pt_PT/agenda.lang
+++ b/htdocs/langs/pt_PT/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= Preenchimento automático
AgendaAutoActionDesc= Defina aqui os eventos para os quais deseja que o Dolibarr crie automaticamente um evento na agenda. Se não for seleccionada nenhuma opção (por omissão), apenas as acções manuais serão incluídas na agenda
AgendaSetupOtherDesc= Esta página fornece opções para permitir a exportação dos seus eventos no Dolibarr para um calendário externo (Thunderbird, calendário Google, ...)
AgendaExtSitesDesc=Esta página permite declarar as fontes externas de calendários para ver os seus eventos na agenda do Dolibarr.
-ActionsEvents= Eventos em que o Dolibarr criará uma acção em agenda automáticamente
-PropalValidatedInDolibarr= Proposta Validada
-InvoiceValidatedInDolibarr= Factura Validada
+ActionsEvents=Eventos em que o Dolibarr criará uma acção em agenda automáticamente
+PropalValidatedInDolibarr=Proposta Validada
+InvoiceValidatedInDolibarr=Factura Validada
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=Factura %s voltou ao estado de rascunho
InvoiceDeleteDolibarr=Fatura %s apagada
OrderValidatedInDolibarr= Encomenda %s validada
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Encomenda %s aprovada
OrderRefusedInDolibarr=Encomenda %s recusada
OrderBackToDraftInDolibarr=Encomenda %s voltou ao estado de rascunho
OrderCanceledInDolibarr=Encomenda %s cancelada
-InterventionValidatedInDolibarr=Intervenção %s validada
ProposalSentByEMail=Proposta a cliente %s enviada por e-mail
OrderSentByEMail=Encomenda de cliente %s enviada por email
InvoiceSentByEMail=Factura de cliente %s enviada por e-mail
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=Encomenda a fornecedor %s enviada por email
SupplierInvoiceSentByEMail=Factura de fornecedor %s enviada por e-mail
ShippingSentByEMail=Expedição %s enviada por email
ShippingValidated= Transporte %s validado
-InterventionSentByEMail=Intervanção %s enviada por e-mail
-InterventionClassifiedBilled=Intervenção %s classificada como faturada
NewCompanyToDolibarr= Nova Empresa Adicionada
DateActionPlannedStart= Planeada data de início
DateActionPlannedEnd= Planeada data de fim
@@ -70,9 +68,9 @@ DateActionStart= Data de Início
DateActionEnd= Data Fim
AgendaUrlOptions1=Também pode adicionar os seguintes parâmetros de filtro de saída:
AgendaUrlOptions2=<b>login=%s</b>para restringir a produção para acções criadas por, ou afectadas a fazer pelo utilizador <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> para restringir a produção para acções criadas pelo utilizador <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
AgendaUrlOptions4=<b>logint=%s</b> para restringir a produção para as acções para o utilizador afectado <b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> para restringir a produção para acções feitas pelo utilizador <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
AgendaShowBirthdayEvents=Mostrar Aniversários dos Contactos
AgendaHideBirthdayEvents=Esconder Aniversários dos Contactos
Busy=Ocupado
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=URL para aceder. Ficheiro iCal
ExtSiteNoLabel=Sem Descrição
WorkingTimeRange=Working time range
WorkingDaysRange=Working days range
-AddEvent=Add event
+AddEvent=Create event
MyAvailability=My availability
diff --git a/htdocs/langs/pt_PT/bills.lang b/htdocs/langs/pt_PT/bills.lang
index 0db5b15ea95c0b06937cb963e383cb09dbae803e..57682ef6df2eac2b9c969aea2684f057430ea23e 100644
--- a/htdocs/langs/pt_PT/bills.lang
+++ b/htdocs/langs/pt_PT/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Nota de Crédito
InvoiceAvoirAsk=Nota de Crédito para Corrigir a Factura
InvoiceAvoirDesc=A <b>Nota de Crédito</b> é uma factura negativa destinada a compensar um montante de uma factura que difere do montante realmente pago (por haver pago de mais ou por devolução de produtos, por Exemplo).<br><br>Nota: Tenha em conta que a factura original a corrigir deve ter sido fechada (' paga' ou ' paga parcialmente ') para poder realizar uma nota de crédito.'
invoiceAvoirWithLines=Criar Nota de Crédito com as linhas da fatura de origem
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
-invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
ReplaceInvoice=Rectificar a Factura %s
ReplacementInvoice=Substituição da Factura
ReplacedByInvoice=Substituído por Factura %s
@@ -87,7 +87,7 @@ ClassifyCanceled=Classificar 'Abandonado'
ClassifyClosed=Classificar 'Fechado'
ClassifyUnBilled=Classify 'Unbilled'
CreateBill=Criar Factura
-AddBill=Criar Factura ou Deposito
+AddBill=Create invoice or credit note
AddToDraftInvoices=Adicionar à fatura rascunho
DeleteBill=Eliminar Factura
SearchACustomerInvoice=Procurar uma factura de cliente
@@ -99,7 +99,7 @@ DoPaymentBack=Emitir reembolso
ConvertToReduc=Converter em redução futura
EnterPaymentReceivedFromCustomer=Adicionar pagamento recebido de cliente
EnterPaymentDueToCustomer=Realizar pagamento de recibos à cliente
-DisabledBecauseRemainderToPayIsZero=Desactivar já que o resto a pagar é 0
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
Amount=Montante
PriceBase=preço base
BillStatus=Estado da factura
@@ -137,8 +137,6 @@ BillFrom=Emissor
BillTo=Enviar a
ActionsOnBill=Acções sobre a factura
NewBill=Nova factura
-Prélèvements=Pedidos Permanentes
-Prélèvements=Pedidos Permanentes
LastBills=as %s últimas facturas
LastCustomersBills=as %s últimas facturas a clientes
LastSuppliersBills=as %s últimas facturas de Fornecedores
@@ -156,9 +154,9 @@ ConfirmCancelBill=Está seguro de querer anular a factura <b>%s</b> ?
ConfirmCancelBillQuestion=Porque Razão quer abandonar a factura?
ConfirmClassifyPaidPartially=Está seguro de querer classificar a factura <b>%s</b> como paga?
ConfirmClassifyPaidPartiallyQuestion=Esta factura não foi totalmente paga.Porque quer classifica-la como paga?
-ConfirmClassifyPaidPartiallyReasonAvoir=O resto a pagar <b>(%s %s)</b> foi regularizado (já que artigo foi devolvido, esquecido de entregar, Desconto não definido...) mediante um deposito
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=O resto a pagar <b>(%s %s)</b> é um Desconto acordado depois da factura. Aceito perder o IVA deste Desconto
-ConfirmClassifyPaidPartiallyReasonDiscountVat=O resto a pagar<b>(%s %s)</b> é um Desconto
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
ConfirmClassifyPaidPartiallyReasonBadCustomer=Cliente devedor
ConfirmClassifyPaidPartiallyReasonProductReturned=Produtos devolvidos em parte
ConfirmClassifyPaidPartiallyReasonOther=Por outra Razão
@@ -191,9 +189,9 @@ AlreadyPaid=Já e
AlreadyPaidBack=Já reembolsado
AlreadyPaidNoCreditNotesNoDeposits=Já pagas (sem notas de crédito e depósitos)
Abandoned=Abandonada
-RemainderToPay=Falta por Pagar
-RemainderToTake=Falta de pagamento
-RemainderToPayBack=Remainder to pay back
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
Rest=Pendente
AmountExpected=Montante reclamado
ExcessReceived=Recebido em excesso
@@ -219,19 +217,18 @@ NoInvoice=Nenhuma Factura
ClassifyBill=Classificar a factura
SupplierBillsToPay=Facturas de Fornecedores a pagar
CustomerBillsUnpaid=Facturas a Clientes Pendentes de Cobrança
-DispenseMontantLettres=Valor Cartas de isenção
-DispenseMontantLettres=Valor Cartas de isenção
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=Não recuperável
SetConditions=Definir Condições de pagamento
SetMode=Definir modo de pagamento
Billed=Facturado
-RepeatableInvoice=Factura em Massa
-RepeatableInvoices=Facturas em Massa
-Repeatable=Em Massa
-Repeatables=Em Massa
-ChangeIntoRepeatableInvoice=Modificar em Massa
-CreateRepeatableInvoice=Criar Factura Predefinida
-CreateFromRepeatableInvoice=Criar a partir de uma factura pré-definida
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
CustomersInvoicesAndInvoiceLines=Facturas a clientes e linhas de facturas
CustomersInvoicesAndPayments=Facturas a clientes e pagamentos
ExportDataset_invoice_1=Facturas a clientes e linhas de factura
diff --git a/htdocs/langs/pt_PT/categories.lang b/htdocs/langs/pt_PT/categories.lang
index 06ef47aa0c30357fb7481dbd08ab35ef57f81099..e0bf9a1007d832de04325d3504189d1196dbf494 100644
--- a/htdocs/langs/pt_PT/categories.lang
+++ b/htdocs/langs/pt_PT/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories
CatCusLinks=Links between customers/prospects and categories
CatProdLinks=Links between products/services and categories
CatMemberLinks=Links between members and categories
-CatProdLinks=Links between products/services and categories
-CatCusLinks=Links between customers/prospects and categories
-CatSupLinks=Links between suppliers and categories
DeleteFromCat=Remover da categoria
DeletePicture=Apagar Imagem
ConfirmDeletePicture=Confirmar eliminação da imagem?
@@ -112,3 +109,4 @@ CategoriesSetup=Configurar Categorias
CategorieRecursiv=Link with parent category automatically
CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category
diff --git a/htdocs/langs/pt_PT/compta.lang b/htdocs/langs/pt_PT/compta.lang
index d4d73129bf1f8136b92a4aff68c14a69d711828f..c3e51b1883c84d46e6c03d16e53044e2b25edc26 100644
--- a/htdocs/langs/pt_PT/compta.lang
+++ b/htdocs/langs/pt_PT/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Código contabilidade incorrecto para %s
SuppliersProductsSellSalesTurnover=Volume de negócio gerado por venda de produtos aos Fornecedores
CheckReceipt=Ficha de cheques
CheckReceiptShort=Ficha
+LastCheckReceiptShort=Last %s check receipts
NewCheckReceipt=Novo Cheque
NewCheckDeposit=Novo Deposito
NewCheckDepositOn=Criar Novo deposito na conta: %s
diff --git a/htdocs/langs/pt_PT/contracts.lang b/htdocs/langs/pt_PT/contracts.lang
index 7ce40bddee1d18384788f96c9ed4bff4dba7a4d5..24c9d555928900cf2049319e73cf127d167314c3 100644
--- a/htdocs/langs/pt_PT/contracts.lang
+++ b/htdocs/langs/pt_PT/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Área contractos
ListOfContracts=Lista de contractos
-LastContracts=Os Ultimos %s Contractos Modificados
+LastModifiedContracts=Last %s modified contracts
AllContracts=Todos os contractos
ContractCard=Ficha contrato
ContractStatus=Estado do contrato
@@ -27,7 +27,7 @@ MenuRunningServices=Serviços Activos
MenuExpiredServices=Serviços Expirados
MenuClosedServices=Serviços Fechados
NewContract=Novo Contrato
-AddContract=Criar Contrato
+AddContract=Create contract
SearchAContract=Procurar um Contrato
DeleteAContract=Eliminar um Contrato
CloseAContract=Fechar um Contrato
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Lista de linhas de contractos em serviço
ListOfRunningServices=Lista de serviços activos
NotActivatedServices=Serviços não activados (com os contractos validados)
BoardNotActivatedServices=Serviços a activar com os contractos validados
-LastContracts=Os Ultimos %s Contractos Modificados
+LastContracts=Last % contracts
LastActivatedServices=Os %s últimos serviços activados
LastModifiedServices=Os %s últimos sevicios modificados
EditServiceLine=Edição linha do serviço
diff --git a/htdocs/langs/pt_PT/cron.lang b/htdocs/langs/pt_PT/cron.lang
index e9964d1bba8b68e8cf07b7ebb5a82693d2af9d10..7894645a50241ad671b2647f584197a754aa4406 100644
--- a/htdocs/langs/pt_PT/cron.lang
+++ b/htdocs/langs/pt_PT/cron.lang
@@ -18,9 +18,8 @@ CronExplainHowToRunUnix=On Unix environment you should use crontab to run Comman
CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
# Menu
CronJobs=Tarefas agendadas
-CronListActive= Lista de trabalhos ativos
-CronListInactive= Lista de trabalhos inativos
-CronListActive= Lista de trabalhos ativos
+CronListActive=List of active/scheduled jobs
+CronListInactive=Lista de trabalhos inativos
# Page list
CronDateLastRun=Última execução
CronLastOutput=Resultado da última execução
diff --git a/htdocs/langs/pt_PT/donations.lang b/htdocs/langs/pt_PT/donations.lang
index a6788f3fa03c84d5dbca721ef450db11b55d6dfb..7a31ae9162817cfea361f05ad81ae24a61d0f599 100644
--- a/htdocs/langs/pt_PT/donations.lang
+++ b/htdocs/langs/pt_PT/donations.lang
@@ -4,7 +4,7 @@ Donations=Donativos
DonationRef=Ref. do donativo
Donor=Doador
Donors=Doadores
-AddDonation=Adicionar uma Doação
+AddDonation=Create a donation
NewDonation=Nova Doação
ShowDonation=Mostrar Donativo
DonationPromise=Promessa de Doação
@@ -31,3 +31,8 @@ DonationRecipient=Destinatário do donativo
ThankYou=Obrigado
IConfirmDonationReception=O destinatário acusou a recepção, como um donativo, do seguinte montante
MinimumAmount=Minimum amount is %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/pt_PT/externalsite.lang b/htdocs/langs/pt_PT/externalsite.lang
index b14afaf0494a3eb1e166314dd9fe1b6bd691ceb4..6795e54c6a0f07879465e8a75637733c7e542a46 100644
--- a/htdocs/langs/pt_PT/externalsite.lang
+++ b/htdocs/langs/pt_PT/externalsite.lang
@@ -2,3 +2,4 @@
ExternalSiteSetup=Configurar ligação com site externo
ExternalSiteURL=URL do site externo
ExternalSiteModuleNotComplete=O módulo Site Externo não está configurado correctamente.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/pt_PT/holiday.lang b/htdocs/langs/pt_PT/holiday.lang
index 581f48d225c3f8b3f79307e1bc4f76a5e9a441b6..2f8cd8f23f13dc5699f208c511d211b03cb2e9d6 100644
--- a/htdocs/langs/pt_PT/holiday.lang
+++ b/htdocs/langs/pt_PT/holiday.lang
@@ -1,13 +1,13 @@
# Dolibarr language file - Source file is en_US - holiday
HRM=RH
-Holidays=Leaves
-CPTitreMenu=Leaves
+Holidays=Folgas
+CPTitreMenu=Folgas
MenuReportMonth=Monthly statement
-MenuAddCP=Make a leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
-NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
-NoCPforUser=You don't have any available day.
-AddCP=Make a leave request
+MenuAddCP=Faça uma requesição de folgas
+NotActiveModCP=Deve ativar o modulo de folgas para ver esta página
+NotConfigModCP=Você deve configurar o módulo de folgas para ver esta página. Para fazer isso, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+NoCPforUser=Não tem nenhum dia disponivel
+AddCP=Faça uma requisição de folga
Employe=Empregado
DateDebCP=Data de início
DateFinCP=Data de fim
@@ -18,24 +18,24 @@ ApprovedCP=Aprovado
CancelCP=Cancelado
RefuseCP=Recusado
ValidatorCP=Approbator
-ListeCP=List of leaves
+ListeCP=Lista de folgas
ReviewedByCP=Será analisado por
DescCP=Descrição
-SendRequestCP=Create leave request
-DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Edit balance of leaves
-UpdateAllCP=Update the leaves
-SoldeCPUser=Leaves balance is <b>%s</b> days.
+SendRequestCP=Criar requisição de folga
+DelayToRequestCP=Requisição de folga de ser feita pelo menos <b>%s dia(s)</b> antes de.
+MenuConfCP=Editar balanço de folgas
+UpdateAllCP=Atualisar folgas
+SoldeCPUser=Balanço de folgas é <b>%s</b> dias
ErrorEndDateCP=You must select an end date greater than the start date.
ErrorSQLCreateCP=Ocorreu um erro de SQL durante a criação:
-ErrorIDFicheCP=An error has occurred, the leave request does not exist.
+ErrorIDFicheCP=Um erro ocorreu, a requisição de folga não existe
ReturnCP=Voltar à página anterior
-ErrorUserViewCP=You are not authorized to read this leave request.
-InfosCP=Information of the leave request
+ErrorUserViewCP=Não está autorizado a ler esta requisição de folga
+InfosCP=Informação da requisição de folga
InfosWorkflowCP=Information Workflow
RequestByCP=Pedido por
-TitreRequestCP=Leave request
-NbUseDaysCP=Number of days of vacation consumed
+TitreRequestCP=Folga requirida
+NbUseDaysCP=Numero de dias de férias consumido
EditCP=Editar
DeleteCP=Apagar
ActionValidCP=Validar
@@ -43,26 +43,25 @@ ActionRefuseCP=Recusar
ActionCancelCP=Cancelar
StatutCP=Estado
SendToValidationCP=Enviar para validação
-TitleDeleteCP=Delete the leave request
-ConfirmDeleteCP=Confirm the deletion of this leave request?
-ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
-CantCreateCP=You don't have the right to make leave requests.
-InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=Actualizar
-CantUpdate=You cannot update this leave request.
+TitleDeleteCP=apagar a requisição de folga
+ConfirmDeleteCP=confirme que quer apagar requisição
+ErrorCantDeleteCP=Erro não tem direitos para apagar reuisição
+CantCreateCP=Não tem direitos para criar requisição de folgas
+InvalidValidatorCP=Deve escolher um aprovador para as suas requisições
+CantUpdate=Não pode atualisar a requisição
NoDateDebut=Seleccione a data de início.
NoDateFin=Seleccione a data de fim.
-ErrorDureeCP=O seu pedido de férias não contém dias de trabalho.
-TitleValidCP=Aprovar pedido de férias
-ConfirmValidCP=Are you sure you want to approve the leave request?
+ErrorDureeCP=A sua requisição não contempla dias obráveis
+TitleValidCP=Aprove a requisição
+ConfirmValidCP=tem a certeza que quer aprovar?
DateValidCP=Data aprovada
-TitleToValidCP=Send leave request
-ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Recusar pedido de férias
-ConfirmRefuseCP=Are you sure you want to refuse the leave request?
+TitleToValidCP=Envie requisição
+ConfirmToValidCP=tem a certeza que quer enviar requisição?
+TitleRefuseCP=Recuse a requisição
+ConfirmRefuseCP=Tem a certeza que quer recusar a requisição?
NoMotifRefuseCP=Deve indicar um motivo para recusar o pedido.
-TitleCancelCP=Cancelar o pedido de férias
-ConfirmCancelCP=Are you sure you want to cancel the leave request?
+TitleCancelCP=Cancel a requisição
+ConfirmCancelCP=Tem a certeza que quer cancelar a requisição?
DetailRefusCP=Razão para a rejeiçao
DateRefusCP=Data de rejeição
DateCancelCP=Data de cancelamento
@@ -72,41 +71,41 @@ MotifCP=Motivo
UserCP=Utilizador
ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of leave requests
-LogCP=Log of updates of available vacation days
+MenuLogCP=Veja registo de requisições
+LogCP=Registo de actualizações de dias disponíveis
ActionByCP=Realizado por
UserUpdateCP=Para o utilizador
PrevSoldeCP=Previous Balance
NewSoldeCP=New Balance
-alreadyCPexist=A request for holidays has already been done on this period.
+alreadyCPexist=Uma requisição existe para esse período
UserName=Nome
Employee=Empregado
-FirstDayOfHoliday=First day of vacation
-LastDayOfHoliday=Last day of vacation
+FirstDayOfHoliday=Primeiro dia de férias
+LastDayOfHoliday=Ultimo dia de férias
HolidaysMonthlyUpdate=Actualização Mensal
ManualUpdate=Actualização Manual
HolidaysCancelation=Leave request cancelation
## Configuration du Module ##
-ConfCP=Configuration of holidays module
+ConfCP=Configuração de requisição de folga
DescOptionCP=Description of the option
ValueOptionCP=Value
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Grupo habilitado para aprovar requisições
ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Ultima atualização de alocação de requisições
UpdateConfCPOK=Updated successfully.
ErrorUpdateConfCP=An error occurred during the update, please try again.
-AddCPforUsers=Please add the balance of holidays of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
Module27130Name= Management of leave requests
Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
TitleOptionEventCP=Settings of leave requets for events
ValidEventCP=Validar
UpdateEventCP=Update events
diff --git a/htdocs/langs/pt_PT/interventions.lang b/htdocs/langs/pt_PT/interventions.lang
index 5fece10ddefa3d33118d664e9a5c6bce2d45d978..1d827400a027ebd4576c073634070549e1d8a86f 100644
--- a/htdocs/langs/pt_PT/interventions.lang
+++ b/htdocs/langs/pt_PT/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Intervenção
Interventions=Intervenções
InterventionCard=Ficha de Intervenção
NewIntervention=Nova Intervenção
-AddIntervention=Criar Intervenção
+AddIntervention=Create intervention
ListOfInterventions=Lista de Intervenções
EditIntervention=Editar
ActionsOnFicheInter=Ações de intervenção
@@ -30,6 +30,15 @@ StatusInterInvoiced=Faturados
RelatedInterventions=Intervenções relacionadas
ShowIntervention=Mostrar intervenção
SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Responsável do Seguimiento da Intervenção
TypeContact_fichinter_internal_INTERVENING=Interveniente
diff --git a/htdocs/langs/pt_PT/link.lang b/htdocs/langs/pt_PT/link.lang
index 8b1efb75ef372daf24c660017c22d0cda43189b8..ed0611101e4a091224ab6ce1b8309c9f9166ab8a 100644
--- a/htdocs/langs/pt_PT/link.lang
+++ b/htdocs/langs/pt_PT/link.lang
@@ -1,8 +1,8 @@
-LinkANewFile=Link a new file/document
-LinkedFiles=Linked files and documents
-NoLinkFound=No registered links
-LinkComplete=The file has been linked successfully
-ErrorFileNotLinked=The file could not be linked
-LinkRemoved=The link %s has been removed
-ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
-ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
+LinkANewFile=Link a novao ficheiro/documento
+LinkedFiles=Ficheiros e documento ligados
+NoLinkFound=sem reigisto de ligações
+LinkComplete=Os ficheiros foram ligados com sucesso
+ErrorFileNotLinked=Os ficheiros não puderam ser ligados
+LinkRemoved=A ligação %s foi removida
+ErrorFailedToDeleteLink= falhou a remoção da ligação '<b>%s</b>'
+ErrorFailedToUpdateLink= Falha na atualização de ligação '<b>%s</b>'
diff --git a/htdocs/langs/pt_PT/mails.lang b/htdocs/langs/pt_PT/mails.lang
index a20b5e0222758c0b82b97b674d914a1e33f33226..cdcc999daa0e861fdec9bb9c4f7977471d75f3f8 100644
--- a/htdocs/langs/pt_PT/mails.lang
+++ b/htdocs/langs/pt_PT/mails.lang
@@ -115,7 +115,7 @@ SentBy=Enviado por
MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
MailingNeedCommand2=Pode enviar em linha adicionando o parâmetro MAILING_LIMIT_SENDBYWEB com um valor número que indica o máximo nº de e-mails enviados por Sessão.
ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=Limpar lista
ToClearAllRecipientsClickHere=Para limpar a lista dos destinatarios deste mailing, faça click ao botão
ToAddRecipientsChooseHere=Para Adicionar destinatarios, escoja os que figuran em listas a continuação
@@ -133,6 +133,9 @@ Notifications=Notificações
NoNotificationsWillBeSent=Nenhuma notificação por e-mail está prevista para este evento e empresa
ANotificationsWillBeSent=1 notificação vai a ser enviada por e-mail
SomeNotificationsWillBeSent=%s Notificações vão ser enviadas por e-mail
-AddNewNotification=Activar um novo pedido de notificação
-ListOfActiveNotifications=Lista das pedidos de notificações activas
+AddNewNotification=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
ListOfNotificationsDone=Lista de todas as notificações de e-mail enviado
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index deb3ea0b0993e613adc4044c73358e172910bff9..1b9c268819a42a347fa353dcf02e7eb39b67ef6c 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Impossivel encontrar o utilizador <b>%s</b
ErrorNoVATRateDefinedForSellerCountry=Erro, nenhum tipo de IVA definido para o país '%s'.
ErrorNoSocialContributionForSellerCountry=Erro, nenhum tipo de contribuição social definida para o país "%s".
ErrorFailedToSaveFile=Erro, o registo do ficheiro falhou.
-ErrorOnlyPngJpgSupported=Erro, somente suportam os formatos de imagem jpg e png.
-ErrorImageFormatNotSupported=A sua versão PHP não suporta as funções de conVersão deste formato de imagen.
SetDate=Definir data
SelectDate=Seleccionar uma data
SeeAlso=Ver também %s
BackgroundColorByDefault=Cor de fundo por omissão
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
FileWasNotUploaded=Um ficheiro foi seleccionada para ser anexado, mas ainda não foi carregado. Clique em 'Adicionar este Ficheiro' para anexar.
NbOfEntries=Nº de entradas
GoToWikiHelpPage=Ler ajuda on-line (é necessário acesso à Internet)
@@ -206,7 +206,7 @@ Limit=Limite
Limits=Limites
DevelopmentTeam=Equipa de Desenvolvimento
Logout=Terminar Sessão
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
+NoLogoutProcessWithAuthMode=Função aplicativo não desconetado com modo de autenticação <b>%s</b>
Connection=Ligação
Setup=Configuração
Alert=Alerta
@@ -266,6 +266,7 @@ Afternoon=Tarde
Quadri=Trimestre
MonthOfDay=Dia do mês
HourShort=H
+MinuteShort=mn
Rate=Tipo
UseLocalTax=IVA incluído
Bytes=Bytes
@@ -315,7 +316,7 @@ SubTotal=Subtotal
TotalHTShort=Montante base
TotalTTCShort=Total (IVA inc.)
TotalHT=Total
-TotalHTforthispage=Total (net of tax) for this page
+TotalHTforthispage=Total (liquido de imposto) para esta página
TotalTTC=Total (IVA inc.)
TotalTTCToYourCredit=Total a crédito
TotalVAT=Total do IVA
@@ -340,6 +341,7 @@ FullList=Lista completa
Statistics=Estatísticas
OtherStatistics=Outras estatísticas
Status=Estado
+Favorite=Favorite
ShortInfo=Informação
Ref=Ref.
RefSupplier=Ref. fornecedor
@@ -356,7 +358,7 @@ ActionNotApplicable=Não aplicável
ActionRunningNotStarted=Não Iniciado
ActionRunningShort=Iniciado
ActionDoneShort=Terminado
-ActionUncomplete=Uncomplete
+ActionUncomplete=Incompleta
CompanyFoundation=Empresa ou Instituição
ContactsForCompany=Contactos desta empresa
ContactsAddressesForCompany=Contatos / endereços para este terceiro
@@ -365,6 +367,7 @@ ActionsOnCompany=Acções nesta sociedade
ActionsOnMember=Eventos sobre este membro
NActions=%s acções
NActionsLate=%s em atraso
+RequestAlreadyDone=Request already recorded
Filter=Filtro
RemoveFilter=Eliminar filtro
ChartGenerated=Gráficos gerados
@@ -508,7 +511,7 @@ NbOfCustomers=Numero de Clientes
NbOfLines=Numeros de Linhas
NbOfObjects=Numero de Objectos
NbOfReferers=Numero de Referências
-Referers=Refering objects
+Referers=Referências a objetos
TotalQuantity=Quantidade Total
DateFromTo=De %s a %s
DateFrom=A partir de %s
@@ -552,7 +555,7 @@ MailSentBy=Mail enviado por
TextUsedInTheMessageBody=Texto utilizado no corpo da mensagem
SendAcknowledgementByMail=Envio rec. por e-mail
NoEMail=Sem e-mail
-NoMobilePhone=No mobile phone
+NoMobilePhone=Sem telefone móvel
Owner=Propietario
DetectedVersion=Versão Detectada
FollowingConstantsWillBeSubstituted=As seguintes constantes serão substituidas pelo seu valor correspondente.
@@ -607,8 +610,8 @@ Notes=Notas
AddNewLine=Adicionar nova linha
AddFile=Adicionar ficheiro
ListOfFiles=Lista de ficheiros disponíveis
-FreeZone=Free entry
-FreeLineOfType=Free entry of type
+FreeZone=Entrada livre
+FreeLineOfType=Entrada livre do tipo
CloneMainAttributes=Copiar objeto com os seus atributos principais
PDFMerge=PDF Merge
Merge=Junção
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Configuração de atributos extra
URLPhoto=Url da foto / logotipo
SetLinkToThirdParty=Link para um terceiro
CreateDraft=Criar Rascunho
+SetToDraft=Back to draft
ClickToEdit=Clique para editar
ObjectDeleted=%s objeto removido
ByCountry=Por país
@@ -672,13 +676,13 @@ HelpCopyToClipboard=Use Ctrl+C para copiar
SaveUploadedFileWithMask=Guardar o ficheiro no servidor com o nome "<strong>%s</strong>" (caso contrário "%s")
OriginFileName=Nome do ficheiro original
SetDemandReason=Definir fonte
-SetBankAccount=Define Bank Account
-AccountCurrency=Account Currency
+SetBankAccount=Definir Conta Bancária
+AccountCurrency=Moeda da conta
ViewPrivateNote=Ver notas
XMoreLines=%s linhas(s) ocultas
PublicUrl=URL público
-AddBox=Add box
-
+AddBox=Adicionar Caixa
+SelectElementAndClickRefresh=Select an element and click Refresh
# Week day
Monday=Segunda-feira
Tuesday=Terça-feira
diff --git a/htdocs/langs/pt_PT/margins.lang b/htdocs/langs/pt_PT/margins.lang
index 4e3c6f3911a17865f0007285b75d4b7ec8d166f7..c62ee64a5f323cad598cb286df643884dcf42c91 100644
--- a/htdocs/langs/pt_PT/margins.lang
+++ b/htdocs/langs/pt_PT/margins.lang
@@ -10,24 +10,18 @@ MarkRate=Mark rate
DisplayMarginRates=Display margin rates
DisplayMarkRates=Display mark rates
InputPrice=Input price
-
margin=Profit margins management
margesSetup=Profit margins management setup
-
MarginDetails=Detalhes da margem
-
ProductMargins=Margens do produto
CustomerMargins=Margens do cliente
SalesRepresentativeMargins=Sales representative margins
-
ProductService=Produto ou Serviço
AllProducts=Todos os produtos e serviços
ChooseProduct/Service=Escolher produto ou serviço
-
StartDate=Data de Início
EndDate=Data Fim
Launch=Iniciar
-
ForceBuyingPriceIfNull=Force buying price if null
ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0)
MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
@@ -35,16 +29,16 @@ UseDiscountAsProduct=Como um produto
UseDiscountAsService=Como um serviço
UseDiscountOnTotal=No subtotal
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Define se um desconto global é tratado como um produto, um serviço, ou apenas no subtotal para cálculo de margem
-
MARGIN_TYPE=Tipo de margem
MargeBrute=Raw margin
MargeNette=Net margin
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - Cost price
-
CostPrice=Preço de custo
BuyingCost=Preço de custo
UnitCharges=Custos unitários
Charges=Custos
-
AgentContactType=Tipo de contacto usado para comissionamento
-AgentContactTypeDetails=Defina que tipo de contacto (acoplado na factura) será associado com os agentes comerciais
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/pt_PT/orders.lang b/htdocs/langs/pt_PT/orders.lang
index 0b1779d665d85e2e0b4f20ecde984c19da96a103..bb19acee7dd7e43bd09450a0bf16e4c1103a1960 100644
--- a/htdocs/langs/pt_PT/orders.lang
+++ b/htdocs/langs/pt_PT/orders.lang
@@ -53,7 +53,7 @@ ShippingExist=Um existe um envio
DraftOrWaitingApproved=Rascunho aprovado mas ainda não aprovado
DraftOrWaitingShipped=Rascunho o validado mas ainda não expedido
MenuOrdersToBill=Pedidos por Facturar
-MenuOrdersToBill2=Encomendas para faturar
+MenuOrdersToBill2=Billable orders
SearchOrder=Procurar um Pedido
SearchACustomerOrder=Search a customer order
ShipProduct=Enviar Produto
@@ -65,7 +65,7 @@ ValidateOrder=Confirmar o Pedido
UnvalidateOrder=Pedido inválido
DeleteOrder=Eliminar o pedido
CancelOrder=Anular o Pedido
-AddOrder=Criar Pedido
+AddOrder=Create order
AddToMyOrders=Adicionar os meus Pedidos
AddToOtherOrders=Adicionar a outros pedidos
AddToDraftOrders=Add to draft order
@@ -154,7 +154,6 @@ OrderByPhone=Telefone
CreateInvoiceForThisCustomer=Bill orders
NoOrdersToInvoice=Sem encomendas para faturar
CloseProcessedOrdersAutomatically=Classificar todas as encomendas seleccionadas como "Processadas"
-MenuOrdersToBill2=Encomendas para faturar
OrderCreation=Order creation
Ordered=Encomendado
OrderCreated=As suas encomendas foram criadas
diff --git a/htdocs/langs/pt_PT/oscommerce.lang b/htdocs/langs/pt_PT/oscommerce.lang
deleted file mode 100644
index de6d4d6c866dba32060ce74e5c76a8e39dd7e3ad..0000000000000000000000000000000000000000
--- a/htdocs/langs/pt_PT/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=Configuração do módulo OS Commerce
-OSCommerceSetupSaved=Configuração OS Commerce guardada
-OSCommerceServer=Nome/IP servidor da base de dados OS commerce
-OSCommerceDatabaseName=Nome da base de dados OS Commerce
-OSCommercePrefix=Prefixo Tabelas OS Commerce
-OSCommerceUser=Utilizador da base de dados OS Commerce
diff --git a/htdocs/langs/pt_PT/other.lang b/htdocs/langs/pt_PT/other.lang
index d18c78371baf846028969d6d6b8ac1dded3de89e..6df1475eb1779cf828b78069d6ba43c0c00a862d 100644
--- a/htdocs/langs/pt_PT/other.lang
+++ b/htdocs/langs/pt_PT/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=Código segurança
Calendar=Calendario
-AddTrip=Criar deslocação
Tools=Utilidades
ToolsDesc=Esta área é dedicada a ferramentas de grupo não disponíveis em diversos outros itens do menu. <br><br> Essas ferramentas podem ser alcançadas a partir do menu lateral.
Birthday=Aniversario
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Criação do projeto
Notify_TASK_CREATE=Task created
Notify_TASK_MODIFY=Task modified
Notify_TASK_DELETE=Task deleted
+SeeModuleSetup=See module setup
NbOfAttachedFiles=Número Ficheiros/Documentos anexos
TotalSizeOfAttachedFiles=Tamanho Total dos Ficheiros/Documentos anexos
MaxSize=Tamanho Máximo
@@ -80,6 +80,16 @@ ModifiedBy=Modificado por %s
ValidatedBy=Validado por %s
CanceledBy=Anulado por %s
ClosedBy=Fechado por %s
+CreatedById=User id who created
+ModifiedById=User id who made last change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made last change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
FileWasRemoved=o Ficheiro foi eliminado
DirWasRemoved=A pasta foi eliminada
FeatureNotYetAvailableShort=Disponivel numa próxima versão
@@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your
##### Calendar common #####
AddCalendarEntry=Adicionar entrada ao calendario
-NewCompanyToDolibarr=Empresa %s inserida em Dolibarr
-ContractValidatedInDolibarr=Contrato %s validado em Dolibarr
-ContractCanceledInDolibarr=Contrato %s anulado em Dolibarr
-ContractClosedInDolibarr=Contracto %s fechado no Dolibarr
-PropalClosedSignedInDolibarr=Orçamento %s assinado no Dolibarr
-PropalClosedRefusedInDolibarr=Orçamento %s rejeitado no Dolibarr
-PropalValidatedInDolibarr=orçamento %s validado em Dolibarr
-InvoiceValidatedInDolibarr=Factura %s validada em Dolibarr
-InvoicePaidInDolibarr=Factura %s pasada a paga em Dolibarr
-InvoiceCanceledInDolibarr=Factura %s anulada em Dolibarr
-PaymentDoneInDolibarr=Pagamento %s realizado em Dolibarr
-CustomerPaymentDoneInDolibarr=Pagamento de cliente %s em Dolibarr
-SupplierPaymentDoneInDolibarr=Pagamento a fornecedor %s em Dolibarr
-MemberValidatedInDolibarr=Membro %s validado em Dolibarr
-MemberResiliatedInDolibarr=Membro %s dado de baixa em Dolibarr
-MemberDeletedInDolibarr=Membro %s eliminado de Dolibarr
-MemberSubscriptionAddedInDolibarr=Subscrição do membro % adicionada em Dolibarr
-ShipmentValidatedInDolibarr=%s embarque validado em Dolibarr
-ShipmentDeletedInDolibarr=Envio %s eliminado do Dolibarr
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
##### Export #####
Export=Exportação
ExportsArea=Área de Exportações
diff --git a/htdocs/langs/pt_PT/paybox.lang b/htdocs/langs/pt_PT/paybox.lang
index a9829efe980981298e6b4114e23c3e0270605542..4a10107089eb5c8175a994c951cae4e4e5307c5f 100644
--- a/htdocs/langs/pt_PT/paybox.lang
+++ b/htdocs/langs/pt_PT/paybox.lang
@@ -33,5 +33,8 @@ CSSUrlForPaymentForm=CSS url folha de estilo para forma de pagamento
MessageOK=Mensagem na página validado o pagamento de retorno
MessageKO=Mensagem na página de pagamento cancelado retorno
NewPayboxPaymentReceived=Novo pagamento Paybox recebido
-# NewPayboxPaymentFailed=New Paybox payment tried but failed
+NewPayboxPaymentFailed=New Paybox payment tried but failed
PAYBOX_PAYONLINE_SENDEMAIL=E-mail de notificação após um pagamento (sucesso ou falha)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/pt_PT/resource.lang b/htdocs/langs/pt_PT/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..d64075dfbf595897a63e3eebf19194d8f71030dd
--- /dev/null
+++ b/htdocs/langs/pt_PT/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
diff --git a/htdocs/langs/pt_PT/sendings.lang b/htdocs/langs/pt_PT/sendings.lang
index 4418a84ae423ffc96f0cd64f54cbc7ec34d07015..fa7ca1d607067b9b6dad78a211c2c02ae57dd919 100644
--- a/htdocs/langs/pt_PT/sendings.lang
+++ b/htdocs/langs/pt_PT/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=A criação de uma nova remessa é efectuada a p
RelatedShippings=Envios relacionados
ShipmentLine=Shipment line
CarrierList=Lista de transportadores
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
# Sending methods
SendingMethodCATCH=Capturas por cliente
diff --git a/htdocs/langs/pt_PT/stocks.lang b/htdocs/langs/pt_PT/stocks.lang
index 12b843005da08702a17ebf167e1d2bb87c7e9576..df7fffc401692142a5c078ea77ec333202c3314b 100644
--- a/htdocs/langs/pt_PT/stocks.lang
+++ b/htdocs/langs/pt_PT/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=A etiqueta do armazem é obrigatória
CorrectStock=Corrigir Stock
ListOfWarehouses=Lista de Armazens
ListOfStockMovements=Lista de movimentos de stock
-StocksArea=Área stocks
+StocksArea=Warehouses area
Location=Localização
LocationSummary=Nome abreviado da localização
NumberOfDifferentProducts=Number of different products
diff --git a/htdocs/langs/pt_PT/users.lang b/htdocs/langs/pt_PT/users.lang
index 71a0ea1871dd86447246f161d37e61f0faed4bce..6f65fee482bae54389e5b35d02d95b27840e16bf 100644
--- a/htdocs/langs/pt_PT/users.lang
+++ b/htdocs/langs/pt_PT/users.lang
@@ -63,7 +63,6 @@ ShowGroup=Ver grupo
ShowUser=Ver utilizador
NonAffectedUsers=Utilizadores não destinados ao grupo
UserModified=Utilizador correctamente modificado
-GroupModified=Grupo %s Modificado
PhotoFile=Fotografia
UserWithDolibarrAccess=Utilizador com acesso ao Dolibarr
ListOfUsersInGroup=Lista de Utilizadores deste grupo
@@ -103,7 +102,7 @@ UserDisabled=Utilizador %s Desactivado
UserEnabled=Utilizador %s Activado
UserDeleted=Utilizador %s Eliminado
NewGroupCreated=Grupo %s Criado
-GroupModified=Grupo %s Modificado
+GroupModified=Group %s modified
GroupDeleted=Grupo %s Eliminado
ConfirmCreateContact=Tem a certeza que deseja criar uma conta para este contacto?
ConfirmCreateLogin=Tem a certeza que deseja criar uma conta para este membro?
@@ -114,8 +113,10 @@ YourRole=Seus papéis
YourQuotaOfUsersIsReached=A sua quota de utilizadores foi atingida!
NbOfUsers=N º de utilizadores
DontDowngradeSuperAdmin=Apenas um superadmin pode desclassificar um superadmin
-HierarchicalResponsible=Responsabilidade Hierárquica
+HierarchicalResponsible=Supervisor
HierarchicView=Vista Hierárquica
UseTypeFieldToChange=Use Tipo de Campo para mudar
OpenIDURL=Endereço OpenID
LoginUsingOpenID=Utilizar OpenID para autenticação
+WeeklyHours=Weekly hours
+ColorUser=Color of the user
diff --git a/htdocs/langs/pt_PT/withdrawals.lang b/htdocs/langs/pt_PT/withdrawals.lang
index 5bc1e42766b6dde3421bf58f3716bf4c50b91f6c..ec8d6c3fda55691f1cb9d53e7781a8b893001f36 100644
--- a/htdocs/langs/pt_PT/withdrawals.lang
+++ b/htdocs/langs/pt_PT/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=Ordem
LastWithdrawalReceipts=As %s últimas ordens de levantamento
WithdrawedBills=Facturas de Levantamentos
WithdrawalsLines=Linhas de Levantamento
-RequestStandingOrderToTreat=Pedidos de Débitos Directos a Tratar
-RequestStandingOrderTreated=Pedidos de Débitos Directos Processados
+RequestStandingOrderToTreat=Request for standing orders to process
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=Débitos Directos de Clientes
CustomerStandingOrder=Débito Directo de Cliente
NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
@@ -40,14 +41,13 @@ TransMetod=Método de transmissão
Send=Enviar
Lines=Linhas
StandingOrderReject=Emitir uma rejeição
-InvoiceRefused=Factura Cliente, rejeitada
WithdrawalRefused=Levantamento rejeitado
WithdrawalRefusedConfirm=Tem certeza que quer entrar com uma rejeição de levantamento para a sociedade
RefusedData=Data de rejeição
RefusedReason=Motivo da rejeição
RefusedInvoicing=Faturamento da rejeição
NoInvoiceRefused=Sem factura Cliente, rejeitada
-InvoiceRefused=Factura Cliente, rejeitada
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=Estado
StatusUnknown=Desconhecido
StatusWaiting=Espera
@@ -76,7 +76,7 @@ WithBankUsingRIB=Para contas bancárias usando RIB
WithBankUsingBANBIC=Para contas bancárias usando IBAN / BIC / SWIFT
BankToReceiveWithdraw=Conta bancária para receber levantamento
CreditDate=Crédito em
-WithdrawalFileNotCapable=Não foi possível gerar ficheiro de recibo do levantamento
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
ShowWithdraw=Mostrar levantamento
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=No entanto, se não tiver factura, pelo menos, um pagamento levantamento ainda processado, que não irá ser definido como pago para permitir o levantamento antes de administrar.
DoStandingOrdersBeforePayments=Estas abas permitem a você pedir uma ordem permanente. Uma vez que ele será terminado, você pode digitar o pagamento para fechar a fatura.
diff --git a/htdocs/langs/pt_PT/workflow.lang b/htdocs/langs/pt_PT/workflow.lang
index ffdad765793eb2e172d5b199962de315c910dfd6..fcc2d74225926d34f60e4de1de0bed633622e829 100644
--- a/htdocs/langs/pt_PT/workflow.lang
+++ b/htdocs/langs/pt_PT/workflow.lang
@@ -6,6 +6,6 @@ descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Criar um pedido do cliente automaticamente,
descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Criar uma factura de cliente automaticamente, após uma proposta comercial ser assinada
descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Criar uma factura de cliente automaticamente depois de um contrato ser validado
descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Criar uma factura de cliente automaticamente após um pedido do cliente estar fechado
-# descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
-# descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
-# descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classifique a fonte ligada como prposta a cobrança quando a ordem do cliente for definida como paga
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classifique a fonte ligada como cobrado quando a ordem(s) do cliente for definida como paga
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classifique a fonte ligada a ordem(s) de clientes quando a fatura de cliente for validada
diff --git a/htdocs/langs/ro_RO/accountancy.lang b/htdocs/langs/ro_RO/accountancy.lang
index 8cab9d2b651d75b0721d76fda619e2034e4509b4..4aa5d073a0ed73c3ff6b9ff438feb049b1bc785e 100644
--- a/htdocs/langs/ro_RO/accountancy.lang
+++ b/htdocs/langs/ro_RO/accountancy.lang
@@ -1,158 +1,158 @@
# Dolibarr language file - en_US - Accounting Expert
CHARSET=UTF-8
-Accounting=Accounting
-Globalparameters=Global parameters
-Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
-Menuaccount=Accounting accounts
-Menuthirdpartyaccount=Thirdparty accounts
-MenuTools=Tools
-
-ConfigAccountingExpert=Configuration of the module accounting expert
-Journaux=Journals
-JournalFinancial=Financial journals
-Exports=Exports
-Modelcsv=Model of export
-Selectmodelcsv=Select a model of export
+Accounting=Contabilitate
+Globalparameters=Parametri globali
+Chartofaccounts=Plan de conturi
+Fiscalyear=Ani fiscali
+Menuaccount=Conturi contabile
+Menuthirdpartyaccount=Conturi terţi
+MenuTools=Instrumente
+
+ConfigAccountingExpert=Configurare modul expert contabil
+Journaux=Jurnale
+JournalFinancial=Jurnale financiale
+Exports=Exporturi
+Modelcsv=Model export
+Selectmodelcsv=Selectează un model de export
Modelcsv_normal=Classic export
-Modelcsv_CEGID=Export towards CEGID Expert
-BackToChartofaccounts=Return chart of accounts
+Modelcsv_CEGID=Export către CEGID Expert
+BackToChartofaccounts=Înapi la plan de conturi
Back=Return
-Definechartofaccounts=Define a chart of accounts
-Selectchartofaccounts=Select a chart of accounts
-Validate=Validate
-Addanaccount=Add an accounting account
-AccountAccounting=Accounting account
-Ventilation=Ventilation
-ToDispatch=To dispatch
-Dispatched=Dispatched
-
-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
-TradeMargin=Trade margin
-Reports=Reports
-ByCustomerInvoice=By invoices customers
-ByMonth=By Month
-NewAccount=New accounting account
-Update=Update
+Definechartofaccounts=Defineşte un plan de conturi
+Selectchartofaccounts=Selectează un plan de conturi
+Validate=Validează
+Addanaccount=Add un cont contabil
+AccountAccounting=Cont contabil
+Ventilation=Ventilare
+ToDispatch=De ventilat
+Dispatched=Ventilat
+
+CustomersVentilation=Ventilare clienţi
+SuppliersVentilation=Ventilare furnizori
+TradeMargin=Marjă comercială
+Reports=Rapoarte
+ByCustomerInvoice=Pe facturi clienţi
+ByMonth=Pe lună
+NewAccount=Cont contabil nou
+Update=Modifică
List=List
-Create=Create
-UpdateAccount=Modification of an accounting account
-UpdateMvts=Modification of a movement
-WriteBookKeeping=Record accounts in general ledger
-Bookkeeping=General ledger
-AccountBalanceByMonth=Account balance by month
-
-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
-Line=Line
-
-CAHTF=Total purchase supplier HT
-InvoiceLines=Lines of invoice to be ventilated
-InvoiceLinesDone=Ventilated lines of invoice
-IntoAccount=In the accounting account
-
-Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
-
-Processing=Processing
-EndProcessing=The end of processing
-AnyLineVentilate=Any lines to ventilate
-SelectedLines=Selected lines
-Lineofinvoice=Line of invoice
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
+Create=Crează
+UpdateAccount=Modificare cont contabil
+UpdateMvts=Modificare mişcare
+WriteBookKeeping=Înregistrare contabilă in Cartea Mare
+Bookkeeping=Cartea Mare
+AccountBalanceByMonth=Sold pe luni
+
+AccountingVentilation=Ventilare contabilă
+AccountingVentilationSupplier=Ventilare contabila furnizor
+AccountingVentilationCustomer=Ventilare contabila client
+Line=Linie
+
+CAHTF=Total cumpărări furnizor fara taxe
+InvoiceLines=Liniile facturii de ventilat
+InvoiceLinesDone=Liniile facturii ventilate
+IntoAccount=În conturi contabile
+
+Ventilate=Ventilează
+VentilationAuto=Ventilare automată
+
+Processing=Procesează
+EndProcessing=Sfârşitul procesării
+AnyLineVentilate=Nicio linie de ventilat
+SelectedLines=Linii selectate
+Lineofinvoice=Linia facturii
+VentilatedinAccount=Ventilare cu succes in conturi contabile
+NotVentilatedinAccount=Ne ventilate in conturi contabile
ACCOUNTING_SEPARATORCSV=Separator CSV
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
-
-AccountLength=Length of the accounting accounts shown in Dolibarr
-AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
-
-ACCOUNTING_SELL_JOURNAL=Sell journal
-ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
-ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
-ACCOUNTING_SOCIAL_JOURNAL=Social journal
-
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
-ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait
-
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
-
-Doctype=Type of document
-Docdate=Date
-Docref=Reference
-Numerocompte=Account
-Code_tiers=Thirdparty
-Labelcompte=Label account
+ACCOUNTING_LIMIT_LIST_VENTILATION=Numărul de elemente de ventilat afişat pe pagină (maxim recomandat: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Începe sortarea paginilor ventilate "Trebuie ventilate" începand cu cele mai recente elemente
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Începe sortarea paginilor ventilate "Ventilare" începand cu cele mai recente elemente
+
+AccountLength=Lungimea conturilor contabile afişate în Dolibarr
+AccountLengthDesc=Funcția pentru a simula lungirea unui cont contabil prin înlocuirea spatiile libere cu cifra zero. Această funcție afectează numai afişarea , aceasta nu va schimba conturile contabile înregistrate în Dolibarr. Pentru export, această funcţie este necesară să fie compatibil cu unele software-ul
+ACCOUNTING_LENGTH_GACCOUNT=Lungimea conturilor generale
+ACCOUNTING_LENGTH_AACCOUNT=Lungimea conturilor de terţi
+
+ACCOUNTING_SELL_JOURNAL=Jurnal vânzări
+ACCOUNTING_PURCHASE_JOURNAL=Jurnal cumpărări
+ACCOUNTING_BANK_JOURNAL=Jurnal bancă
+ACCOUNTING_CASH_JOURNAL=Jurnal casă
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Journal Diverse
+ACCOUNTING_SOCIAL_JOURNAL=Jurnal Asigurări Sociale
+
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Cont transfer
+ACCOUNTING_ACCOUNT_SUSPENSE=Cont contabil de aşteptare
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Cont Contabilitate Predefinit pentru produsele cumpărate(dacă nu este definit în fişa produsului)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Cont Contabilitate Predefinit pentru produsele vândute (dacă nu este definit în fişa produsului)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Cont Contabilitate Predefinit pentru serviciile cumpărate(dacă nu este definit în fişa produsului)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Cont Contabilitate Predefinit pentru serviciilor vândute(dacă nu este definit în fişa produsului)
+
+Doctype=Tipul documentului
+Docdate=Data
+Docref=Referinţă
+Numerocompte=Cont
+Code_tiers=Terţ
+Labelcompte=Etichetă cont
Debit=Debit
Credit=Credit
-Amount=Amount
+Amount=Sumă
Sens=Sens
Codejournal=Journal
-DelBookKeeping=Delete the records of the general ledger
+DelBookKeeping=Şterge înregistrări din Cartea Mare
-SellsJournal=Sells journal
-PurchasesJournal=Purchases journal
-DescSellsJournal=Sells journal
-DescPurchasesJournal=Purchases journal
-BankJournal=Bank journal
-DescBankJournal=Bank journal including all the types of payments other than cash
-CashJournal=Cash journal
-DescCashJournal=Cash journal including the type of payment cash
+SellsJournal=Jurnal Vânzări
+PurchasesJournal=Jurnal Cumpărări
+DescSellsJournal=Jurnal Vânzări
+DescPurchasesJournal=Jurnal Cumpărări
+BankJournal=Jurnal Bancă
+DescBankJournal=Jurnal Banca inclusiv toate tipurile plaţilor altele decat numerar
+CashJournal=Jurnal Casă
+DescCashJournal=Jurnal Cash inclusiv tipul plaţii numerar
-CashPayment=Cash Payment
+CashPayment=Plaţi numerar
-SupplierInvoicePayment=Payment of invoice supplier
-CustomerInvoicePayment=Payment of invoice customer
+SupplierInvoicePayment=Plata factura furnizor
+CustomerInvoicePayment=Plata factura client
-ThirdPartyAccount=Thirdparty account
+ThirdPartyAccount=Cont terţi
-NewAccountingMvt=New movement
-NumMvts=Number of movement
-ListeMvts=List of the movement
-ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+NewAccountingMvt=Transfer nou
+NumMvts=Numarul transferurilor
+ListeMvts=Lista transferurilor
+ErrorDebitCredit=Debitul și creditul nu pot avea o valoare, în același timp,
-ReportThirdParty=List thirdparty account
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=Lista Conturi terţi
+DescThirdPartyReport=Consultati aici lista terţilor furnizori și clienţi şi conturile lor contabile
-ListAccounts=List of the accounting accounts
+ListAccounts=Lista conturilor contabile
-Pcgversion=Version of the plan
-Pcgtype=Class of account
-Pcgsubtype=Under class of account
-Accountparent=Root of the account
-Active=Statement
+Pcgversion=Versiunea planului
+Pcgtype=Clasa contului
+Pcgsubtype=Sub Clasa contului
+Accountparent=Rădăcina contului
+Active=Extras
-NewFiscalYear=New fiscal year
+NewFiscalYear=An fiscal nou
-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
-TotalVente=Total turnover HT
-TotalMarge=Total sales margin
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+DescVentilCustomer=Consultati aici ventilarea contabilă anuală a facturilor de clienților ale dvs.
+TotalVente=Total Cifră de afaceri fără taxe
+TotalMarge=Total Marje vânzări
+DescVentilDoneCustomer=Consultati aici lista liniilor de facturi client și conturile lor contabile
+DescVentilTodoCustomer=Consultati aici lista liniilor de facturi client cu un cont contabil
+ChangeAccount=Schimbaţi contul contabil pentru liniile selectate prin contul:
Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
-DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Consultati aici ventilarea contabilă anuală a facturilor de furnizori ale dvs.
+DescVentilTodoSupplier=Consultati aici lista liniilor de facturi furnizor cu un cont contabil
+DescVentilDoneSupplier=Consultati aici lista liniilor de facturi furnizor și conturile lor contabile
-ValidateHistory=Validate Automatically
+ValidateHistory=Validează automat
-ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+ErrorAccountancyCodeIsAlreadyUse=Eroare, nu puteți șterge acest cont contabil, deoarece este folosit
-FicheVentilation=Ventilation card
+FicheVentilation=Fişă Ventilare
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index 56532fcc85ea466457c64569ce14ffe8196d944a..fbabb4f74013fbe746d465e31a3095bf5a320ee5 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -49,13 +49,13 @@ Chartofaccounts=Plan de conturi
Fiscalyear=Ani fiscali
ErrorReservedTypeSystemSystemAuto=Valorile 'system' și 'systemauto' pentru tip sunt rezervate. Puteți utiliza 'user' ca valoare pentru a adăuga propriile dvs. înregistrări
ErrorCodeCantContainZero=Codul nu poate conţine valoarea 0
-DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
+DisableJavascript=Dezactivează funcţiile JavaScript si Ajax (Recomandat pentru persoanele oarbe sau browserele text )
ConfirmAjax=Utilizaţi pop-up de confirmare Ajax
-UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectCompany=Use autocompletion fields to choose third parties instead of using a list box.
+UseSearchToSelectCompanyTooltip= De asemenea, dacă aveți un număr mare de terţi (> 100 000), puteți crește viteza prin setarea constantei COMPANY_DONOTSEARCH_ANYWHERE la 1 la Setup->Other. Căutarea va fi limitată la începutul șirului.
+UseSearchToSelectCompany=Utilizați autocompletarea câmpurilor pentru alegerea terţilor în loc de a folosi o casetă listă.
ActivityStateToSelectCompany= Adaugă o opţiune de filtru pentru a afişa / ascunde thirdparties, care sunt în prezent în activitate sau le-a încetat
-UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+UseSearchToSelectContactTooltip=De asemenea, dacă aveți un număr mare de terţi (> 100 000), puteți crește viteza prin setarea constantei COMPANY_DONOTSEARCH_ANYWHERE la 1 la Setup->Other. Căutarea va fi limitată la începutul șirului.
+UseSearchToSelectContact=Utilizați un câmp cu autocompletare pentru a selecta un contact (în loc de lista derulantă).
SearchFilter=Opţiuni filtre de căutare
NumberOfKeyToSearch=Nr caractere pentru a declanşa căutare: %s
ViewFullDateActions=Arata complet datele de acţiuni în cea de-a treia foaie
@@ -68,7 +68,7 @@ PreviewNotAvailable=Preview nu este disponibil
ThemeCurrentlyActive=Tema activă în prezent
CurrentTimeZone=TimeZone PHP (server)
MySQLTimeZone=TimeZone MySql (database)
-TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
+TZHasNoEffect=Datele sunt stocate și returnate de către serverul de baze de date ca și în cazul în care au fost păstrate ca șiruri transmise. Timezone are efect numai atunci când se utilizează funcția UNIX_TIMESTAMP (care nu ar trebui să fie utilizate de către Dolibarr, astfel TZ al bazei de date ar trebui să aibă nici un efect, chiar dacă sa schimbat după ce a fost introduse date).
Space=Spaţiu
Table=Tabel
Fields=Câmpuri
@@ -219,7 +219,7 @@ AutomaticIfJavascriptDisabled=Automat dacă Javascript este dezactivat
AvailableOnlyIfJavascriptNotDisabled=Disponibil numai dacă nu este dezactivat JavaScript
AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponibil numai dacă nu este dezactivat JavaScript
Required=Solicitat
-UsedOnlyWithTypeOption=Used by some agenda option only
+UsedOnlyWithTypeOption=Folosit numai de unele optiuni agenda
Security=Securitate
Passwords=Parolele
DoNotStoreClearPassword=Nu stoca parole în mod clar în baza de date
@@ -238,7 +238,7 @@ OfficialWebSiteFr=Site-ul web oficial francofon
OfficialWiki=Dolibarr Wiki
OfficialDemo=Dolibarr demo online
OfficialMarketPlace=Oficial loc pe piaţă pentru modulelor externe / addons
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
+OfficialWebHostingService=Referinţă Servicii de web hosting (Cloud hosting)
ReferencedPreferredPartners=Parteneri preferati
OtherResources=Alte Resurse
ForDocumentationSeeWiki=Pentru utilizator sau developer documentaţia (doc, FAQs ...), <br> aruncăm o privire la Dolibarr Wiki: <br> <a href="%s" target="_blank"><b> %s</b></a>
@@ -260,9 +260,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP-gazdă (Nu este definită în
MAIN_MAIL_EMAIL_FROM=Expeditor de e-mail pentru mesajele de poştă electronică automată (în mod implicit în <b>php.ini: %s)</b>
MAIN_MAIL_ERRORS_TO=Expeditor de e-mail folosită pentru e-mailurile trimise de eroare se întoarce
MAIN_MAIL_AUTOCOPY_TO= Trimite un mod sistematic ascunse carbon copie a tuturor e-mailuri trimise la
-MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to
-MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to
-MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to
+MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Trimite sistematic un CC ascuns cu propunerilor trimise prin e-mail la
+MAIN_MAIL_AUTOCOPY_ORDER_TO= Trimite sistematic un CC ascuns cu comenzile trimise prin e-mail la
+MAIN_MAIL_AUTOCOPY_INVOICE_TO= Trimite sistematic un CC ascuns cu facturile trimise prin e-mail la
MAIN_DISABLE_ALL_MAILS=Dezactivaţi toate e-mail-uri sendings (pentru scopuri de testare sau demo)
MAIN_MAIL_SENDMODE=Metoda de a folosi pentru a trimite email-uri
MAIN_MAIL_SMTPS_ID=SMTP ID-ul de autentificare necesare în cazul în
@@ -302,7 +302,7 @@ CurrentVersion=Dolibarr versiunea curentă
CallUpdatePage=Du-te la pagina care se actualizează datele şi structura bazei de date %s.
LastStableVersion=Ultima versiune stabilă
GenericMaskCodes=Puteți introduce orice mască de numerotare. În această mască, ar putea fi folosit următoarele etichete: <br> <b>{000000}</b> corespunde unui număr care va fi incrementat pe fiecare% s. Introduceți cât mai multe zerouri ca lungimea dorită a contra. Contorul va fi completat cu zerouri la stânga, în scopul de a avea cât mai multe zerouri ca masca. <br> <b>{000000} +000</b> fel ca și anterior, dar o compensare corespunzător cu numărul din dreapta semnului + se aplică începând cu prima% s. <br> <b>{000000 @ x}</b> fel ca și anterior, dar contorul este resetat la zero atunci când se ajunge la o lună x (x între 1 și 12, sau 0 pentru a folosi primele luni ale anului fiscal definite în configurația dvs., sau 99 pentru a reseta la zero în fiecare lună ). Dacă această opțiune este folosită și x este 2 sau mai mare, atunci secvența {aa} {mm} sau {AAAA} {mm} este de asemenea necesară. <br> <b>{Dd}</b> zi (01 la 31). <br> <b>{Mm}</b> luni (01 la 12). <br> <b>{AA}, {AAAA}</b> sau <b>{y}</b> an peste 2, 4 sau 1 numere. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{Cccc}</b> codul de client pe n caractere <br> <b>{Cccc000}</b> codul de client pe n caractere este urmată de un contor dedicat pentru client. Acest contor dedicat clientului este resetat în același timp de contor global. <br><b>{tttt}</b>Tipul codului terţului pe n caractere (a se vedea tipurile dicționarului-terţi). <br>
GenericMaskCodes3=Toate celelalte caractere în masca va rămâne intactă. <br> Spaţiile nu sunt permise. <br>
GenericMaskCodes4a=<u>Exemplu pe 99th %s de-a treia parte TheCompany făcut 2007-01-31:</u> <br>
GenericMaskCodes4b=<u>Exemplu de la o terţă parte a creat pe 2007-03-01:</u> <br>
@@ -379,10 +379,10 @@ ExtrafieldSelectList = Select din tabel
ExtrafieldSeparator=Separator
ExtrafieldCheckBox=Checkbox
ExtrafieldRadio=Radio buton
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
-ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpselect=Lista de parametri trebuie să fie ca cheie, valoare <br><br> pentru exemplul: <br> 1, valoare1 <br> 2, valoare2 <br> 3, value3 <br> ... <br><br> Pentru a avea listă în funcție de o alta:<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpcheckbox=Lista de parametri trebuie să fie de tip cheie, valoare <br><br> pentru exemplul: <br> 1, valoare1 <br> 2, valoare2 <br> 3, value3 <br> ...
+ExtrafieldParamHelpradio=Lista de parametri trebuie să fie de tip cheie, valoare <br><br> pentru exemplul: <br> 1, valoare1 <br> 2, valoare2 <br> 3, value3 <br> ...
+ExtrafieldParamHelpsellist=Lista de parametri a venit de la tabelul <br>Sintaxa: able_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br> filtru poate fi un test simplu (de exemplu, activ = 1), pentru a afișa doar valoare activă <br> dacă doriți să filtrați pe extracâmpuri folosi sintaxa extra.fieldcode=... (unde codul de câmp este codul de extracâmp)<br><br>În scopul de avea lista depinzând de alta :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
LibraryToBuildPDF=Librairie utilizată la construirea PDF ului
WarningUsingFPDF=Atenție: <b>conf.php</b> contine Directiva <b>dolibarr_pdf_force_fpdf = 1.</b> Acest lucru înseamnă că utilizați biblioteca FPDF pentru a genera fișiere PDF. Această bibliotecă este vechi și nu suportă o mulțime de caracteristici (Unicode, transparența imagine, cu litere chirilice, limbi arabe și asiatice, ...), astfel încât este posibil să apară erori în timpul generație PDF. <br> Pentru a rezolva acest lucru și au un suport complet de generare PDF, vă rugăm să descărcați <a href="http://www.tcpdf.org/" target="_blank">biblioteca TCPDF</a> , atunci comentariu sau elimina linia <b>$ dolibarr_pdf_force_fpdf = 1,</b> și se adaugă în schimb <b>$ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir'</b>
LocalTaxDesc=Unele țări aplică 2 sau 3 impozitele la fiecare linie de factura. Dacă este cazul, alege tipul de al doilea și al treilea de taxă și ratele lor. Tipuri posibile sunt: <br> 1: Taxa hoteliera se aplică pe produse și servicii, fără TVA (TVA nu este aplicată la taxa locala) <br> 2: taxa locala aplica pe produse și servicii fără TVA (TVA-ul este calculat la suma + localtax) <br> 3: Taxa locală se aplică la produsele fara TVA (TVA nu se aplică la taxa locala) <br> 4: Taxa locală se aplică la produsele fără TVA (TVA-ul este calculat la suma + localtax) <br> 5: Taxa locală se aplică pe servicii fara TVA (TVA nu este aplicată la taxa locala) <br> 6: TTaxa locală se aplică pe servicii fără TVA (TVA-ul este calculat la suma + localtax)
@@ -394,15 +394,15 @@ KeepEmptyToUseDefault=Lasă gol pentru utilizarea valorii implicite
DefaultLink=Link implicit
ValueOverwrittenByUserSetup=Atenție, această valoare poate fi suprascrisă de setările specifice utilizatorului (fiecare utilizator poate seta propriul url clicktodial)
ExternalModule=Modul extern - instalat în directorul %s
-BarcodeInitForThirdparties=Mass barcode init for thirdparties
-BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> records on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Init value for next %s empty records
-EraseAllCurrentBarCode=Erase all current barcode values
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values ?
-AllBarcodeReset=All barcode values have been removed
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into barcode module setup.
-NoRecordWithoutBarcodeDefined=No record with no barcode value defined.
+BarcodeInitForThirdparties=Init cod de bare în masă pentru terţi
+BarcodeInitForProductsOrServices=Init sau reset cod de bare în masă pentru produse şi servicii
+CurrentlyNWithoutBarCode=În prezent, aveți <strong>%s</strong> înregistări pe <strong>%s</strong> %s fără cod de bare definit.
+InitEmptyBarCode=Valoare inițializare pentru următoarele %s înregistrări goale
+EraseAllCurrentBarCode=Ștergeți toate valorile curente de coduri de bare
+ConfirmEraseAllCurrentBarCode=Sunteți sigur că doriți să ștergeți toate valorile curente ale codurilor de bare?
+AllBarcodeReset=Toate valorile codurilor de bare au fost eliminate
+NoBarcodeNumberingTemplateDefined=Niciun model numeric de cod de bare disponibil in configurarea modulului cod de bare
+NoRecordWithoutBarcodeDefined=Nicio înregistrare fără cod de bare definit
# Modules
Module0Name=Utilizatori & grupuri
@@ -437,8 +437,8 @@ Module52Name=Stocuri
Module52Desc=Managementul Stocurilor (produse)
Module53Name=Servicii
Module53Desc=Managementul Serviciilor
-Module54Name=Contracte
-Module54Desc=Managementul Contractele şi service-urilor
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=Coduri de bare
Module55Desc=Coduri de bare "de gestionare a
Module56Name=Telefonie
@@ -475,16 +475,16 @@ Module320Name=Feed RSS
Module320Desc=Adauga RSS feed interiorul Dolibarr ecran pagini
Module330Name=Marcaje
Module330Desc=Marcaje "de gestionare a
-Module400Name=Proiecte
-Module400Desc=Proiecte de gestionare în interiorul alte module
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=Webcalendar
Module410Desc=Webcalendar integrare
-Module500Name=Special expenses (tax, social contributions, dividends)
-Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
+Module500Name=Cheltuieli speciale( taxe, contributii sociale, dividende)
+Module500Desc=Managementul cheltuielilor speciale cum ar fi taxele , contribuţiile sociale, dividendele si salariile
Module510Name=Salarii
-Module510Desc=Management of employees salaries and payments
+Module510Desc=Managementul salariilor angajatilor si a plaţiilor
Module600Name=Notificări
-Module600Desc=Trimite notificări (prin e-mail) pe Dolibarr de afaceri evenimente
+Module600Desc=Trimite notificări prin email la unele evenimente de afaceri Dolibarr la contactele terților (configurare definită pe fiecare terţ)
Module700Name=Donatii
Module700Desc=MAnagementul Donaţiilor
Module1200Name=Mantis
@@ -514,28 +514,28 @@ Module5000Name=Multi-societate
Module5000Desc=Vă permite să administraţi mai multe companii
Module6000Name=Flux de lucru
Module6000Desc=Managementul fluxului de lucru
-Module20000Name=Concedii
-Module20000Desc=Declară şi urmăreşte concediile angajaţilor
-Module39000Name=Product batch
-Module39000Desc=Batch number, eat-by and sell-by date management on products
+Module20000Name=Managementul cererilor de concedii
+Module20000Desc=Declară şi urmăreşte cererile de concedii ale angajaţilor
+Module39000Name=Lot Produs
+Module39000Desc=Management Număr lot și data de expirare pentru produse
Module50000Name=Paybox
Module50000Desc=Modul de a oferi o pagina de plata online prin card de credit cu Paybox
Module50100Name=Punct de Vanzare
Module50100Desc=Modul Punct de Vanzare
-Module50200Name= PayPal
-Module50200Desc= Modul de a oferi o pagina de plata online prin card de credit cu Paypal
+Module50200Name=PayPal
+Module50200Desc=Modul de a oferi o pagina de plata online prin card de credit cu Paypal
Module50400Name=Contabilitate (avansat)
Module50400Desc=Management Contabilitate (partidă dublă)
Module54000Name=Print lP IPrinter
Module54000Desc=Printează prin serviciul Cups cu ajutorul imprimantei IPP
-Module55000Name=Open Poll
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
+Module55000Name=Deschide Sondaj
+Module55000Desc=Modul pentru a face sondaje online (ca Doodle, Studs, Rdvz, ...)
Module59000Name=Marje
Module59000Desc=Modul management marje
Module60000Name=Comisioane
Module60000Desc=Modul management comisioane
-Module150010Name=Batch number, eat-by date and sell-by date
-Module150010Desc=batch number, eat-by date and sell-by date management for product
+Module150010Name=Număr lot, data de expirare şi data vânzare
+Module150010Desc=Management Număr lot și data de expirare pentru produse
Permission11=Citeşte facturi
Permission12=Creaţi/Modificare facturi
Permission13=Unvalidate facturi
@@ -606,15 +606,16 @@ Permission151=Citiţi cu ordine de plată
Permission152=Setup ordine de plată
Permission153=Citiţi cu ordine de plată încasări
Permission154=De credit / refuza încasări Ordinele de plată
-Permission161=Citeşte contracte
-Permission162=Creare / Modificare contracte
-Permission163=Activaþi un serviciu de un contract
-Permission164=Dezactivare a unui serviciu de un contract
-Permission165=Ştergere contracte
-Permission171=Citeşte excursii
-Permission172=Creare / Modificare excursii
-Permission173=Ştergere ordin de deplasare
-Permission178=Export excursii
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Citeşte deconturile si cheltuielile( proprii şi ale subordonaţilor)
+Permission172=Creare / Modificare ordin de deplasare şi cheltuieli
+Permission173=Ştergere ordin de deplasare şi cheltuieli
+Permission174=Citeşte toate ordinele de deplasare şi cheltuieli
+Permission178=Export ordin de deplasare şi cheltuieli
Permission180=Citiţi cu furnizorii
Permission181=Citeşte furnizor ordinelor
Permission182=Creare / Modificare furnizor ordinelor
@@ -671,7 +672,7 @@ Permission300=Citiţi cu coduri de bare
Permission301=Creare / Modificare coduri de bare
Permission302=Ştergere coduri de bare
Permission311=Citeşte servicii
-Permission312=Atribui contractul de servicii pentru a
+Permission312=Assign service/subscription to contract
Permission331=Citiţi cu marcaje
Permission332=Creare / Modificare marcaje
Permission333=Ştergeţi marcaje
@@ -701,8 +702,8 @@ Permission701=Citiţi cu donaţii
Permission702=Creare / Modificare donaţii
Permission703=Ştergere donaţii
Permission1001=Citeşte stocuri
-Permission1002=Creare / Modificare stocuri
-Permission1003=Ştergere stocuri
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=Citeşte stoc deplasările
Permission1005=Creare / Modificare stoc deplasările
Permission1101=Citiţi cu livrare comenzi
@@ -749,38 +750,38 @@ Permission50101=Utilizează Point of Sales
Permission50201=Citeşte tranzacţii
Permission50202=Tranzacţiilor de import
Permission54001=Printare
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
+Permission55001=Cieşte sondaje
+Permission55002=Creare / Modificare sondaje
+Permission59001=Citeşte marje comerciale
+Permission59002=Defineşte marje comerciale
DictionaryCompanyType=Tip Terţ
-DictionaryCompanyJuridicalType=Juridical kinds of thirdparties
-DictionaryProspectLevel=Prospect potential level
+DictionaryCompanyJuridicalType=Tipuri juridice terţi
+DictionaryProspectLevel=Nivel potenţial Prospect
DictionaryCanton=Stat/Judeţ
DictionaryRegion=Regiuni
DictionaryCountry=Ţări
DictionaryCurrency=Monede
DictionaryCivility=Mod adresare
-DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
-DictionaryVAT=VAT Rates or Sales Tax Rates
-DictionaryRevenueStamp=Amount of revenue stamps
+DictionaryActions=Tip evenimente agenda
+DictionarySocialContributions=Tipuri Contribuţii sociale
+DictionaryVAT=Cote TVA sau Cote Taxe Vanzări
+DictionaryRevenueStamp=Valoarea timbrelor fiscale
DictionaryPaymentConditions=Conditiile de plata
DictionaryPaymentModes=Moduri plată
-DictionaryTypeContact=Contact/Address types
+DictionaryTypeContact=Tipuri Contact/adresă
DictionaryEcotaxe=Ecotax (DEEE)
-DictionaryPaperFormat=Paper formats
+DictionaryPaperFormat=Formate hârtie
DictionaryFees=Tip de taxe
-DictionarySendingMethods=Shipping methods
+DictionarySendingMethods=Metode Livrare
DictionaryStaff=Efectiv
-DictionaryAvailability=Delivery delay
-DictionaryOrderMethods=Ordering methods
-DictionarySource=Origin of proposals/orders
+DictionaryAvailability=Livrare întârziere
+DictionaryOrderMethods=Metode de comandă
+DictionarySource=Originea de propuneri / comenzi
DictionaryAccountancyplan=Plan de conturi
-DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancysystem=Model pentru plan de conturi
SetupSaved=Setup salvate
BackToModuleList=Inapoi la lista de module
-BackToDictionaryList=Back to dictionaries list
+BackToDictionaryList=Inapoi la lista de dicţionare
VATReceivedOnly=Special rata nu taxat
VATManagement=TVA-ul de management
VATIsUsedDesc=Rata TVA implicită la crearea de prospecte, facturi, comenzi etc urmeze regula standard de activare: <br> În cazul în care vânzătorul nu este supusă TVA-ului, apoi TVA-ul implicit = 0. Sfârșitul regulă. <br> În cazul în care (țara de vânzare = cumpărare țară), atunci TVA-ul implicit = TVA a produsului în țara de vânzare. Sfârșitul regulă. <br> În cazul în care vânzătorul și cumpărătorul în Comunitatea Europeană și bunuri sunt produse de transport (mașină, navă, avion), implicit TVA = 0 (TVA ar trebui să fie plătite de către cumpărător la customoffice de țara sa și nu la vânzător). Sfârșitul regulă. <br> În cazul în care vânzătorul și cumpărătorul în Comunitatea Europeană și cumpărător nu este o companie, atunci TVA-ul implicit = TVA de produs vândut. Sfârșitul regulă. <br> În cazul în care vânzătorul și cumpărătorul în Comunitatea Europeană și cumpărător este o companie, atunci TVA-ul implicit = 0. Sfârșitul regulă. <br> Altfel propus implicit TVA = 0. Sfârșitul regulă.
@@ -815,11 +816,11 @@ LocalTax2IsUsedExampleES= În Spania, liber profesionişti şi specialişti inde
LocalTax2IsNotUsedExampleES= În Spania nu sunt afaceri care fac obiectul sistemului de impozitare de module.
CalcLocaltax=Rapoarte
CalcLocaltax1ES=Vânzări - Cumpârări
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
+CalcLocaltax1Desc=Rapoarte Taxe Locale este calcult ca diferenţă dintre taxele locale de vanzare şi taxele locale de cumparare
CalcLocaltax2ES=Achiziţii
-CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
+CalcLocaltax2Desc=Rapoarte Taxe Locale este totalul taxelor locale de cumpărare
CalcLocaltax3ES=Vânzări
-CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
+CalcLocaltax3Desc=Rapoarte Taxe Locale este totalul taxelor locale de vanzare
LabelUsedByDefault=Eticheta utilizat în mod implicit în cazul în care nu poate fi găsit de traducere pentru codul
LabelOnDocuments=Eticheta de pe documente
NbOfDays=Nr zile
@@ -959,7 +960,7 @@ TriggerDisabledAsModuleDisabled=Declanşările în acest dosar sunt dezactivate
TriggerAlwaysActive=Declanşările în acest dosar sunt întotdeauna activ, ce sunt activate Dolibarr module.
TriggerActiveAsModuleActive=Declanşările în acest dosar sunt active ca <b>modul %s</b> este activată.
GeneratedPasswordDesc=Definiţi aici regulă care doriţi să-l utilizaţi pentru a genera o parolă nouă, dacă vă întrebaţi de a avea auto generate parola
-DictionaryDesc=Define here all reference datas. You can complete predefined value with yours.
+DictionaryDesc=Definiți aici toate Date de referință. Puteți completa valoarea predefinită cu a dvs.
ConstDesc=Această pagină vă permite să editaţi toate alţi parametri care nu sunt disponibile în ultimele pagini. Acestea sunt rezervate pentru parametrii avansat dezvoltatorii sau pentru troubleshouting.
OnceSetupFinishedCreateUsers=Atenţie, esti un utilizator Dolibarr administrator. Administrator utilizatori sunt utilizate pentru a instala Dolibarr. Pentru o utilizare obişnuită a Dolibarr, este recomandat să folosiţi un administrator de utilizator creat de utilizatori şi grupuri de meniu.
MiscellaneousDesc=Definiţi parametrii de aici toate celelalte legate de securitate.
@@ -997,7 +998,7 @@ SimpleNumRefModelDesc=Întoarce numărul de referinţă cu formatul %syymm-NNNN
ShowProfIdInAddress=Arată id professionnal cu adrese pe documente
ShowVATIntaInAddress=Ascunde codul TVA Intra cu adresa pe documente
TranslationUncomplete=Parţială traducere
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="http://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Unele limbi pot fi traduse parţial sau pot conţine erori. Dacă detectaţi ceva, puteţi rezolva înregistrând fisierele limbă pe <a href="http://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
MenuUseLayout=Asiguraţi-meniu vertical hidable (JavaScript opţiune nu trebuie să fi dezactivat)
MAIN_DISABLE_METEO=Dezactivează meteo vedere
TestLoginToAPI=Testaţi logati pentru a API
@@ -1023,7 +1024,7 @@ ExtraFieldsProject=Atribute complementare (proiecte)
ExtraFieldsProjectTask=Atribute complementare (sarcini)
ExtraFieldHasWrongValue=Atributul %s are o valoare greşită.
AlphaNumOnlyCharsAndNoSpace=numai caractere alfanumerice fără spaţiu
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
+AlphaNumOnlyLowerCharsAndNoSpace=numai caractere minuscule, alfanumerice fără spaţiu
SendingMailSetup=Setup de trimiteri prin e-mail
SendmailOptionNotComplete=Atenţie, pe unele sisteme Linux, pentru a trimite e-mail de la e-mail, sendmail configurare execuţie trebuie să conatins optiunea-ba (mail.force_extra_parameters parametri în fişierul php.ini). Dacă nu unor destinatari a primi e-mailuri, încercaţi să editaţi acest parametru PHP cu mail.force_extra_parameters =-BA).
PathToDocuments=Cale de acces documente
@@ -1038,22 +1039,21 @@ YesInSummer=Da în vară
OnlyFollowingModulesAreOpenedToExternalUsers=Notă, doar următoarele module sunt deschise pentru utilizatorii externi (indiferent dacă sunt permisiuni de utilizatori):
SuhosinSessionEncrypt=Stocarea sesiune criptată prin Suhosin
ConditionIsCurrently=Condiția este momentan %s
-TestNotPossibleWithCurrentBrowsers=Detectarea automată nu este posibilă
YouUseBestDriver=Utilizaţi driverul %s care este cel mai bun driver disponibil acum.
-YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
+YouDoNotUseBestDriver=Utilizaţi driverul %s dar driverul %s este recomandat.
NbOfProductIsLowerThanNoPb=Aveți doar % s produse / servicii în baza de date. Aceasta nu necesită nicio optimizare specială.
SearchOptim=Optimizare căutare
YouHaveXProductUseSearchOptim=Aveți % s produse în baza de date. Ar trebui să adăugați constanta PRODUCT_DONOTSEARCH_ANYWHERE la 1 în Acasă-Setup-Altele, să limitați căutarea la începutul siruri de caractere ţi a face posibil ca baza de date să utilizeze indexul și să obțineți un răspuns imediat.
BrowserIsOK=Folosiţi navigatorul web %s. Acest navigator este ok pentru performanţă şi securitate.
BrowserIsKO=Folosiţi browser-ul % s. Acest browser-ul pare a fi o alegere proasta pentru securitate, performanță și fiabilitate. Noi recomandam sa folositi Firefox, Chrome, Opera sau Safari.
-XDebugInstalled=XDebug is loaded.
+XDebugInstalled=XDebug este încărcat.
XCacheInstalled=XCache este încărcată.
AddRefInList=Afişează referinţele clienţilor şi furnizorilor într-o listă ( selectează lista sau casutele ) si in plus a linkurilor.
FieldEdition=Editarea campului %s
FixTZ=Fixează TimeZone
FillThisOnlyIfRequired=Exemplu: +2 (completați numai dacă problemele decalajjului fusului orar sunt cunoscute)
-GetBarCode=Get barcode
-EmptyNumRefModelDesc=The code is free. This code can be modified at any time.
+GetBarCode=Dă codbare
+EmptyNumRefModelDesc=Codul este free. Acest cod poat efi modificat in orice moment.
##### Module password generation
PasswordGenerationStandard=Întoarceţi-vă o parolă generate în funcţie de interne Dolibarr algoritmul: 8 caractere care conţin numere în comun şi în caractere minuscule.
PasswordGenerationNone=Nu sugerează orice generate parola. Parola trebuie să fie de tip în manual.
@@ -1074,15 +1074,15 @@ ModuleCompanyCodeAquarium=Întoarceţi-vă un cod de contabilitate construit de
ModuleCompanyCodePanicum=Întoarceţi-vă un gol de contabilitate cod.
ModuleCompanyCodeDigitaria=Contabilitate cod depinde de o terţă parte de cod. Acest cod este format din caractere "C" în prima poziţie, urmat de primele 5 caractere de-a treia parte de cod.
UseNotifications=Utilizaţi notificări
-NotificationsDesc=Anunturi caracteristică vă permite să tăcut trimite automat mail, pentru unele Dolibarr evenimente, pentru companii care sunt configurate pentru a
+NotificationsDesc=Funcţia E-mailuri cu notificări vă permite să trimiteți în linişte mail automat, pentru unele evenimente Dolibarr. Targetele pot fi definite: <br> * Pe contactele terţilor (clienti sau furnizori), un terţ terță o dată<br> * Sau prin stabilirea unei adrese target de e-mail globală de la pagina de configurare a modulului.
ModelModules=Documente şabloane
DocumentModelOdt=Generare din modelele OpenDocument (Fichier .ODT ou .ODS OpenOffice, KOffice, TextEdit…)
WatermarkOnDraft=Watermark pe proiect de document
-JSOnPaimentBill=Activate feature to autofill payment lines on payment form
+JSOnPaimentBill=Activaţi funcţia de autocompletare a liniilor de plata pe formularul de plată
CompanyIdProfChecker=Professional ID unic
MustBeUnique=Trebuie să fie unice?
-MustBeMandatory=Mandatory to create third parties ?
-MustBeInvoiceMandatory=Mandatory to validate invoices ?
+MustBeMandatory=Obligatoriu pentru crearea unui terţ ?
+MustBeInvoiceMandatory=Obligatoriu pentru validarea facturilor ?
Miscellaneous=Diverse
##### Webcal setup #####
WebCalSetup=Webcalendar link-ul de instalare
@@ -1096,7 +1096,7 @@ WebCalServer=Server de găzduire de date calendaristice
WebCalDatabaseName=Baza de date nume
WebCalUser=De utilizator pentru a accesa baza de date
WebCalSetupSaved=Webcalendar setup fost salvate cu succes.
-WebCalTestOk=Connection to server '%s' on database '%s' with user '%s' successful.
+WebCalTestOk=Conectarea la server ' %s' pe bază de date " %s" cu utilizatorul " %s" cu succes.
WebCalTestKo1=Conectarea la server ' %s' reuseste, dar baza de date " %s" nu a putut fi atins.
WebCalTestKo2=Conectarea la server ' %s' cu utilizatorul " %s" nu a reuşit.
WebCalErrorConnectOkButWrongDatabase=Conexiunii la baza de date a reusit, dar nu arata a fi o bază de date Webcalendar.
@@ -1138,14 +1138,16 @@ AddDeliveryAddressAbility=Adauga data de capacitatea de livrare
UseOptionLineIfNoQuantity=O linie de produse / servicii cu o suma de zero este considerat ca fiind o opţiune
FreeLegalTextOnProposal=Free text pe comercial propuneri
WatermarkOnDraftProposal=Filigranul pe propunerile comerciale ciornă (niciunul daca e gol)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=Ordinele de gestionare setup
OrdersNumberingModules=Ordinele de numerotare module
OrdersModelModule=Ordinul modele de documente
-HideTreadedOrders=Hide the treated or cancelled orders in the list
+HideTreadedOrders=Ascunde comenzile tratate sau anulate în lista
ValidOrderAfterPropalClosed=Pentru a valida pentru propunerea după mai aproape, face posibil să nu se pas cu provizoriu pentru
FreeLegalTextOnOrders=Free text de pe ordinele de
WatermarkOnDraftOrders=Filigranul pe comenzile ciornă (niciunul daca e gol)
+ShippableOrderIconInList=Adaugă un icon în lista Comenzilor care indica daca comanda este expediabilă
##### Clicktodial #####
ClickToDialSetup=Click pentru a Dial modul setup
ClickToDialUrlDesc=Url called when a click on phone picto is done. Dans l'url, vous pouvez utiliser les balises<br><b>__PHONETO__</b> qui sera remplac� par le t�l�phone de l'appel�<br><b>__PHONEFROM__</b> qui sera remplac� par le t�l�phone de l'appelant (le votre)<br><b>__LOGIN__</b> qui sera remplac� par votre login clicktodial (d�fini sur votre fiche utilisateur)<br><b>__PASS__</b> qui sera remplac� par votre mot de passe clicktodial (d�fini sur votre fiche utilisateur).
@@ -1158,11 +1160,11 @@ FicheinterNumberingModules=Modulele de intervenţie de numerotare
TemplatePDFInterventions=Carte de modele de documente de intervenţie
WatermarkOnDraftInterventionCards=Filigranul pe documentele fişelor de intervenţie (niciunul daca e gol)
##### Contracts #####
-ContractsSetup=Contracte de modul de configurare
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=Contracte de numerotare module
-TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
+TemplatePDFContracts=Modele documente contracte
+FreeLegalTextOnContracts=Free text pe contracte
+WatermarkOnDraftContractCards=Filigranul pe contractele ciornă (niciunul daca e gol)
##### Members #####
MembersSetup=Membrii modul de configurare
MemberMainOptions=Principalele opţiuni
@@ -1237,9 +1239,9 @@ LDAPSynchroKO=Eşuare încercare de sincronizare
LDAPSynchroKOMayBePermissions=Eşuare încercare de sincronizare. Verificaţi dacă conexiune la serverul este configurat corect şi permite LDAP udpates
LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=TCP se conecteze la serverul LDAP de succes (Server= %s, port= %s)
LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=TCP se conecteze la serverul LDAP a eşuat (Server= %s, port= %s)
-LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
+LDAPBindOK=Conectare/Autentificare la serverul LDAP cu succes (Server=%s, Port=%s, Admin=%s, Password=%s)
LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=Conectare / Authentificate la serverul LDAP a eşuat (Server= %s, port= %s, %s= admin, parola= %s)
-LDAPUnbindSuccessfull=Disconnect successful
+LDAPUnbindSuccessfull=Deconectat cu succes
LDAPUnbindFailed=Deconectaţi eşuat
LDAPConnectToDNSuccessfull=Conexiune au DN ( %s) Russie
LDAPConnectToDNFailed=Conexiune au DN ( %s) choue
@@ -1296,7 +1298,7 @@ LDAPFieldSidExample=Exemplu: objectsid
LDAPFieldEndLastSubscription=Data de sfârşit de abonament
LDAPFieldTitle=Post / Funcţia
LDAPFieldTitleExample=Examplu: titlu
-LDAPParametersAreStillHardCoded=LDAP parameters are still hardcoded (in contact class)
+LDAPParametersAreStillHardCoded=Parametrii LDAP sunt încă hardcoded (în clasa de contact)
LDAPSetupNotComplete=LDAP setup nu complet (merg pe alţii file)
LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Nr administrator sau parola furnizate. LDAP de acces vor fi anonime şi modul doar în citire.
LDAPDescContact=Această pagină vă permite să definiţi numele atribute LDAP LDAP în copac pentru fiecare date găsite pe Dolibarr contact.
@@ -1309,9 +1311,9 @@ PerfDolibarr=Raport performanţă setări/optimizări
YouMayFindPerfAdviceHere=Veți găsi pe această pagină unele verificări sau sfaturi privind performanţa.
NotInstalled=Neinstalat, astfel serverul dvs nu este încetinit de acesta.
ApplicativeCache=Cache aplicativ
-MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
-MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
-MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
+MemcachedNotAvailable=Niciun cache aplicatie găsit. Puteți îmbunătăți performanța prin instalarea unui server de cache memcached și un modul capabil de a utiliza acest server cache. <br>Mai multe informatii aici <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.\n<br>Rețineți că o mulțime de furnizor de web hosting nu oferă astfel de server de cache.
+MemcachedModuleAvailableButNotSetup=Modulul memcahed pentru aplicarea cache este găsit dar nu este configurat complet
+MemcachedAvailableAndSetup=Modulul Memcached pentru a utiliza serverul memcached este activat.
OPCodeCache=Cache OPCode
NoOPCodeCacheFound=Niciun cache Opcode găsit. Puteţi să folosiți un alt cache Opcode decât XCache sau eAccelerator (bun), poate nu ai cache Opcode (foarte rău).
HTTPCacheStaticResources=HTTP cache pentru resursele statice (CSS, img, javascript)
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Fișierele de tip %s nu sunt comprimate de serverul HTT
CacheByServer=Cache pe server
CacheByClient=Cache pe browser
CompressionOfResources=Compresie a răspunsului HTTP
-TestNotPossibleWithCurrentBrowsers=Detectarea automată nu este posibilă
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=Produse modul de configurare
ServiceSetup=Servicii de modul de configurare
@@ -1332,8 +1334,8 @@ ConfirmDeleteProductLineAbility=Confirmarea de îndepărtare a produce o linie
ModifyProductDescAbility=Personalizare de descrieri produse în forme
ViewProductDescInFormAbility=Vizualizare descrierile de produs, în forme (de altfel ca popup tooltip)
ViewProductDescInThirdpartyLanguageAbility=Vizualizarea de descrieri de produse în limba thirdparty
-UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
+UseSearchToSelectProductTooltip=De asemenea, dacă aveți un număr mare produse (> 100 000), puteți crește viteza prin setarea constantei COMPANY_DONOTSEARCH_ANYWHERE la 1 la Setup->Other. Căutarea va fi limitată la începutul șirului.
+UseSearchToSelectProduct=Folositi un formular de căutare pentru a alege un produs (mai degrabă decât o listă derulantă).
UseEcoTaxeAbility=Suport Eco-Taxe (DEEE)
SetDefaultBarcodeTypeProducts=Implicit tip de cod de bare de a utiliza pentru produse
SetDefaultBarcodeTypeThirdParties=Implicit tip de cod de bare de a utiliza pentru terţi
@@ -1369,7 +1371,7 @@ BarcodeDescC39=Coduri de bare de tip C39
BarcodeDescC128=Coduri de bare de tip C128
GenbarcodeLocation=Coduri de bare generaţie în linie de comandă (utilizat de către phpbarcode motor pentru anumite tipuri de coduri de bare)
BarcodeInternalEngine=Motor intern
-BarCodeNumberManager=Manager to auto define barcode numbers
+BarCodeNumberManager=Manager pentru autodefinire numere coduri bare
##### Prelevements #####
WithdrawalsSetup=Retragere de modul de configurare
##### ExternalRSS #####
@@ -1382,9 +1384,10 @@ MailingSetup=Să trimiteţi un email la modul de instalare
MailingEMailFrom=Expeditorul e-mail (la) pentru e-mail-uri trimise prin email-uri de module
MailingEMailError=Întoarcere Email (Erori-a) pentru e-mailuri cu erori
##### Notification #####
-NotificationSetup=Email modul de configurare
+NotificationSetup=Configurare Modul Notificări Email
NotificationEMailFrom=Expeditorul e-mail (la) pentru e-mail-uri trimise pentru notificări
-ListOfAvailableNotifications=Lista notificărilor disponibile (Această listă depinde de module activate)
+ListOfAvailableNotifications=Listă de evenimente pentru care puteți seta notificări pe, pfiecare terţ (mergi în fişa terţ pentru configurare) sau prin stabilirea unui e-mail fix (Lista depinde de modulele activate)
+FixedEmailTarget=Targhet email fixat
##### Sendings #####
SendingsSetup=Trimiterea de modul de configurare
SendingsReceiptModel=Trimiterea primirea model
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=Conectarea la server ' %s' pe bază de date " %s" cu utilizator
OSCommerceTestKo1=Conectarea la server ' %s' reuseste, dar baza de date " %s" nu a putut fi atins.
OSCommerceTestKo2=Conectarea la server ' %s' cu utilizatorul " %s" nu a reuşit.
##### Stock #####
-StockSetup=Configurarea modulului stoc
-UserWarehouse=Utilizaţi utilizator personal stocuri
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=Meniu elimină
TreeMenu=Tree meniuri
@@ -1448,11 +1452,11 @@ ConfirmDeleteLine=Sunteţi sigur că doriţi să ştergeţi această linie?
##### Tax #####
TaxSetup=Impozite, contribuţii sociale şi dividende de modul de configurare
OptionVatMode=Opţiunea de exigibilit de TVA
-OptionVATDefault=Cash basis
-OptionVATDebitOption=Accrual basis
+OptionVATDefault=Bazată pe incasări
+OptionVATDebitOption=Bazată pe debit
OptionVatDefaultDesc=TVA este datorată: <br> - La livrare / plăţile pentru mărfurile <br> - Privind plăţile pentru serviciile
OptionVatDebitOptionDesc=TVA este datorată: <br> - La livrare / plăţile pentru mărfurile <br> - Pe factura (de debit) pentru serviciile
-SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
+SummaryOfVatExigibilityUsedByDefault=Momentul implicit TVA-ului exigibil pentru opțiunea selectată:
OnDelivery=Pe livrare
OnPayment=Pe plată
OnInvoice=Pe factura
@@ -1469,20 +1473,23 @@ AccountancyCodeBuy=Cont cumpărare. cod
AgendaSetup=Acţiuni de ordine de zi şi de modul de configurare
PasswordTogetVCalExport=Cheia de a autoriza export link
PastDelayVCalExport=Nu de export eveniment mai în vârstă decât
-AGENDA_USE_EVENT_TYPE=Use events types (managed into menu Setup -> Dictionary -> Type of agenda events)
-AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view
-AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_USE_EVENT_TYPE=Utilizați tipurile de evenimente (administrat în Setup -> Dictionary -> Type of agenda events)
+AGENDA_DEFAULT_FILTER_TYPE=Setați automat acest tip de eveniment în filtrul de căutare al vederii agenda
+AGENDA_DEFAULT_FILTER_STATUS=Setați automat acest statut în filtrul de căutare al vederii agenda
+AGENDA_DEFAULT_VIEW=Care tab doriţi să deschideţi când selectaţi meniul Agenda
##### ClickToDial #####
ClickToDialDesc=Acest modul permite să adăugaţi o pictogramă după numărul de telefon de contact Dolibarr. Un clic pe această pictogramă, se va apela un serveur cu un URL particular definiţi mai jos. Acest lucru poate fi utilizat pentru a apela un sistem de call center din Dolibarr care pot apela numărul de telefon pe un sistem de SIP, de exemplu.
##### Point Of Sales (CashDesk) #####
CashDesk=Punctul de vânzare
CashDeskSetup=Casierie modul de configurare
-CashDeskThirdPartyForSell=Generic terţă parte de a utiliza pentru vinde
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Case de cont pentru a utiliza pentru vinde
CashDeskBankAccountForCheque= Cont pentru a utiliza pentru a primi plăţi prin cec
CashDeskBankAccountForCB= Cont pentru a folosi pentru a primi plăţi în numerar de carduri de credit
-CashDeskIdWareHouse=Datawarehous de utilizator pentru a vinde
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Bookmark modul de configurare
BookmarkDesc=Acest modul vă permite să gestionaţi marcaje. De asemenea, puteţi adăuga comenzi rapide pentru orice Dolibarr pagini sau site-uri web externale pe partea stanga de meniu.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Şterge an fiscal
ConfirmDeleteFiscalYear=Sigur doriţi să ştergeţi acest an fiscal ?
Opened=Deschis
Closed=Închis
-
+AlwaysEditable=Permite a fi editat mereu
+MAIN_APPLICATION_TITLE=Forțează numele vizibil al aplicare (avertisment: setarea propriul nume aici poate duce la eliminarea facilitaţii de conectare automată atunci când se utilizează aplicația mobilă DoliDroid)
+NbMajMin=Numărul minim al caracterelor majuscule
+NbNumMin=Numărul minim al caracterelor minuscule
+NbSpeMin=Numărul minim al caracterelor speciale
+NbIteConsecutive=Numărul maxim al caracterelor care se repetă
+NoAmbiCaracAutoGeneration=Nu utiliza caractere ambigue ("1","l","i","|","0","O") pentru generare automată
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0:Tip plata Client, 1:Tip plata Furnizor, 2:Ambele tipuri plata Client sau Furnizor
diff --git a/htdocs/langs/ro_RO/agenda.lang b/htdocs/langs/ro_RO/agenda.lang
index 256dfc1811611e791f1739024fd9efd67ba595e7..dec69f5b654bfbc89a7ef941b7230242499a6fcb 100644
--- a/htdocs/langs/ro_RO/agenda.lang
+++ b/htdocs/langs/ro_RO/agenda.lang
@@ -6,11 +6,11 @@ Agenda=Agenda
Agendas=Agende
Calendar=Calendar
Calendars=Calendare
-LocalAgenda=Internal calendar
-ActionsOwnedBy=Event owned by
+LocalAgenda=Calendar intern
+ActionsOwnedBy=Evenimente aparţinând de
AffectedTo=Atribuit lui
DoneBy=Realizat de
-Event=Event
+Event=Eveniment
Events=Evenimente
EventsNb=Număr evenimente
MyEvents=Evenimentele mele
@@ -23,7 +23,7 @@ MenuToDoActions=Toate evenimentele neterminate
MenuDoneActions=Toate evenimentele terminate
MenuToDoMyActions=Evenimentele mele neterminate
MenuDoneMyActions=Evenimentele mele terminate
-ListOfEvents=List of events (internal calendar)
+ListOfEvents=Lista evenimentelor ( calendar intern)
ActionsAskedBy=Evenimente înregistarte de
ActionsToDoBy=Evenimente atribuite lui
ActionsDoneBy=Evenimente efectuate de
@@ -35,15 +35,16 @@ ViewList=Vezi listă
ViewCal=Vezi lunar
ViewDay=Vezi zilnic
ViewWeek=Vezi săptămânal
-ViewPerUser=Per user view
+ViewPerUser=Vezi pe utilizator
ViewWithPredefinedFilters= Vezi cu filtre predefinite
AutoActions= Completarea automată
AgendaAutoActionDesc= Definiți aici evenimentele pentru care doriți ca Dolibarr să creeze automat un eveniment în agendă. În cazul în care nimic nu este bifat(implicit), doar acțiunile manuale vor fi incluse în agendă.
AgendaSetupOtherDesc= Această pagină permite configurarea unor opțiuni pentru exportul de evenimente Dolibarr într-un calendar extern (Thunderbird, Google Calendar, ...)
AgendaExtSitesDesc=Această pagină vă permite să declaraţi sursele externe de calendare pentru a vedea evenimentele lor în agenda Dolibarr.
-ActionsEvents= Evenimente pentru care Dolibarr va crea o acţiune în agendă în mod automat
-PropalValidatedInDolibarr= Propunerea %s validată
-InvoiceValidatedInDolibarr= Factura %s validată
+ActionsEvents=Evenimente pentru care Dolibarr va crea o acţiune în agendă în mod automat
+PropalValidatedInDolibarr=Propunerea %s validată
+InvoiceValidatedInDolibarr=Factura %s validată
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=Factura %s revenită de statutul nevalidată
InvoiceDeleteDolibarr=Factura %s ştearsă
OrderValidatedInDolibarr= Comanda %s validată
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Comanda %s aprobată
OrderRefusedInDolibarr=Comanda %s refuzată
OrderBackToDraftInDolibarr=Comanda %s revenită de statutul nevalidată
OrderCanceledInDolibarr=Comanda %s anulată
-InterventionValidatedInDolibarr=Intervenţie %s validată
ProposalSentByEMail=Propunerea comercială %s trimisă prin e-mail
OrderSentByEMail=Comanda client %s trimisă prin e-mail
InvoiceSentByEMail=Factura client %s trimisă prin e-mail
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=Comanda furnizor %s trimisă prin e-mail
SupplierInvoiceSentByEMail=Factura furnizor %s trimise prin e-mail
ShippingSentByEMail=Avizul de expediţie %s trimis prin e-mail
ShippingValidated= Livrarea %s validata
-InterventionSentByEMail=Intervenţia %s trimisă prin e-mail
-InterventionClassifiedBilled=Intervenția %s clasificat Facturat
NewCompanyToDolibarr= Terţ creat
DateActionPlannedStart= Data planificată a începerii
DateActionPlannedEnd= Data planificată a terminării
@@ -70,24 +68,24 @@ DateActionStart= Data începerii
DateActionEnd= Data terminării
AgendaUrlOptions1=Puteţi, de asemenea, să adăugaţi următorii parametri pentru filtrarea rezultatelor:
AgendaUrlOptions2=<b>login=%s</b> pentru a limita exportul de acțiuni create de, atribuite lui sau făcut de utilizatorul<b>% s</b>.
-AgendaUrlOptions3=<b>logina=% s</b> pentru a limita exportul de acțiuni create de utilizatorul <b>% s</b>.
+AgendaUrlOptions3=<b>logind=%s</b> pentru a limita exportul de acțiuni deţinute de utilizatorul <b>%s</b>
AgendaUrlOptions4=<b>logint=% s</b> pentru a limita exportul de acțiuni atribuite utilizatorului <b>% s</b>.
-AgendaUrlOptions5=<b>logind=% s</b> pentru a limita exportul de acțiuni efectuate de utilizatorul <b>% s</b>
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> pentru a limita exportul de acțiuni asociate la proiectul <b>PROJECT_ID</b>.
AgendaShowBirthdayEvents=Afişează ziua de naştere a contactelor
AgendaHideBirthdayEvents=Ascunde ziua de naştere a contactelor
Busy=Ocupat
ExportDataset_event1=Lista evenimentelor din agenda
-DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
-DefaultWorkingHours=Default working hours in day (Example: 9-18)
+DefaultWorkingDays=Rangul zilelor lucrătoare predefinite in săptămână (Examplu:1-5, 1-6)
+DefaultWorkingHours=Orele lucrătoare predefinite ale zilei (Examplu: 9-18)
# External Sites ical
ExportCal=Export calendar
ExtSites=Import calendare externe
-ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
+ExtSitesEnableThisTool=Afişează calendarele externe (definite in setup global) în agenda. Nu afectează calendarele externe definite de utilizatori.
ExtSitesNbOfAgenda=Număr calendare
AgendaExtNb=Calendar nr %s
ExtSiteUrlAgenda=URL-ul pentru a accesa fişierul . ical
ExtSiteNoLabel=Nici o descriere
-WorkingTimeRange=Working time range
-WorkingDaysRange=Working days range
-AddEvent=Add event
-MyAvailability=My availability
+WorkingTimeRange=Rang timp muncă
+WorkingDaysRange=Rang zile muncă
+AddEvent=Creare eveniment
+MyAvailability=Disponibilitatea mea
diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang
index ad456b6fb359f3cdcc115e8bb71c1f1503cdb474..dcd7b8f56e0e8a653facf8714a819cbfe88a9381 100644
--- a/htdocs/langs/ro_RO/bills.lang
+++ b/htdocs/langs/ro_RO/bills.lang
@@ -23,13 +23,13 @@ InvoiceProFormaAsk=Factură Proformă
InvoiceProFormaDesc=<b>Factura Proformă </b> este o imagine a adevăratei facturi, dar nu are nici o valoare contabilă.
InvoiceReplacement=Factură de Înlocuire
InvoiceReplacementAsk=Factură de Înlocuire a altei facturi
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and replace completely an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc=<b>;Factură de Înlocuire</b> este utilizată pentru a anula şi înlocui complet o factură fără nicio plată primită . <br><br> Notă: Doar factura fără nicio plată poate fi înlocuită. Dacă nu s-a inchis, acesta va fi închisă în mod automat cu statutul "abandonat".
InvoiceAvoir=Nota de credit
InvoiceAvoirAsk=Nota de credit pentru a corecta factura
InvoiceAvoirDesc=<b>Nota de credit</b> este o factură negativă folosită pentru a rezolva o factură ,fie că are o sumă care diferă de suma de plata (pentru ca clientul a plătit prea mult din eroare, sau nu vor fi platite anumite produse complet ce vor fi returnate, de exemplu).
-invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
-invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake
+invoiceAvoirWithLines=Creați Credit Note cu linii din factura origine
+invoiceAvoirWithPaymentRestAmount=Creați Nota de credit cu valoarea neachitată a facturii de origine
+invoiceAvoirLineWithPaymentRestAmount=Notă de credit pentru valoarea rămasă neplătită
ReplaceInvoice=Înlocuieşte factura %s
ReplacementInvoice=Înlocuire factură
ReplacedByInvoice=Înlocuită de factura %s
@@ -66,7 +66,7 @@ ConfirmConvertToReduc=Vrei sa se transforme aceasta nota de credit în absolută
SupplierPayments=Plăţi Furnizori
ReceivedPayments=Încasări primite
ReceivedCustomersPayments=Încasări Clienţi
-PayedSuppliersPayments=Payments payed to suppliers
+PayedSuppliersPayments=Plaţi efectuate catre furnizori
ReceivedCustomersPaymentsToValid=Încasări Clienţi de validat
PaymentsReportsForYear=Rapoarte Plăţi pentru %s
PaymentsReports=Rapoarte Plăţi
@@ -80,12 +80,12 @@ PaymentAmount=Sumă de plată
ValidatePayment=Validează plata
PaymentHigherThanReminderToPay=Plată mai mare decât restul de plată
HelpPaymentHigherThanReminderToPay=Atentie, valoarea plăţii la una sau mai multe facturi este mai mare decât restul de plată. <br> Corectaţi intrarea, altfel confirmaţi si gîndiţivă la crearea unei note de credit pentru fiecare plata în exces.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm.
+HelpPaymentHigherThanReminderToPaySupplier=Atenție, suma de plată la una sau mai multe facturi este mai mare decât restul de plată. <br> Editați intrarea, altfel confirmaţi.
ClassifyPaid=Clasează "Platită"
ClassifyPaidPartially=Clasează "Platită Parţial"
ClassifyCanceled=Clasează "Abandonată"
ClassifyClosed=Clasează "Închisă"
-ClassifyUnBilled=Classify 'Unbilled'
+ClassifyUnBilled=Clasează Nefacturat
CreateBill=Crează Factura
AddBill=Crează Factura sau Notă de Credit
AddToDraftInvoices=Adaugă la factura nevalidată
@@ -137,8 +137,6 @@ BillFrom=De la
BillTo=La
ActionsOnBill=Evenimente pe factura
NewBill=Factură nouă
-Prélèvements=Ordin de plată
-Prélèvements=Ordin de plată
LastBills=Ultimele %s facturi
LastCustomersBills=Ultimele %s facturi clienţi
LastSuppliersBills=Ultimele %s facturi furnizori
@@ -156,9 +154,9 @@ ConfirmCancelBill=Sigur doriţi să anulaţi factura <b> %s</b> ?
ConfirmCancelBillQuestion=De ce vrei să clasezi această factură "abandonată"?
ConfirmClassifyPaidPartially=Sigur doriţi să clasaţi factura <b>%s</b>ca plătită ?
ConfirmClassifyPaidPartiallyQuestion=Această factură nu a fost plătită în întregime. Care sunt motivele tale de a închide această factură?
-ConfirmClassifyPaidPartiallyReasonAvoir=Restul de plată <b>( %s %s)</b> este un discount acordat la plată, pentru că a fost făcută înainte de termen. Am regularizarea TVA-ului, cu o nota de credit.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Restul de plată <b>( %s %s)</b> este un discount acordat la plată, pentru că a fost făcută înainte de termen. Accept piardereaa TVA-ului de pe această reducere.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Restul de plată <b>( %s %s)</b> este un discount acordat la plată, pentru că a fost făcută înainte de termen. Am recupera TVA-ul de pe această reducere fără o notă de credit.
+ConfirmClassifyPaidPartiallyReasonAvoir=Restul de plată <b>( %s %s)</b> este un discount acordat la plată, pentru că a fost făcută înainte de termen. Regularizarea TVA-ului, cu o nota de credit.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Restul de plată <b>( %s %s)</b> este un discount acordat la plată, pentru că a fost făcută înainte de termen. Accept piarderea a TVA-ului de pe această reducere.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Restul de plată <b>( %s %s)</b> este un discount acordat la plată, pentru că a fost făcută înainte de termen. Recuperez TVA-ul de pe această reducere fără o notă de credit.
ConfirmClassifyPaidPartiallyReasonBadCustomer=Client rău platnic
ConfirmClassifyPaidPartiallyReasonProductReturned=Produse parţial returnate
ConfirmClassifyPaidPartiallyReasonOther=Creanţă abandonată din alte motive
@@ -171,7 +169,7 @@ ConfirmClassifyPaidPartiallyReasonOtherDesc=Utilizaţi această opţiune dacă t
ConfirmClassifyAbandonReasonOther=Altele
ConfirmClassifyAbandonReasonOtherDesc=Această opţiune va fi folosită în toate celelalte cazuri. De exemplu, dacă ai dori să creezi o factura de inlocuire a facturii.
ConfirmCustomerPayment=Confirmaţi introducerea plăţii de <b>%s</b> %s ?
-ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s ?
+ConfirmSupplierPayment=Confirmaţi introducerea plăţii de <b>%s</b> %s ?
ConfirmValidatePayment=Sunteți sigur că doriți să validaţi această plată? Nici o schimbare poate fi făcută odată ce plata este validată.
ValidateBill=Validează factura
UnvalidateBill=Devalidează factura
@@ -198,8 +196,8 @@ Rest=Creanţă
AmountExpected=Suma reclamată
ExcessReceived=Primit în plus
EscompteOffered=Discount oferit ( plată înainte de termen)
-SendBillRef=Submission of invoice %s
-SendReminderBillRef=Submission of invoice %s (reminder)
+SendBillRef=Trimitere factura %s
+SendReminderBillRef=Trimitere factura %s ( reamintire)
StandingOrders=Ordine de plată
StandingOrder=Ordin de plată
NoDraftBills=Nici o factură nevalidată
@@ -219,19 +217,18 @@ NoInvoice=Nici o factură
ClassifyBill=Clasează factura
SupplierBillsToPay=Facturi furnizori de plată
CustomerBillsUnpaid=Facturi clienţi neîncasate
-DispenseMontantLettres=Facturile nevalidate mecanografic fac excepţie de la ordinea în litere
-DispenseMontantLettres=Facturile nevalidate mecanografic fac excepţie de la ordinea în litere
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=Nerecuperabilă
SetConditions=Setează termenii de plata
SetMode=Setează modul de plată
Billed=Facturat
-RepeatableInvoice=Factură Predefinită
-RepeatableInvoices=Facturi Predefinite
-Repeatable=Predefinit
-Repeatables=Predefinite
-ChangeIntoRepeatableInvoice=Converteşte în predefinită
-CreateRepeatableInvoice=Crează factură predefinită
-CreateFromRepeatableInvoice=Crează din factură predefinită
+RepeatableInvoice=Model factura
+RepeatableInvoices=Modele facturi
+Repeatable=Model
+Repeatables=Modele
+ChangeIntoRepeatableInvoice=Converteşte in model factură
+CreateRepeatableInvoice=Crează model factură
+CreateFromRepeatableInvoice=Crează din model factură
CustomersInvoicesAndInvoiceLines=Facturi Clienţi şi linii facturi
CustomersInvoicesAndPayments=Facturi Clienţi şi plăţi
ExportDataset_invoice_1=Lista Facturi Clienţi şi linii facturi
@@ -287,7 +284,7 @@ InvoiceNotChecked=Nicio factură selectată
CloneInvoice=Clonează factura
ConfirmCloneInvoice=Sigur doriţi să clonaţi această factură <b> %s</b>?
DisabledBecauseReplacedInvoice=Acţiunea dezactivată, pentru că factura a fost înlocuită
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here.
+DescTaxAndDividendsArea=Această zonă prezintă un rezumat al tuturor plăţilor efectuate pentru cheltuieli speciale. Numai înregistrările cu plaţi în cursul anului sunt incluse aici.
NbOfPayments=Nr plăţi
SplitDiscount=Scindează reducere în două
ConfirmSplitDiscount=Sigur doriţi să împărţim această reducere <b>%s</b> %s în 2 mai mici ?
@@ -296,8 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Valoarea totală a celor două noi reduceri
ConfirmRemoveDiscount=Sigur doriţi să eliminaţi acest discount?
RelatedBill=Factură asociată
RelatedBills=Facturi asociate
-LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoice already exist
+LatestRelatedBill=Ultima Factură asociată
+WarningBillExist=Avertisment, una sau mai multe facturi există deja
# PaymentConditions
PaymentConditionShortRECEP=Imediat
@@ -388,20 +385,20 @@ ValidateInvoice=Validează factura
Cash=Numerar
Reported=Întârziat
DisabledBecausePayments=Nu este posibil, deoarece există unele plăţi
-CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
+CantRemovePaymentWithOneInvoicePaid=Nu se poate elimina plata deoarece există cel puțin o factură clasificată plătită
ExpectedToPay=Plată prevăzută
-PayedByThisPayment=Paid by this payment
+PayedByThisPayment=Achitat prin aceasta plată
ClosePaidInvoicesAutomatically=Clasează "Platită" toate facturile standard sau de înlocuire în întregime platite.
ClosePaidCreditNotesAutomatically=Clasează "Platită" toate credit notele returnate în întregime
-AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
+AllCompletelyPayedInvoiceWillBeClosed=Toate facturile cu rest de plată zero vor fi închise automat cu statusul "Plătită".
ToMakePayment=Plăteşte
ToMakePaymentBack=Rambursează
ListOfYourUnpaidInvoices=Lista facturilor neplătite
NoteListOfYourUnpaidInvoices=Notă: Această listă conține numai facturile pentru terții la care sunteţi reprezentant de vânzării.
RevenueStamp=Timbru fiscal
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
+YouMustCreateInvoiceFromThird=Această opțiune este disponibilă numai atunci când se creează factura de la tab-ul "client" al terţului
PDFCrabeDescription=Şablon PDF Factura Crabe . Un șablon factură complet (format recomandat)
-TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+TerreNumRefModelDesc1=Retrimiteţi numărul sub forma %syymm-nnnn pentru facturile standard și %syymm-nnnn pentru notele de credit unde yy este anul, mm este luna și nnnn este o secvenţă fără nici o pauză și fără revenire la 0
MarsNumRefModelDesc1=Retrimiteţi numărul sub forma %syymm-nnnn pentru facturile standard , %syymm-nnnn pentru facturile de înlocuire, %syymm-nnnn pentru credit note şi %syymm-nnnn pentru credit note unde yy este anul, mm este luna şi nnnn este o secvenţă continuă şi nu revine la 0
TerreNumRefModelError=O factură începând cu $syymm există deja și nu este compatibilă cu acest model de numerotaţie. Înşăturaţi-o sau redenumiți-o pentru a activa acest modul.
##### Types de contacts #####
diff --git a/htdocs/langs/ro_RO/boxes.lang b/htdocs/langs/ro_RO/boxes.lang
index 66b804d891efc016a172143b792c41b59cd29dde..054fdee5758757406a22cae433d5add5c3564750 100644
--- a/htdocs/langs/ro_RO/boxes.lang
+++ b/htdocs/langs/ro_RO/boxes.lang
@@ -12,13 +12,14 @@ BoxLastProspects=Ultima perspectivele
BoxLastCustomers=Ultima clienţi
BoxLastSuppliers=Ultima furnizori
BoxLastCustomerOrders=Ultima client ordinelor
+BoxLastValidatedCustomerOrders=Ultimele comenzi clienţi validate
BoxLastBooks=Ultimele cărţi
BoxLastActions=Ultima acţiuni
BoxLastContracts=Ultimele contracte
BoxLastContacts=Ultimele date de contact / adresele
BoxLastMembers=Ultimele membri
BoxFicheInter=Ultimele intervenţii
-# BoxCurrentAccounts=Opened accounts balance
+BoxCurrentAccounts=Sold deschidere cont
BoxSalesTurnover=Vanzari cifra de afaceri
BoxTotalUnpaidCustomerBills=Total facturi neachitate clientului
BoxTotalUnpaidSuppliersBills=Total facturi neachitate furnizorului
@@ -27,26 +28,29 @@ BoxTitleNbOfCustomers=Nombre de client
BoxTitleLastRssInfos=Ultimele noutăţi de la %s %s
BoxTitleLastProducts=Ultima %s modificate produse / servicii
BoxTitleProductsAlertStock=Alertă produse în stoc
-BoxTitleLastCustomerOrders=Ultima modificare %s client ordinelor
+BoxTitleLastCustomerOrders=Ultimele %s comenzi clienți
+BoxTitleLastModifiedCustomerOrders=Ultimele %s comenzi clienţi validate
BoxTitleLastSuppliers=Ultima %s înregistrate de furnizori
BoxTitleLastCustomers=Ultima %s înregistrate de clienţi
BoxTitleLastModifiedSuppliers=%s Ultima modificare furnizori
BoxTitleLastModifiedCustomers=%s Ultima modificare clienţii
-BoxTitleLastCustomersOrProspects=Ultima %s înregistrate de clienţi sau de perspectivele
-BoxTitleLastPropals=Ultima %s înregistrate propuneri
+BoxTitleLastCustomersOrProspects=Ultimii %s clienti sau prospecţi
+BoxTitleLastPropals=Ultimele %s propuneri
+BoxTitleLastModifiedPropals=Ultimele %s cpropuneri modificate
BoxTitleLastCustomerBills=Ultima %s clientului facturi
+BoxTitleLastModifiedCustomerBills=Ultimele %s facturi clienţi modificate
BoxTitleLastSupplierBills=Ultima %s furnizorului facturi
-BoxTitleLastProspects=Ultima %s înregistrate perspectivele
+BoxTitleLastModifiedSupplierBills=Ultimele %s facturi clienţi modificate
BoxTitleLastModifiedProspects=%s Ultima modificare perspective
BoxTitleLastProductsInContract=Ultima %s produse / servicii intr-un contract
-BoxTitleLastModifiedMembers=%s Ultimele membri modificate
+BoxTitleLastModifiedMembers=Ultimii %s membri
BoxTitleLastFicheInter=Ultimele %s intervenţii modificate
-BoxTitleOldestUnpaidCustomerBills=Cele mai vechi %s neachitate clientului facturi
-BoxTitleOldestUnpaidSupplierBills=Cele mai vechi %s neachitate furnizorului, facturi
-# BoxTitleCurrentAccounts=Opened account's balances
+BoxTitleOldestUnpaidCustomerBills=Cele mai vechi %s facturi client neachitate
+BoxTitleOldestUnpaidSupplierBills=Cele mai vechi %s facturi furnizor neachitate
+BoxTitleCurrentAccounts=Solduri deschidere conturi
BoxTitleSalesTurnover=Vanzari cifra de afaceri
-BoxTitleTotalUnpaidCustomerBills=Neachitate clientului facturi
-BoxTitleTotalUnpaidSuppliersBills=Furnizorului, facturi neachitate
+BoxTitleTotalUnpaidCustomerBills=Facturi Clienţi Neîncasate
+BoxTitleTotalUnpaidSuppliersBills=Facturi Furnizori Neachitate
BoxTitleLastModifiedContacts=%s Ultima modificare contacte / adrese
BoxMyLastBookmarks=Ultima mea %s marcaje
BoxOldestExpiredServices=Cele mai vechi active de servicii a expirat
@@ -77,6 +81,7 @@ NoRecordedContracts=Nr contracte înregistrate
NoRecordedInterventions=Nici o intervenție înregistrată
BoxLatestSupplierOrders=Ultimele comenzi furnizori
BoxTitleLatestSupplierOrders=Ultimele %s comenzi furnizori
+BoxTitleLatestModifiedSupplierOrders=Ultimele %s comenzi clienţi modificate
NoSupplierOrder=Nicio comandă furnizor inregistrată
BoxCustomersInvoicesPerMonth=Facturi Clienţi pe lună
BoxSuppliersInvoicesPerMonth=Facturi Furnizori pe lună
diff --git a/htdocs/langs/ro_RO/cashdesk.lang b/htdocs/langs/ro_RO/cashdesk.lang
index dd4279eaf298d97ec2300f5cecb014dfc22a6981..aadcee9b18d629418e67233e02aed6606f64901f 100644
--- a/htdocs/langs/ro_RO/cashdesk.lang
+++ b/htdocs/langs/ro_RO/cashdesk.lang
@@ -37,4 +37,4 @@ ShowCompany=Afişare companie
ShowStock=Arată depozit
DeleteArticle=Faceţi clic pentru a elimina acest articol
FilterRefOrLabelOrBC=Caută (Ref/Etichetă)
-# UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock.
+UserNeedPermissionToEditStockToUsePos=Ca să scadă stocul la crearea facturii utilizatorul care foloseşte POSul trebuie sa aibă permisiunea de a edita stocul.
diff --git a/htdocs/langs/ro_RO/categories.lang b/htdocs/langs/ro_RO/categories.lang
index 4e958bc4cc496caa0179b780ad7568f6b237741e..4e5a03a7523bfe25e203cc59738c8d5151bfc6cb 100644
--- a/htdocs/langs/ro_RO/categories.lang
+++ b/htdocs/langs/ro_RO/categories.lang
@@ -66,7 +66,7 @@ ReturnInCompany=Inapoi la Fişa client / prospect
ContentsVisibleByAll=Conţinutul va fi vizibil pentru toţi
ContentsVisibleByAllShort=Conţinut vizibil de către toţi
ContentsNotVisibleByAllShort=Conţinutul nu va fi vizibil pentru toţi
-CategoriesTree=Categories tree
+CategoriesTree=Arborescenţă Categorii
DeleteCategory=Şterge categorie
ConfirmDeleteCategory=Sigur doriţi să ştergeţi această categorie?
RemoveFromCategory=Eliminaţi link-ul cu Categoria
@@ -101,14 +101,12 @@ CatSupLinks=Legături dintre furnizori şi categorii
CatCusLinks=Legături dintre clienţi/prospecte şi categorii
CatProdLinks=Legături dintre produse/servicii şi categorii
CatMemberLinks=Legături dintre membrii şi categorii
-CatProdLinks=Legături dintre produse/servicii şi categorii
-CatCusLinks=Legături dintre clienţi/prospecte şi categorii
-CatSupLinks=Legături dintre furnizori şi categorii
DeleteFromCat=Elimină din categorii
-DeletePicture=Picture delete
-ConfirmDeletePicture=Confirm picture deletion?
-ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Categories setup
-CategorieRecursiv=Link with parent category automatically
-CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
-AddProductServiceIntoCategory=Add the following product/service
+DeletePicture=Şterge Foto
+ConfirmDeletePicture=Confirmaţi ştergere foto ?
+ExtraFieldsCategories=Atribute complementare
+CategoriesSetup=Setare Categorii
+CategorieRecursiv=Link automat către categoria părinte
+CategorieRecursivHelp=Dacă este activat, produsul va fi legat către categoria părinte atunci când este adăugat în subcategorie
+AddProductServiceIntoCategory=Add următoarele produseservicii
+ShowCategory=Arată categorie
diff --git a/htdocs/langs/ro_RO/commercial.lang b/htdocs/langs/ro_RO/commercial.lang
index 3b0bcf9bef4190e01421ce47d3276d1c39601907..3ce69c333456a2ec9542f0127b01803555fe1900 100644
--- a/htdocs/langs/ro_RO/commercial.lang
+++ b/htdocs/langs/ro_RO/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Prospect
Prospects=Prospecte
DeleteAction=Ştergeţi o acţiune / sarcină
NewAction=Eveniment / sarcină nouă
-AddAction=Adaugă eveniment/ sarcină
-AddAnAction=Adaugă eveniment / sarcină
-AddActionRendezVous=Adaugă un eveniment întălnire
+AddAction=Creare Eveniment / sarcină
+AddAnAction=Crează un Eveniment / sarcină
+AddActionRendezVous=Crează un eveniment întălnire
Rendez-Vous=Întâlnire
ConfirmDeleteAction=Sunteţi sigur că doriţi să ştergeţi aceast eveniment?
CardAction=Fişă Eveniment
@@ -44,8 +44,8 @@ DoneActions=Lista evenimentelor realizate
DoneActionsFor=Lista evenimentelor realizate pentru %s
ToDoActions=Lista evenimentelor incomplete
ToDoActionsFor=Lista evenimentelor incomplete pentru %s
-SendPropalRef=Trimite propunerea comercială %s
-SendOrderRef=Trimite comanda %s
+SendPropalRef=Transmitere propunere comercială %s
+SendOrderRef=Transmitere comandă %s
StatusNotApplicable=Nu se aplică
StatusActionToDo=De realizat
StatusActionDone=Realizat
@@ -62,7 +62,7 @@ LastProspectContactDone=Prospecte contactate
DateActionPlanned=Dată realizare prevăzută
DateActionDone=Dată realizare efectivă
ActionAskedBy=Eveniment înregistrat de
-ActionAffectedTo=Eveniment atribuit la
+ActionAffectedTo=Evenimente aparţinând de
ActionDoneBy=Eveniment realizat de către
ActionUserAsk=Raportat de
ErrorStatusCantBeZeroIfStarted=Dacă câmpul <b>"Data reală debut realizare"</b> este completat, acţiunea este începută (sau terminată), astfel câmpul <b>"Status"</b> nu poate fi 0%%.
@@ -71,7 +71,7 @@ ActionAC_FAX=Trimitere fax
ActionAC_PROP=Trimitere propunere pe mail
ActionAC_EMAIL=Trimitere email
ActionAC_RDV=Întâlniri
-ActionAC_INT=Intervention on site
+ActionAC_INT=Intervenţie pe site
ActionAC_FAC=Trimitere factura client pe mail
ActionAC_REL=Retrimitere factura client (memento)
ActionAC_CLO=Închide
diff --git a/htdocs/langs/ro_RO/companies.lang b/htdocs/langs/ro_RO/companies.lang
index ac08a1819dd33f005fff408fa37f139f3106be26..25e8fbd7c98a1b9d262d81dc8d9c5b6b0cfc76e6 100644
--- a/htdocs/langs/ro_RO/companies.lang
+++ b/htdocs/langs/ro_RO/companies.lang
@@ -18,7 +18,7 @@ NewCompany=Societate nouă (prospect, client, furnizor)
NewThirdParty=Terţ nou (prospect, client, furnizor)
NewSocGroup=Grup nou de societăţi
NewPrivateIndividual=Particular nou(prospect, client, furnizor)
-CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+CreateDolibarrThirdPartySupplier=Creare terţ ( furnizor)
ProspectionArea=Zona Prospecte
SocGroup=Grup de societăţi
IdThirdParty=ID Terţ
@@ -83,7 +83,7 @@ DefaultLang=Limba implicită
VATIsUsed=Utilizează TVA-ul
VATIsNotUsed=Nu utilizează TVA-ul
CopyAddressFromSoc=Completaţi adresa cu adresa terţului
-NoEmailDefined=There is no email defined
+NoEmailDefined=Nu există email definit
##### Local Taxes #####
LocalTax1IsUsedES= RE este utilizat
LocalTax1IsNotUsedES= RE nu este utilizat
@@ -91,9 +91,9 @@ LocalTax2IsUsedES= IRPF este utilizat
LocalTax2IsNotUsedES= IRPF nu este utilizat
LocalTax1ES=RE
LocalTax2ES=IRPF
-TypeLocaltax1ES=RE Type
-TypeLocaltax2ES=IRPF Type
-TypeES=Type
+TypeLocaltax1ES=RE Tip
+TypeLocaltax2ES=IRPF Tip
+TypeES=Tip
ThirdPartyEMail=%s
WrongCustomerCode=Cod Client invalid
WrongSupplierCode=Cod Furnizor invalid
@@ -259,8 +259,8 @@ AvailableGlobalDiscounts=Discounturi Absolute disponibile
DiscountNone=Niciunul
Supplier=Furnizor
CompanyList=Lista Societăţilor
-AddContact=Adaugă contact
-AddContactAddress=Adaugă contact
+AddContact=Creare contact
+AddContactAddress=Creare contact/adresă
EditContact=Editare contact
EditContactAddress=Editează contact
Contact=Contact
@@ -268,8 +268,8 @@ ContactsAddresses=Contacte
NoContactDefinedForThirdParty=Niciun contact definit pentru acest terţ
NoContactDefined=Niciun contact definit
DefaultContact=Contact Implicit
-AddCompany=Adaugă societate
-AddThirdParty=Adaugă un terţ
+AddCompany=Creare companie
+AddThirdParty=Creare terţ
DeleteACompany=Şterge o societate
PersonalInformations=Informaţii personale
AccountancyCode=Cod Contabilitate
@@ -367,10 +367,10 @@ ExportCardToFormat=Export fişă la format
ContactNotLinkedToCompany=Contact nelegat la un terţ
DolibarrLogin=Identificator utilizator
NoDolibarrAccess=Niciun acces utilizator
-ExportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ExportDataset_company_1=Terţi (societăţi / fundaţii/ persoane fizice) şi atribute
ExportDataset_company_2=Contacte şi atribute
-ImportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
-ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
+ImportDataset_company_1=Terţi (societăţi / fundaţii/ persoane fizice) şi atribute
+ImportDataset_company_2=Contacte / Adrese(ale terţilor sau nu) şi atribute
ImportDataset_company_3=Coordonate bancare
PriceLevel=Nivel de Pret
DeliveriesAddress=Adrese de livrare
@@ -379,8 +379,8 @@ DeliveryAddressLabel=Eticheta Adresei de livrare
DeleteDeliveryAddress=Ştergeţi o adresa de livrare
ConfirmDeleteDeliveryAddress=Sigur doriţi să ştergeţi această adresă de livrare?
NewDeliveryAddress=Adresa de livrare nouă
-AddDeliveryAddress=Adaugă adresa
-AddAddress=Adaugă adresa
+AddDeliveryAddress=Creare adresă
+AddAddress=Creare adresă
NoOtherDeliveryAddress=Nici o adresa alternativă de livrare definită
SupplierCategory=Categorie Furnizor
JuridicalStatus200=Independent
@@ -397,18 +397,18 @@ YouMustCreateContactFirst=Trebuie să creați e-mailuri de contact pentru terţi
ListSuppliersShort=Lista furnizori
ListProspectsShort=Lista prospecte
ListCustomersShort=Lista clienţi
-ThirdPartiesArea=Third parties and contact area
+ThirdPartiesArea=Zona Terţi şi contact
LastModifiedThirdParties=Ultimii %s terţi modificaţi
UniqueThirdParties=Total terţi unici
InActivity=Deschis
ActivityCeased=Închis
ActivityStateFilter=Statut Activitate
-ProductsIntoElements=List of products into %s
+ProductsIntoElements=Lista produselor in %s
CurrentOutstandingBill=Facturi in suspensie curente
OutstandingBill=Max. pentru facturi in suspensie
OutstandingBillReached=Max. atins pentru facturi in suspensie
MonkeyNumRefModelDesc=Retrimite numărulcu formatul %syymm-nnnn pentru codul de client și %syymm-nnnn pentru codul de furnizor unde YY este anul, mm este luna și nnnn este o secvență continuă și fără să revină la 0.
LeopardNumRefModelDesc=Codul este liber fîrî verificare. Acest cod poate fi modificat în orice moment.
-ManagingDirectors=Manager(s) name (CEO, director, president...)
-SearchThirdparty=Search thirdparty
-SearchContact=Search contact
+ManagingDirectors=Nume Manager(i) nume (CEO, director, preşedinte...)
+SearchThirdparty=Caută terţ
+SearchContact=Caută contact
diff --git a/htdocs/langs/ro_RO/compta.lang b/htdocs/langs/ro_RO/compta.lang
index 99e1ac8f6d334e801e73cba6b771363f178bce38..9323b0a493f0a66aa15b7a08b8494530e51024c8 100644
--- a/htdocs/langs/ro_RO/compta.lang
+++ b/htdocs/langs/ro_RO/compta.lang
@@ -4,7 +4,7 @@ AccountancyCard=Fişă Contabilitate
Treasury=Trezoreria
MenuFinancial=Financiar
TaxModuleSetupToModifyRules=Du-te la <a href="%s"> Configurare modul Taxe</a> pentru a modifica regulile de calcul
-TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> to modify rules for calculation
+TaxModuleSetupToModifyRulesLT=Du-te la <a href="%s">Companie setup </a> pentru a modifica regulile de calcul
OptionMode=Opţiunea pentru ţinerea contabilitate
OptionModeTrue=Opţiunea Venituri -Cheltuieli
OptionModeVirtual=Opţiunea Creanţe-Datorii
@@ -12,7 +12,7 @@ OptionModeTrueDesc=În acest context, se calculează cifra de afaceri de peste d
OptionModeVirtualDesc=În acest context, cifra de afaceri se calculează pe facturi (data de validare). Când aceste facturi se datorează, indiferent dacă acestea au fost plătite sau nu, ele sunt enumerate în cifra de afaceri de ieşire.
FeatureIsSupportedInInOutModeOnly=Caracteristicã disponibil doar în CREDITE-DEBTS Mod de contabilitate (a se vedea modul de configurare de contabilitate)
VATReportBuildWithOptionDefinedInModule=Sumele prezentate aici sunt calculate folosind regulile definite de modul de configurare fiscale.
-LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup.
+LTReportBuildWithOptionDefinedInModule=Sumele prezentate aici sunt calculate folosind regulile definite de modul de configurare Companie.
Param=Setări
RemainingAmountPayment=Suma rămasă de plată:
AmountToBeCharged=Suma totală de plată:
@@ -32,7 +32,7 @@ Profit=Profit
Balance=Sold
Debit=Debit
Credit=Credit
-Piece=Accounting Doc.
+Piece= Doc. contabilitate
Withdrawal=Retragere
Withdrawals=Retrageri
AmountHTVATRealReceived=TVA colectat
@@ -42,25 +42,25 @@ VATReceived=TVA-ul a primit
VATToCollect=TVA-ul pentru a colecta
VATSummary=TVA Sumar
LT2SummaryES=Balanţa IRPF
-LT1SummaryES=RE Balance
+LT1SummaryES=RE Sold
VATPaid=Plata TVA-ului
-SalaryPaid=Salary paid
+SalaryPaid=Plata salariu
LT2PaidES=IRPF plătit
-LT1PaidES=RE Paid
+LT1PaidES=RE Platit
LT2CustomerES=IRPF de vânzări
LT2SupplierES=IRPF achiziţii
-LT1CustomerES=RE sales
-LT1SupplierES=RE purchases
+LT1CustomerES=RE vanzări
+LT1SupplierES=RE cumpărări
VATCollected=TVA colectat
ToPay=De plată
ToGet=De rambursat
-SpecialExpensesArea=Area for all special payments
+SpecialExpensesArea=Zona pentru toate plăţile speciale
TaxAndDividendsArea=Zona taxe, contribuţii sociale şi dividende
SocialContribution=Contribuţie socială
SocialContributions=Contribuţii sociale
-MenuSpecialExpenses=Special expenses
+MenuSpecialExpenses=Cheltuieli speciale
MenuTaxAndDividends=Impozite şi dividende
-MenuSalaries=Salaries
+MenuSalaries=Salarii
MenuSocialContributions=Contribuţii sociale
MenuNewSocialContribution=Contribuţie nouă
NewSocialContribution=Contribuţie socială nouă
@@ -73,21 +73,21 @@ PaymentCustomerInvoice=Plată factură client
PaymentSupplierInvoice=Plată factură furnizor
PaymentSocialContribution=Plată contribuţie socială
PaymentVat=Plată TVA
-PaymentSalary=Salary payment
+PaymentSalary=Plata salariu
ListPayment=Listă plăţi
ListOfPayments=Lista plăţilor
ListOfCustomerPayments=Listă plăţi clienţi
ListOfSupplierPayments=Listă plăţi furnizori
DatePayment=Data Plata
-DateStartPeriod=Date start period
-DateEndPeriod=Date end period
+DateStartPeriod=Dată început perioadă
+DateEndPeriod=Dată sfârşit perioadă
NewVATPayment=Plata nouă TVA
newLT2PaymentES=Nou IRPF plată
-newLT1PaymentES=New RE payment
+newLT1PaymentES=Plată nouă RE
LT2PaymentES=IRPF de plata
LT2PaymentsES=IRPF Plăţi
-LT1PaymentES=RE Payment
-LT1PaymentsES=RE Payments
+LT1PaymentES=RE Plată
+LT1PaymentsES=RE Plăţi
VATPayment=Plată TVA
VATPayments=Plăţi TVA
SocialContributionsPayments=Plăţi contribuţii sociale
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad client contabile cod pentru %s
SuppliersProductsSellSalesTurnover=A cifrei de afaceri generate de vânzările de furnizorii de produse.
CheckReceipt=Borderou de cecuri remise
CheckReceiptShort=Borderou cecuri
+LastCheckReceiptShort=Ultimele %s cecuri remise
NewCheckReceipt=Discount nou
NewCheckDeposit=New verifica depozit
NewCheckDepositOn=New verifica depozit în contul: %s
@@ -123,12 +124,12 @@ CalcModeVATDebt=Mod <b>%s TVA pe baza contabilității de angajament %s</b>.
CalcModeVATEngagement=Mod <b>%s TVA pe baza venituri-cheltuieli%s.</b>
CalcModeDebt=Mod <b>%sCreanțe-Datorii%s</b> zisă <b> contabilitatea de angajamente</b>
CalcModeEngagement=Mod <b>%sVenituri- Cheltuieli%s</b> zisă <b> contabilitatea de casă</b>
-CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
-CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b>
-CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
-CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
-CalcModeLT2Debt=Mode <b>%sIRPF on customer invoices%s</b>
-CalcModeLT2Rec= Mode <b>%sIRPF on suppliers invoices%s</b>
+CalcModeLT1= Mode <b>%sRE pe facturi clienţi - facturi furnizori %s</b>
+CalcModeLT1Debt=Mode <b>%sRE pe facturi clienţi%s</b>
+CalcModeLT1Rec= Mode <b>%sRE pe facturi furnizori%s</b>
+CalcModeLT2= Mode <b>%sIRPF pe facturi clienţi - facturi furnizori%s</b>
+CalcModeLT2Debt=Mode <b>%sIRPF pe facturi clienţi%s</b>
+CalcModeLT2Rec= Mode <b>%sIRPF pe facturi furnizori%s</b>
AnnualSummaryDueDebtMode=Balanța de venituri și cheltuieli, rezumat anual
AnnualSummaryInputOutputMode=Balanța de venituri și cheltuieli, rezumat anual
AnnualByCompaniesDueDebtMode=Bilan des recettes et dpenses, dtail par niveluri, en <b>Mod %sCrances-Dettes %s</b> dit <b>comptabilit de angajament.</b>
@@ -143,15 +144,15 @@ RulesCAIn=- Ea include toate plăţile efective a facturilor primite de la clien
DepositsAreNotIncluded=- Facturile de depozit sunt nici nu sunt incluse
DepositsAreIncluded=- Facturile de depozit sunt incluse
LT2ReportByCustomersInInputOutputModeES=Raport de terţă parte IRPF
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
+LT1ReportByCustomersInInputOutputModeES=Raport pe terţ RE
VATReportByCustomersInInputOutputMode=Raport după TVA client colectat și plătit
VATReportByCustomersInDueDebtMode=Raport după TVA client colectat și plătit
VATReportByQuartersInInputOutputMode=Raport după rata TVA colectată și plătită
-LT1ReportByQuartersInInputOutputMode=Report by RE rate
-LT2ReportByQuartersInInputOutputMode=Report by IRPF rate
+LT1ReportByQuartersInInputOutputMode=Raport pe rată RE
+LT2ReportByQuartersInInputOutputMode=Raport pe rată IRPF
VATReportByQuartersInDueDebtMode=Raport după rata TVA colectată și plătită
-LT1ReportByQuartersInDueDebtMode=Report by RE rate
-LT2ReportByQuartersInDueDebtMode=Report by IRPF rate
+LT1ReportByQuartersInDueDebtMode=Raport pe rată RE
+LT2ReportByQuartersInDueDebtMode=Raport pe rată IRPF
SeeVATReportInInputOutputMode=A se vedea raportul <b>%sVAT encasement%s</b> pentru un calcul standard
SeeVATReportInDueDebtMode=A se vedea raportul <b>privind %sVAT flow%s</b> pentru un calcul, cu o opţiune de pe fluxul
RulesVATInServices=- Pentru servicii, raportul include regularizările de TVA efectiv primite sau emise pe baza datelor plăților.
@@ -187,23 +188,23 @@ AccountancyDashboard=Sinteză Contabilitate
ByProductsAndServices=După produse şi servicii
RefExt=Referinţă externă
ToCreateAPredefinedInvoice=Pentru a crea o factură predefinită, creaşi o factură standard, apoi, fără validarea aceasteia, faceți clic pe butonul"Converteşte ca factură predefinită".
-LinkedOrder=Link to order
+LinkedOrder=Link către comandă
ReCalculate=Recalculează
-Mode1=Method 1
+Mode1=Metoda 1
Mode2=Metoda 2
CalculationRuleDesc=Pentru a calcula totalul TVA, există două metode: <br> Metoda 1 este rotunjirea TVA-ului pe fiecare linie, apoi însumarea lor. <br> Metoda 2 este însumarea tututor TVA rilor de pe fiecare linie, apoi rotunjirea rezultatului. <br> Rezultatul final poate fi diferit cu câțiva cenți. Modul implicit este <b>%s</b>.
CalculationRuleDescSupplier=în funcție de furnizor, alege metoda potrivită pentru a aplica aceeași regulă de calcul și de a obține același rezultat așteptat de către furnizorul dumneavoastră.
TurnoverPerProductInCommitmentAccountingNotRelevant=Raportul cifra de afaceri pe produs, atunci când se utilizează modul <b>contabilitate de casă</b> nu este relevant. Acest raport este disponibil numai atunci când se utilizează modul <b>contabilitate de angajament</b> (a se vedea configurarea modulului de contabilitate).
CalculationMode=Mod calcul
-AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
-ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
-CloneTaxForNextMonth=Clone it for next month
+AccountancyJournal=Jurnal cod contabilitate
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Cont Contabilitate Predefinit pentru produsele cumpărate
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Cont Contabilitate Predefinit pentru produsele vândute
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Cont Contabilitate Predefinit pentru serviciile cumpărate
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Cont Contabilitate Predefinit pentru serviciile vândute
+ACCOUNTING_VAT_ACCOUNT=Cont Contabilitate Predefinit pentru TVA Colectată
+ACCOUNTING_VAT_BUY_ACCOUNT=Cont Contabilitate Predefinit pentru TVA Platită
+ACCOUNTING_ACCOUNT_CUSTOMER=Cont Contabilitate Predefinit pentru terţi Clienţi
+ACCOUNTING_ACCOUNT_SUPPLIER=Cont Contabilitate Predefinit pentru terţi Furnizori
+CloneTax=Clonaţi o contribuţie socială
+ConfirmCloneTax=Confirmaţi Clona contribuţie sociale
+CloneTaxForNextMonth=Clonaţi-o pentru luna următoare
diff --git a/htdocs/langs/ro_RO/contracts.lang b/htdocs/langs/ro_RO/contracts.lang
index 997550f117709ec73c8e2c51cedc07ff7e8e82ae..195c077ba0709c5b6c4c63a4ea0dc262e316bfd7 100644
--- a/htdocs/langs/ro_RO/contracts.lang
+++ b/htdocs/langs/ro_RO/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Zona Contracte
ListOfContracts=Lista contracte
-LastContracts=Ultimele %s contracte modificare
+LastModifiedContracts=Last %s modified contracts
AllContracts=Toate contractele
ContractCard=Fişă Contract
ContractStatus=Status Contract
@@ -27,7 +27,7 @@ MenuRunningServices=Servicii active
MenuExpiredServices=Servicii expirate
MenuClosedServices=Servicii închise
NewContract=Contract nou
-AddContract=Adaugă contract
+AddContract=Crează contract
SearchAContract=Caută contract
DeleteAContract=Şterge contract
CloseAContract=Închide contract
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Lista liniilor contractului in service
ListOfRunningServices=Lista servicii active
NotActivatedServices=Servicii inactive (printre contracte validate )
BoardNotActivatedServices=Servicii de activat în contractele validate
-LastContracts=Ultimele %s contracte modificare
+LastContracts=Last % contracts
LastActivatedServices=Ultimele %s servicii activate
LastModifiedServices=Ultimele %s servicii modificate
EditServiceLine=Editează linie serviciu
@@ -89,8 +89,8 @@ ListOfServicesToExpireWithDuration=Lista servicii care expiră în %s zile
ListOfServicesToExpireWithDurationNeg=Lista serviciilor expirate de mai bine de %s zile
ListOfServicesToExpire=Lista servicii care expiră
NoteListOfYourExpiredServices=Această listă conține numai serviciile pentru terții la care sunteţi reprezentant de vânzării.
-StandardContractsTemplate=Standard contracts template
-ContactNameAndSignature=For %s, name and signature:
+StandardContractsTemplate=Model standard Contracte
+ContactNameAndSignature=Pentru %s nume şi semnătura:
##### Types de contacts #####
TypeContact_contrat_internal_SALESREPSIGN=Reprezentant vanzari de semnare a contractului
diff --git a/htdocs/langs/ro_RO/cron.lang b/htdocs/langs/ro_RO/cron.lang
index c597305e2f9d39f80edf7114e3252cf50ad5e6e4..26edf119a79218ab7713d925d7d333a15cba4b72 100644
--- a/htdocs/langs/ro_RO/cron.lang
+++ b/htdocs/langs/ro_RO/cron.lang
@@ -1,22 +1,14 @@
# Dolibarr language file - Source file is en_US - cron
-#
# About page
-#
About = Despre
CronAbout = Despre Cron
CronAboutPage = Despre pagina cron
-
-#
# Right
-#
Permission23101 = Citeste sarcină programată
Permission23102 = Creare/Modificare sarcină programată
Permission23103 = Ştergeţi o sarcină programată
Permission23104 = Execută sarcină programată
-
-#
# Admin
-#
CronSetup= Setare Managementul joburilor programate
URLToLaunchCronJobs=URL-ul pentru a verifica și a lansa joburi cron, dacă este necesar
OrToLaunchASpecificJob=Sau pentru a verifica și a lansa un anumit job
@@ -24,20 +16,11 @@ KeyForCronAccess=Cheie de securitate pentru URL de lansare a joburilor cron
FileToLaunchCronJobs=Linie de comandă pentru lansare joburi cron
CronExplainHowToRunUnix=Pe mediul Unix veţi utiliza instrumentul crontab pentru a rula linia de comanda la fiecare minut
CronExplainHowToRunWin=Pe mediul Microsoft(tm) Windows puteţi utiliza instrumentul Scheduled task pentru a rula linia de comanda la fiecare minut
-
-
-#
# Menu
-#
CronJobs=Joburi programate
-CronListActive= Lista joburilor actice
-CronListInactive= Lista joburilor dezactivate
-CronListActive= Lista joburilor actice
-
-
-#
+CronListActive=List of active/scheduled jobs
+CronListInactive=Lista joburilor dezactivate
# Page list
-#
CronDateLastRun=Ultima rulare
CronLastOutput=Ieşirea ultimei rulări
CronLastResult=Codul ultimului rezultat
@@ -70,10 +53,7 @@ CronLabel=Descriere
CronNbRun=Nr. lansări
CronEach=Fiecare
JobFinished=Job lansat şi terminat
-
-#
#Page card
-#
CronAdd= Adaugă joburi
CronHourStart= Data şi Ora de start a sarcinii
CronEvery= Şi execută sarcina la fiecare
@@ -95,20 +75,12 @@ CronObjectHelp=Numele obiectului de încărcat. <BR> De exemplu să aducă metod
CronMethodHelp=Metoda obiectului de încărcat. <BR> De exemplu să aducă metoda de obiect Produs Dolibarr /htdocs/product/class/product.class.php, valoarea metodei este <i>fecth</i>
CronArgsHelp=Argumentele metodei . <BR> De exemplu să aducă metoda obiect ului Produs Dolibarr /htdocs/product/class/product.class.php, valoarea parametrilor pot fi este <i>0, ProductRef</i>
CronCommandHelp=Linia de comandă de sistem pentru a executa.
-
-#
# Info
-#
CronInfoPage=Informatie
-
-
-#
# Common
-#
CronType=Tip sarcină
CronType_method=Apel metodă a Clasei Dolibarr
CronType_command=Comandă shell
CronMenu=Cron
CronCannotLoadClass=Nu pot încărca clasa %s sau obiectul %s
-
UseMenuModuleToolsToAddCronJobs=Intrați în meniul ''Acasă - Instrumentele modulelor - Lista de job-uri'' pentru a vedea și edita job-urile programate.
diff --git a/htdocs/langs/ro_RO/deliveries.lang b/htdocs/langs/ro_RO/deliveries.lang
index 9d077cfb5c924f8ced78ba49fff5d3a229240ddb..78c832f8d85e18dfbec1cf85b106fd210b6d7028 100644
--- a/htdocs/langs/ro_RO/deliveries.lang
+++ b/htdocs/langs/ro_RO/deliveries.lang
@@ -23,4 +23,6 @@ GoodStatusDeclaration=Au primit bunurile în bună stare de mai sus,
Deliverer=Eliberator:
Sender=Expeditor
Recipient=Recipient
-# ErrorStockIsNotEnough=There's not enough stock
+ErrorStockIsNotEnough=Nu există stoc suficient
+Shippable=Livrabil
+NonShippable=Nelivrabil
diff --git a/htdocs/langs/ro_RO/donations.lang b/htdocs/langs/ro_RO/donations.lang
index 3a99e656af4c5246d012167926b6eac9f7c732d2..7f2399e4129514c262003162746ed2eb986c96b3 100644
--- a/htdocs/langs/ro_RO/donations.lang
+++ b/htdocs/langs/ro_RO/donations.lang
@@ -4,7 +4,7 @@ Donations=Donaţii
DonationRef=Ref. Donaţie
Donor=Donator
Donors=Donatori
-AddDonation=Adaugă o donaţie
+AddDonation=Crează o donaţie
NewDonation=Donaţie nouă
ShowDonation=Afişează donaţia
DonationPromise=Promisiune Donaţie
@@ -30,4 +30,9 @@ SearchADonation=Caută o donaţie
DonationRecipient=Beneficiar donaţie
ThankYou=Vă multumim
IConfirmDonationReception=Beneficiarul declară primirea, ca donaţie , a următoarei sume
-MinimumAmount=Minimum amount is %s
+MinimumAmount=Valoarea minimă este %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang
index ccec4530505a52d57a0e72fea1a388c395115378..21d11c437acbbf56bd5059ac34e142d1318e2418 100644
--- a/htdocs/langs/ro_RO/errors.lang
+++ b/htdocs/langs/ro_RO/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Sursa obiective şi conturi bancare trebuie să f
ErrorBadThirdPartyName=Bad valoarea de terţă parte nume
ErrorProdIdIsMandatory=%s este obligatoriu
ErrorBadCustomerCodeSyntax=Bad sintaxă pentru codul de client
-ErrorBadBarCodeSyntax=Bad syntax for bar code
+ErrorBadBarCodeSyntax=Bad sintaxă pentru furnizor cod
ErrorCustomerCodeRequired=Clientul codul necesar
ErrorBarCodeRequired=Cod de bare cerut
ErrorCustomerCodeAlreadyUsed=Clientul codul folosit deja
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Furnizor codul necesar
ErrorSupplierCodeAlreadyUsed=Furnizor de cod folosit deja
ErrorBadParameters=Bad parametrii
ErrorBadValueForParameter=Valoarea greşită "%s" incorecte "pentru parametrul de %s
-ErrorBadImageFormat=Fişier de imagine nu are un format acceptat
+ErrorBadImageFormat=Fișier de imagine nu are un format acceptat (PHP dvs. nu acceptă funcții pentru a converti imagini de acest format)
ErrorBadDateFormat="%s" Valoarea are formatul de dată greşit
ErrorWrongDate=Data nu este corecta!
ErrorFailedToWriteInDir=Nu a reuşit să scrie în directorul %s
@@ -65,9 +65,9 @@ ErrorNoValueForCheckBoxType=Completaţi valorile pentru lista checkbox
ErrorNoValueForRadioType=Completaţi valorile pentru lista radio
ErrorBadFormatValueList=Valorile din lista nu pot aveae mai mult de o virgulă: <b>% s </ b>, dar trebuie să aibă cel puțin una: cheie, valoare
ErrorFieldCanNotContainSpecialCharacters=<b>Câmp %s</b> trebuie să nu conţine caractere speciale.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case characters.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Câmpul <b>%s</b> nu trebuie să conțină caractere speciale, nici litere mari.
ErrorNoAccountancyModuleLoaded=Nu activat modul de contabilitate
-ErrorExportDuplicateProfil=This profile name already exists for this export set.
+ErrorExportDuplicateProfil=Acest profil nume există deja pentru acest set de export.
ErrorLDAPSetupNotComplete=Dolibarr-LDAP de potrivire nu este completă.
ErrorLDAPMakeManualTest=A. Ldif fişier a fost generat în directorul %s. Încercaţi să încărcaţi manual de la linia de comandă pentru a avea mai multe informatii cu privire la erori.
ErrorCantSaveADoneUserWithZeroPercentage=Nu se poate salva o acţiune cu "statut nu a început" în cazul în domeniu "realizat de către" este, de asemenea, completat.
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=User login <b>cu %s</b> nu a putut fi găsit.
ErrorLoginHasNoEmail=Acest utilizator nu are nici o adresa de e-mail. Procesul de anulată.
ErrorBadValueForCode=Bad valoare tipuri de cod. Încercaţi din nou cu o nouă valoare ...
ErrorBothFieldCantBeNegative=%s Domenii şi %s nu poate fi atât negativ
+ErrorQtyForCustomerInvoiceCantBeNegative=Cantitatea pentru linia unei facturi client nu poate fi negativa.
ErrorWebServerUserHasNotPermission=Contul de utilizator <b>%s</b> folosite pentru a executa serverul de web nu are permisiunea, pentru că
ErrorNoActivatedBarcode=Nici un tip de coduri de bare activat
ErrUnzipFails=Eşec la dezarhivarea fişierului %s cu ZipArchive
@@ -133,10 +134,10 @@ ErrorPHPNeedModule=Eroare, PHP trebuie să aibă modul <b>%s</b> instalat pentru
ErrorOpenIDSetupNotComplete=Trebuie setat fișier de configurare Dolibarr pentru a permite autentificarea OpenID, dar URL-ul serviciului OpenID nu este definit în constanta %s
ErrorWarehouseMustDiffers=Depozitul sursă și țintă trebuie să difere
ErrorBadFormat=Format gresit!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
-ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
-ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
-ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Eroare, acest membru nu este încă legat de nici un terţ. Link Membru catre un terţ ezistent sau creați un nou terţ înainte de crearea abonamentului cu factura.
+ErrorThereIsSomeDeliveries=Eroare, există unele livrări legate de acest transport. Ștergere refuzată.
+ErrorCantDeletePaymentReconciliated=Nu se poate șterge o plată care a generat o tranzacție bancară care a fost conciliată
+ErrorCantDeletePaymentSharedWithPayedInvoice=Nu se poate șterge o plată partajată de cel puțin un factură cu statutul platită
# Warnings
WarningMandatorySetupNotComplete=Parametri de setare obligatorii nu sunt încă definiţi
@@ -154,6 +155,6 @@ WarningCloseAlways=Atenţie, închiderea are loc chiar dacă suma diferă. Nu ac
WarningUsingThisBoxSlowDown=Atenție, folosind această casetă încetiniţi serios toate paginile ce arată caseta.
WarningClickToDialUserSetupNotComplete=Setările informațiilor ClickToDial pentru userul dvs. nu sunt complete (vezi tabul ClickToDial pe fişal dvs. de utilizator).
WarningNotRelevant=Operaţiuni irelevante pentru acest dataset
-WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
-WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
-WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funcţionalitate dezactivată atunci când configurarea de afișare este optimizată pentru nevăzători sau de browsere text .
+WarningPaymentDateLowerThanInvoiceDate=Data plăţii(%s) este mai veche decât data facturii (%s) pentru factura %s
+WarningTooManyDataPleaseUseMoreFilters=Prea multe date. Folosiţi mai multe filtre
diff --git a/htdocs/langs/ro_RO/exports.lang b/htdocs/langs/ro_RO/exports.lang
index c02839107b69989e1dc371da6fe87343ded28a76..8280d0ff21225b7d5ef0433c314144b8a48538c2 100644
--- a/htdocs/langs/ro_RO/exports.lang
+++ b/htdocs/langs/ro_RO/exports.lang
@@ -8,7 +8,7 @@ ImportableDatas=Importable de date
SelectExportDataSet=Alegeţi de date pe care doriţi să le export ...
SelectImportDataSet=Alegeţi de date pe care doriţi să o import ...
SelectExportFields=Alegeţi câmpurile pe care doriţi să le de export, sau selectaţi un profil predefinit de export
-SelectImportFields=Choose source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile:
+SelectImportFields=Alegeţi câmpurile din fișier sursă pe care doriți să importați și câmpurile lor țintă în baza de date mutând în sus și în jos cu ancora %s sau selectați un profil de import predefinit:
NotImportedFields=Domenii de fişier sursă nu importate
SaveExportModel=Salvaţi acest profil de export dacă aveţi de gând să-l refolosire mai târziu ...
SaveImportModel=Salvaţi acest profil de import dacă aveţi de gând să-l refolosire mai târziu ...
@@ -81,7 +81,7 @@ DoNotImportFirstLine=Nu de import prima linie a fişierului sursă
NbOfSourceLines=Numărul de linii în fişierul sursă
NowClickToTestTheImport=Verificaţi parametrii de import aţi definit. Dacă sunt corecte, faceţi clic pe butonul <b>"%s"</b> pentru a lansa o simulare a procesului de import (nu există date va fi schimbat în baza de date, e doar o simulare pentru moment) ...
RunSimulateImportFile=Lansarea simulare de import
-FieldNeedSource=This field requires data from the source file
+FieldNeedSource=Acest câmp cere date din fişierul sursă
SomeMandatoryFieldHaveNoSource=Unele câmpuri obligatorii nu au nicio sursă de date de la dosar
InformationOnSourceFile=Informaţii privind fişier sursă
InformationOnTargetTables=Informaţii privind domeniile-ţintă
@@ -102,14 +102,14 @@ NbOfLinesImported=Numărul de linii cu succes importate: <b>%s.</b>
DataComeFromNoWhere=Valoare pentru a introduce vine de nicăieri în fişierul sursă.
DataComeFromFileFieldNb=Valoare pentru a introduce <b>%s</b> vine de la numărul de câmp în fişierul sursă.
DataComeFromIdFoundFromRef=Valoare care vine de la <b>%s</b> numărul de câmp de fişier sursă vor fi utilizate pentru a găsi ID-ul de mamă obiectul pentru a utiliza (Deci <b>%s</b> Objet care a ref). Sursă de la dosar trebuie să există în Dolibarr.
-DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find id of parent object to use (So the code from source file must exists into dictionary <b>%s</b>). Note that if you know id, you can also use it into source file instead of code. Import should work in both cases.
+DataComeFromIdFoundFromCodeId=Codul care vine din câmpul numeric <b>%s</b> din fișier sursă va fi utilizat pentru a găsi id obiectului părinte pentru al folosi (Deci codul din fișierul sursă trebuie să existe în dicționarul<b>%s</b>). Rețineți că, dacă știți id ul, îl puteți utiliza, de asemenea în fișierul sursă în loc de cod. Import ar trebui să funcționeze în ambele cazuri.
DataIsInsertedInto=Datele provin din fişierul sursă va fi inserat în câmpul de următoarele:
DataIDSourceIsInsertedInto=Id-ul de mamă obiect găsit folosind datele din fişierul sursă, vor fi inserate în câmpul următoarele:
DataCodeIDSourceIsInsertedInto=ID-ul de linie de la mamă găsit codul, va fi introdus în câmpul următorul text:
SourceRequired=valoarea datelor este obligatorie
SourceExample=Exemplu de valoare posibilă de date
ExampleAnyRefFoundIntoElement=Orice Ref gasit pentru <b>%s</b> element
-ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary <b>%s</b>
+ExampleAnyCodeOrIdFoundIntoDictionary=Orice cod (sau id) găsit în dicţionarul <b>%s</b>
CSVFormatDesc=<b>Comma Separated Value</b> formatul de fişier (). Csv. <br> Acesta este un format de fişier text în care câmpurile sunt separate prin separatorul [%s]. În cazul în care se găseşte în interiorul separatorului cu un conţinut de domeniu, domeniu este rotunjit cu caracter rotunde [%s]. caracter Escape pentru a scăpa de caractere rundă este [%s].
Excel95FormatDesc=<b>Excel</b> format fişier (.xls) <br>Acesta este format nativ Excel 95 (BIFF5).
Excel2007FormatDesc=<b>Excel</b> format fişier (.xlsx) <br>Acesta este format nativ Excel 2007 (SpreadsheetML).
@@ -123,10 +123,10 @@ BankCode=Cod bancă
DeskCode=Cod birou
BankAccountNumber=Număr cont
BankAccountNumberKey=Cheie
-SpecialCode=Special code
-ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
-ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'>NNNNN' filters by lower values<br>'>NNNNN' filters by higher values
+SpecialCode=Cod special
+ExportStringFilter=%% permite înlocuirea unuia sau mai multor caractere in text
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filtrează după un an/lună/zi<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filtrează peste un rang de ani/luni/zile<br> > YYYY, > YYYYMM, > YYYYMMDD : filtrează pe toţi următorii ani/luni/zile<br> < YYYY, < YYYYMM, < YYYYMMDD : filtrează pe toşi precedenţii ani/luni/zile
+ExportNumericFilter='NNNNN' filtrează după o valoare<br>'NNNNN+NNNNN' filtrează peste un rang de valori<br>'>NNNNN' filtrează după valori mai mici<br>'>NNNNN' filtrează după valori mai mari
## filters
SelectFilterFields=Dacă doriți să filtrați pe anumite valori, doar introduceţi valorile aici.
FilterableFields=Câmpuri filtrabile
diff --git a/htdocs/langs/ro_RO/externalsite.lang b/htdocs/langs/ro_RO/externalsite.lang
index f0375862b3d771a7bfefa4c1a49a2af2617602d4..25f72b0bed90a852531e3bf828de99d2e634e44f 100644
--- a/htdocs/langs/ro_RO/externalsite.lang
+++ b/htdocs/langs/ro_RO/externalsite.lang
@@ -2,3 +2,4 @@
ExternalSiteSetup=Link-ul de instalare pentru site-ul extern
ExternalSiteURL=URL-ul site-ului extern
ExternalSiteModuleNotComplete=Modulul Site extern nu a fost configurat corespunzător.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/ro_RO/holiday.lang b/htdocs/langs/ro_RO/holiday.lang
index abd06541d7a5cac87d358f4554eb7e8a34cdc17a..1e22f40b9b82f70722bf8853ff1f08dcbe6b86e7 100644
--- a/htdocs/langs/ro_RO/holiday.lang
+++ b/htdocs/langs/ro_RO/holiday.lang
@@ -1,13 +1,13 @@
# Dolibarr language file - Source file is en_US - holiday
HRM=HRM
-Holidays=Leaves
-CPTitreMenu=Leaves
+Holidays=Concedii
+CPTitreMenu=Concedii
MenuReportMonth=Situaţia lunară
-MenuAddCP=Make a leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
-NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
-NoCPforUser=You don't have any available day.
-AddCP=Make a leave request
+MenuAddCP=Crează o cerere de concediu
+NotActiveModCP=Trebuie să activaţi modulul de concedii pentru a vedea această pagină.
+NotConfigModCP=Trebuie să configuraţi modulul Concedii pentru a vedea această pagină.Pentru aceasta , <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> clic aici </ a>.
+NoCPforUser=Nu mai aveţi nici o zi disponibilă
+AddCP=Crează o cerere de concediu
Employe=Angajat
DateDebCP=Dată început
DateFinCP=Dată sfărşit
@@ -18,24 +18,24 @@ ApprovedCP=Aprobat
CancelCP=Şters
RefuseCP=Refuzat
ValidatorCP=Aprobator
-ListeCP=List of leaves
-ReviewedByCP=Va fi revăzut de
+ListeCP=Listă cereri de concedii
+ReviewedByCP=Va fi aprobat de
DescCP=Descriere
-SendRequestCP=Create leave request
-DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Edit balance of leaves
-UpdateAllCP=Update the leaves
-SoldeCPUser=Leaves balance is <b>%s</b> days.
+SendRequestCP=Crează o cerere de concediu
+DelayToRequestCP=Cererile pentru concediu trebuiesc făcute cu cel puţin <b>%s zi(le)</b> înainte.
+MenuConfCP=Editează soldul concediilor
+UpdateAllCP=Actualizează concediile
+SoldeCPUser=Soldul concediilor este de <b>%s</b> zile.
ErrorEndDateCP=Trebuie să selectaţi data de sfârşit mai mare decât data de început.
ErrorSQLCreateCP=O eroare SQL întâlnită în timpul creării:
-ErrorIDFicheCP=An error has occurred, the leave request does not exist.
+ErrorIDFicheCP=O eroare a intervenit, cererea de concediu nu exista
ReturnCP=Înapoi la pagina precedentă
-ErrorUserViewCP=You are not authorized to read this leave request.
-InfosCP=Information of the leave request
+ErrorUserViewCP=Dvs nu aveti dreptul de a citi aceata cerere de concediu.
+InfosCP=Informaţii ale cererii de concediu
InfosWorkflowCP=Flux de lucru Informatii
RequestByCP=Solicitat de
-TitreRequestCP=Leave request
-NbUseDaysCP=Number of days of vacation consumed
+TitreRequestCP=Cereri de concedii
+NbUseDaysCP=Numărul de zile de concediu consumate
EditCP=Editare
DeleteCP=Ştergere
ActionValidCP=Validare
@@ -43,26 +43,25 @@ ActionRefuseCP=Refuzare
ActionCancelCP=Anulare
StatutCP=Status
SendToValidationCP=Trimite spre validare
-TitleDeleteCP=Delete the leave request
-ConfirmDeleteCP=Confirm the deletion of this leave request?
-ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
-CantCreateCP=You don't have the right to make leave requests.
-InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=Actualizare
-CantUpdate=You cannot update this leave request.
+TitleDeleteCP=Şterge cerere de concediu
+ConfirmDeleteCP=Confirmaţi ştergerea acestei cereri de concediu?
+ErrorCantDeleteCP=Eroare, dvs nu aveti drepturi de stergere acestei cereri de concediu.
+CantCreateCP=Nu aveţi drepturile de a face cereri de concediu
+InvalidValidatorCP=Dvs trebuie sa alegeti un aprobator pentru cererea dvs de concediu.
+CantUpdate=Nu puteţi actualiza această cerere de concediu.
NoDateDebut=Trebuie să selectaţi data de debut.
NoDateFin=Trebuie să selectaţi data de sfârşit.
ErrorDureeCP=Cererea dvs pentru concediu nu conţine zile lucrătoare.
-TitleValidCP=Aprobaţi cererile de concediu
-ConfirmValidCP=Are you sure you want to approve the leave request?
+TitleValidCP=Aprobă cererea de concediu
+ConfirmValidCP=Sunteţi sigur că doriţi să aprobaţi această cerere de concediu ?
DateValidCP=Data aprobării
-TitleToValidCP=Send leave request
-ConfirmToValidCP=Are you sure you want to send the leave request?
+TitleToValidCP=Trimite cererea de concediu
+ConfirmToValidCP=Sunteţi sigur că doriţi să trimiteţi această cerere de concediu?
TitleRefuseCP=Refuză cererea de concediu
-ConfirmRefuseCP=Are you sure you want to refuse the leave request?
+ConfirmRefuseCP=Sunteţi sigur că doriţi să refuzaţi această cerere de concediu?
NoMotifRefuseCP=Trebuie să alegeţi un motiv pentru refuzarea cererii.
TitleCancelCP=Anulează cererea de concediu
-ConfirmCancelCP=Are you sure you want to cancel the leave request?
+ConfirmCancelCP=Sunteţi sigur că doriţi să anulaţi cererea de concediu?
DetailRefusCP=Motivul refuzului
DateRefusCP=Data refuzului
DateCancelCP=Data anulării
@@ -72,8 +71,8 @@ MotifCP=Motiv
UserCP=Utilizator
ErrorAddEventToUserCP=O eroare a survenit in timpul adaugarii de concediu exceptional.
AddEventToUserOkCP=Adaugarea de concediu exceptional a fost efectuat
-MenuLogCP=View logs of leave requests
-LogCP=Log of updates of available vacation days
+MenuLogCP=Vezi logurile cererilor de concedii
+LogCP=Loguri al actualizărilor zilelor de concediu
ActionByCP=Realizat de
UserUpdateCP=Pentru utilizatorul
PrevSoldeCP=Soldul precedent
@@ -81,33 +80,33 @@ NewSoldeCP=Soldul nou
alreadyCPexist=O cerere de concediu a fost deja făcută pe această perioadă.
UserName=Nume
Employee=Angajat
-FirstDayOfHoliday=First day of vacation
-LastDayOfHoliday=Last day of vacation
+FirstDayOfHoliday=Prima zi a concediului
+LastDayOfHoliday=Ultima zi a concediului
HolidaysMonthlyUpdate=Actualizare lunară
ManualUpdate=Actualizare manuală
-HolidaysCancelation=Leave request cancelation
+HolidaysCancelation=Anulare cerere concediu
## Configuration du Module ##
ConfCP=Configurarea modulului concedii
DescOptionCP=Descrierea opţiunii
ValueOptionCP=Valoare
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Grup cu drepturi de aprobare a concediilor
ConfirmConfigCP=Validare configuraţie
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Ultima actualizare automată a concediilor
UpdateConfCPOK=Actualizare realizată.
ErrorUpdateConfCP=O eroare a apărut în timpul actualizării, încercaţi din nou.
-AddCPforUsers=Adaugaţi soldul concediului al utilizatorului la <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clic aici</a>.
-DelayForSubmitCP=Termen maxim de a aplica pentru concediu
+AddCPforUsers=Adaugaţi soldul concediului alocat utilizatorului la <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clic aici</a>.
+DelayForSubmitCP=Termen maxim de a face o cerere de concediu
AlertapprobatortorDelayCP=Previne aprobatorul daca cerere de concediu nu corespunde cu data limită
-AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
-nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
-Module27130Name= Management of leave requests
-Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
-TitleOptionEventCP=Settings of leave requets for events
+AlertValidatorDelayCP=Preveine aprobatorul dacă cererea de concediu depaseste perioada de anuntare
+AlertValidorSoldeCP=Previne aprobatorul daca utilizatorul cere zile de concediu ce depaseste soldul
+nbUserCP=Numarul utilizatorilor suportaţi în modulul concedii
+nbHolidayDeductedCP=Numărul zilelor de concediu de dedus pe zile de concediu luat
+nbHolidayEveryMonthCP=Numar de zile de concediu adaugate în fiecare lună
+Module27130Name= Managementul cererilor de concedii
+Module27130Desc= Managementul cererilor de concedii
+TitleOptionMainCP=Setări principale al cererilor de concedii
+TitleOptionEventCP=Setări cereri concedii pentru evenimente
ValidEventCP=Vaidare
UpdateEventCP=Evenimente actualizate
CreateEventCP=Creare
@@ -127,23 +126,23 @@ UpdateEventOptionCP=Modifică
ErrorMailNotSend=O eroare a intervenit la trimiterea mailului :
NoCPforMonth=Niciun concediu această lună.
nbJours=Număr zile
-TitleAdminCP=Configuration of Leaves
+TitleAdminCP=Configurarea modulului concedii
#Messages
Hello=Salut
-HolidaysToValidate=Validate leave requests
-HolidaysToValidateBody=Below is a leave request to validate
-HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
-HolidaysValidated=Validated leave requests
-HolidaysValidatedBody=Your leave request for %s to %s has been validated.
-HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled leaved request
-HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
-Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+HolidaysToValidate=Validează cereri concedii
+HolidaysToValidateBody=Mai jos este o cerere de concediu de validat
+HolidaysToValidateDelay=Această cerere de concediuva avea loc intr-o perioadă de mai puţin de %s zile.
+HolidaysToValidateAlertSolde=Utilizatorul care a făcut această cerere de concediu nu avea destule zile disponibile.
+HolidaysValidated=Cereri de concedii validate
+HolidaysValidatedBody=Cererea dvs pentru concediu pentru %s la %s a fost validată.
+HolidaysRefused=Cerere respinsă
+HolidaysRefusedBody=Cererea dvs pentru concediu pentru %s la %s a fost respinsă pentru următoul motiv:
+HolidaysCanceled=Cereri Concedii anulate
+HolidaysCanceledBody=Cererea dvs pentru concediu pentru %s la %s a fost anulată.
+Permission20000=Citeşte cererile de plecare proprii
+Permission20001=Crează/modifică cererile tale de concediu
+Permission20002=Creaează/modifică toate cererile de concediu
+Permission20003=Şterge cererile de concediu
+Permission20004=Configurare zile disponibile
+Permission20005=Revezi logurile ale cererilor de concedii modificate
+Permission20006=Citeşte raport concedii lunare
diff --git a/htdocs/langs/ro_RO/interventions.lang b/htdocs/langs/ro_RO/interventions.lang
index 9c30de5e36a151e8fa0a2e5d2d8d4d657313bc4d..2a22b3277cd36c536ffc749394c61b2f32ddee31 100644
--- a/htdocs/langs/ro_RO/interventions.lang
+++ b/htdocs/langs/ro_RO/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Intervenţie
Interventions=Intervenţii
InterventionCard=Fişă intervenţie
NewIntervention=Intervenţie nouă
-AddIntervention=Adaugă intervenţie
+AddIntervention=Crează intervenţie
ListOfInterventions=Lista intervenţii
EditIntervention=Editează intervenţie
ActionsOnFicheInter=Acţiuni privind intervenţia
@@ -24,12 +24,21 @@ NameAndSignatureOfInternalContact=Nume şi semnătură celui ce a intervenit:
NameAndSignatureOfExternalContact=Nume şi semnătură client:
DocumentModelStandard=Model standard document de intervenţii
InterventionCardsAndInterventionLines=Intervenţii şi linii ale intervenţiilor
-InterventionClassifyBilled=Classify "Billed"
-InterventionClassifyUnBilled=Classify "Unbilled"
+InterventionClassifyBilled=Clasează Facturat
+InterventionClassifyUnBilled=Clasează Nefacturat
StatusInterInvoiced=Facturat
RelatedInterventions=Intervenţii asociate
ShowIntervention=Afişează intervenţie
-SendInterventionRef=Submission of intervention %s
+SendInterventionRef=Trimiterea intervenţiei %s
+SendInterventionByMail=Trimite intervenţie prin Email
+InterventionCreatedInDolibarr=Intervenţia %s creată
+InterventionValidatedInDolibarr=Intervenţia %s validată
+InterventionModifiedInDolibarr=Intervenţia %s modificată
+InterventionClassifiedBilledInDolibarr=Intervenţia %s setată ca facturată
+InterventionClassifiedUnbilledInDolibarr=Intervenţia %s setată ca nefacturată
+InterventionSentByEMail=Intervenţia %s trimisă pe Email
+InterventionDeletedInDolibarr=Intervenţia %s ştearsă
+SearchAnIntervention=Caută o intervenţie
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Reprezentant urmărire intervenţie
TypeContact_fichinter_internal_INTERVENING=Realizator intervenţie
diff --git a/htdocs/langs/ro_RO/languages.lang b/htdocs/langs/ro_RO/languages.lang
index a7770f3b228c7412a357c6056ce1710bacee1ad5..9bed1e1f8a37aeef7021c17b6da23e87bc9f5646 100644
--- a/htdocs/langs/ro_RO/languages.lang
+++ b/htdocs/langs/ro_RO/languages.lang
@@ -10,7 +10,7 @@ Language_da_DA=Daneză
Language_da_DK=Daneză
Language_de_DE=Germană
Language_de_AT=Germană (Austria)
-Language_de_CH=German (Switzerland)
+Language_de_CH=Germană (Elveţia)
Language_el_GR=Greacă
Language_en_AU=Engleză (Australia)
Language_en_GB=Engleză (Marea Britanie)
@@ -20,9 +20,9 @@ Language_en_SA=Engleză (Arabia Saudită)
Language_en_US=Engleză (Statele Unite)
Language_en_ZA=Engleză (Africa de Sud)
Language_es_ES=Spaniolă
-Language_es_DO=Spanish (Dominican Republic)
+Language_es_DO=Spaniolă (Republica Dominicană)
Language_es_AR=Spaniolă (Argentina)
-Language_es_CL=Spanish (Chile)
+Language_es_CL=Spaniolă (Chile)
Language_es_HN=Spaniolă (Honduras)
Language_es_MX=Spaniolă (Mexic)
Language_es_PY=Spaniolă (Paraguay)
@@ -40,7 +40,7 @@ Language_fr_NC=Franceză (Noua Caledonie)
Language_he_IL=Ebraică
Language_hr_HR=Croat
Language_hu_HU=Maghiară
-Language_id_ID=Indonesian
+Language_id_ID=Indoneziană
Language_is_IS=Islandeză
Language_it_IT=Italiană
Language_ja_JP=Japoneză
@@ -61,7 +61,7 @@ Language_tr_TR=Turcă
Language_sl_SI=Slovenă
Language_sv_SV=Suedeză
Language_sv_SE=Suedeză
-Language_sq_AL=Albanian
+Language_sq_AL=Albaneză
Language_sk_SK=Slovacă
Language_th_TH=Tailandez
Language_uk_UA=Ucrainean
diff --git a/htdocs/langs/ro_RO/link.lang b/htdocs/langs/ro_RO/link.lang
index 8b1efb75ef372daf24c660017c22d0cda43189b8..8619983595489b2524efa0ddb13312032c32c74c 100644
--- a/htdocs/langs/ro_RO/link.lang
+++ b/htdocs/langs/ro_RO/link.lang
@@ -1,8 +1,8 @@
-LinkANewFile=Link a new file/document
-LinkedFiles=Linked files and documents
-NoLinkFound=No registered links
-LinkComplete=The file has been linked successfully
-ErrorFileNotLinked=The file could not be linked
-LinkRemoved=The link %s has been removed
-ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
-ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
+LinkANewFile=Link fişier/document nou
+LinkedFiles=Fişiere şi documente ataşate
+NoLinkFound=Niciun link inregistrat
+LinkComplete=Fişierul a fost ataşat cu succes
+ErrorFileNotLinked=Fişierul nu a putut fi ataşat
+LinkRemoved=Linkul %s a fost înlăturat
+ErrorFailedToDeleteLink= Eşec la înlăturarea linkului '<b>%s</b>'
+ErrorFailedToUpdateLink= Eşec la modificarea linkului '<b>%s</b>'
diff --git a/htdocs/langs/ro_RO/mails.lang b/htdocs/langs/ro_RO/mails.lang
index e5394eeffc5c508cd94ab666e9fb586bc42d87d5..1ab3e168ebbf35fef9520bee96cda12f039a1324 100644
--- a/htdocs/langs/ro_RO/mails.lang
+++ b/htdocs/langs/ro_RO/mails.lang
@@ -79,14 +79,14 @@ MailtoEMail=Hyper link către email
ActivateCheckRead=Permite utiliyarea linkului "Dezabonare"
ActivateCheckReadKey=Utilizaţi cheia pentru a cripta URL-ul folosit pentru funcţiunile "Confirmare de citire" și "Dezabonare"
EMailSentToNRecipients=EMail trimis la %s destinatari.
-XTargetsAdded=<b>%s</b> recipients added into target list
-EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
-MailTopicSendRemindUnpaidInvoices=Reminder of invoice %s (%s)
-SendRemind=Send reminder by EMails
-RemindSent=%s reminder(s) sent
-AllRecipientSelectedForRemind=All thirdparties selected and if an email is set (note that one mail per invoice will be sent)
-NoRemindSent=No EMail reminder sent
-ResultOfMassSending=Result of mass EMail reminders sending
+XTargetsAdded=<b>%s</b> destinatari adăugaţi în lista target
+EachInvoiceWillBeAttachedToEmail=Un document folosind modelul implicit al documentului va fi creat și atașat la fiecare e-mail.
+MailTopicSendRemindUnpaidInvoices=Memento la factura %s (%s)
+SendRemind=Trimite memento prin e-mailuri
+RemindSent=%s Memento(ri) trimise
+AllRecipientSelectedForRemind=Toţi terţii selectaţi ţi dacă un e-mail este setat (rețineți că un email pe factură va fi trimis)
+NoRemindSent=Niciun email de relansare trimis
+ResultOfMassSending=Rezultatul trimiterii in masa prin email a relansării
# Libelle des modules de liste de destinataires mailing
MailingModuleDescContactCompanies=De contact ale tuturor părţilor terţe (client, perspectiva, furnizor, ...)
@@ -115,12 +115,12 @@ SentBy=Trimis de
MailingNeedCommand=Din motive de securitate, trimiterea unui email-uri este mai bine cand este efectuată de la linia de comandă. Dacă aveți unul, întrebați administratorul pentru a lansa următoarea comandă pentru a trimite email-uri la toți destinatarii:
MailingNeedCommand2=Puteţi, totuşi, trimite-le on-line, prin adăugarea parametrului MAILING_LIMIT_SENDBYWEB cu valoare de numărul maxim de mesaje de poştă electronică pe care doriţi să o trimiteţi prin sesiuni.
ConfirmSendingEmailing=Dacă nu puteţi sau preferaţi să le trimiteţi cu browser-ul web, vă rugăm să confirmați că sunteți sigur că doriți să trimiteți emailurile acum de la browser-ul dvs.?
-LimitSendingEmailing=Notă: Trimiterea online a emailurilor sunt limitate din motive de securitate şi timeout către <b>%s</b> destinatari pe sesiune de trimiterea .
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=Cer senin lista
ToClearAllRecipientsClickHere=Pentru a goli beneficiarilor lista pentru acest email-uri, faceţi clic pe butonul
ToAddRecipientsChooseHere=Pentru a adăuga destinatari, alegeţi din aceste liste
NbOfEMailingsReceived=Mass emailings primit
-NbOfEMailingsSend=Mass emailings sent
+NbOfEMailingsSend=Trimitere emailuri in masa
IdRecord=ID-ul de înregistrare
DeliveryReceipt=Livrarea Chitanţă
YouCanUseCommaSeparatorForSeveralRecipients=Aveţi posibilitatea de a utiliza <b>comma</b> separator pentru a specifica mai mulţi destinatari.
@@ -133,6 +133,9 @@ Notifications=Anunturi
NoNotificationsWillBeSent=Nu notificări prin email sunt planificate pentru acest eveniment şi a companiei
ANotificationsWillBeSent=1 notificarea va fi trimis prin e-mail
SomeNotificationsWillBeSent=%s notificări vor fi trimise prin e-mail
-AddNewNotification=Activaţi-o nouă notificare cerere
-ListOfActiveNotifications=Lista tuturor notificărilor activă a cererilor
+AddNewNotification=Activaţi un nou target email notificari
+ListOfActiveNotifications=Lista tuturor targetelor emailurilor de notificare
ListOfNotificationsDone=Lista toate notificările e-mail trimis
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
index d36e70a2bbc55d97c8635c0150902bdbb9b55152..090c392f0afcb32b34d1b2b22a6633e19ddf7524 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Utilizatorul<b>%s</b> negăsit în baza
ErrorNoVATRateDefinedForSellerCountry=Eroare, nici o cota de TVA definită pentru ţara '% s'.
ErrorNoSocialContributionForSellerCountry=Eroare, nici un tip de contribuții sociale definite pentru țara '% s'.
ErrorFailedToSaveFile=Eroare, salvarea fişierului eşuată.
-ErrorOnlyPngJpgSupported=Eroare, numai formatele .jpg şi .png sunt acceptate.
-ErrorImageFormatNotSupported=PHP dvs nu acceptă funcții pentru a converti imagini de acest format.
SetDate=setează data
SelectDate=selectează data
SeeAlso=Vezi şi %s
BackgroundColorByDefault=Culoarea de fundal implicită
+FileNotUploaded=Fişierul nu a fost încărcat
+FileUploaded=Fişierul a fost încărcat cu succes
FileWasNotUploaded=Un fișier este selectat pentru atașament, dar nu a fost încă încărcat. Clic pe "Ataşează fișier" pentru aceasta.
NbOfEntries=Nr intrări
GoToWikiHelpPage=Citeşte Ajutorul (e nevoie de acces la Internet)
@@ -266,6 +266,7 @@ Afternoon=După amiază
Quadri=Trimestru
MonthOfDay=Luna curentă
HourShort=H
+MinuteShort=mn
Rate=Rată
UseLocalTax=Include taxa
Bytes=Bytes
@@ -340,6 +341,7 @@ FullList=Lista completă
Statistics=Statistici
OtherStatistics=Alte statistici
Status=Status
+Favorite=Favorite
ShortInfo=Info.
Ref=Ref.
RefSupplier=Ref. furnizor
@@ -365,6 +367,7 @@ ActionsOnCompany=Evenimente privind acest terţ
ActionsOnMember=Evenimente privind acest membru
NActions=%s Evenimente
NActionsLate=%s întârziat
+RequestAlreadyDone=Cerere deja înregistrată
Filter=Filtru
RemoveFilter=Îndepărtați filtrul
ChartGenerated=Grafice generate
@@ -679,7 +682,7 @@ ViewPrivateNote=Vezi notițe
XMoreLines=%s linii(e) ascunse
PublicUrl=URL Public
AddBox=Adauga box
-
+SelectElementAndClickRefresh=Selectează un element şi click Refresh
# Week day
Monday=Luni
Tuesday=Marţi
diff --git a/htdocs/langs/ro_RO/margins.lang b/htdocs/langs/ro_RO/margins.lang
index 11727a96c022edeb0a3e42135e06037528523b05..93c5976147a86a66b1e0c96bc126c8bdd75d1d97 100644
--- a/htdocs/langs/ro_RO/margins.lang
+++ b/htdocs/langs/ro_RO/margins.lang
@@ -10,24 +10,18 @@ MarkRate=Rată marcă
DisplayMarginRates=Afişează ratele marjă
DisplayMarkRates=Afişează rate marcă
InputPrice=Preţ intrare
-
margin=Managementul marje profit
margesSetup=Setare Management marje profit
-
MarginDetails=Detalii Marjă
-
ProductMargins=Marjă Produs
CustomerMargins=Marje Client
-SalesRepresentativeMargins=Sales representative margins
-
+SalesRepresentativeMargins=Marje Reprezentanţi vănzări
ProductService=Produs sau serviciu
AllProducts=Toate produsele şi serviciile
ChooseProduct/Service=Alege produs sau serviciu
-
StartDate=Dată început
EndDate=Dată sfîrşit
Launch=Start
-
ForceBuyingPriceIfNull=Forţează preţul de cumpărare dacă e null
ForceBuyingPriceIfNullDetails=daca "ON", marja va fi zero pe linie (pret cumparare= pret vanzare), altfel("OFF"), marja va fi egala cu pretul de vanzare pentru aceasta linie (pret cumparare = 0).
MARGIN_METHODE_FOR_DISCOUNT=Metoda marje pentru discounturi globale
@@ -35,16 +29,16 @@ UseDiscountAsProduct=Ca produs
UseDiscountAsService=Ca serviciu
UseDiscountOnTotal=Pe subtotal
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Definiti daca discontul global e tratat ca un produs, serviciu, sau numai pe total la calcularea marjei.
-
MARGIN_TYPE=Tip Marjă
MargeBrute=Marja brută
MargeNette=Marja netă
MARGIN_TYPE_DETAILS=Marja brută: Preţ vânzare - Preţ cumpărare<br/> Marja netă : Preţ vânzare - Cost de preţ
-
CostPrice=Preţ de cost
BuyingCost=Preţ de cost
UnitCharges=Cheluieli unitare
Charges=Cheltuieli
-
AgentContactType=Tip contact agent comercial
-AgentContactTypeDetails=Defineşte ce tip de contact ( legat pe factură) va fi utilizat pentru raportul marjei pe agenţi comerciali
+AgentContactTypeDetails=Defineşte ce tip de contact ( legat pe factură) va fi utilizat pentru raportul marjei pe reprezentanti de vânzări
+rateMustBeNumeric=Rata trebuie să fie numerică
+markRateShouldBeLesserThan100=Rata mîrcii trebuie să fie mai mica de 100
+ShowMarginInfos=Arată informaţii marjă
diff --git a/htdocs/langs/ro_RO/opensurvey.lang b/htdocs/langs/ro_RO/opensurvey.lang
index 5d96afed81fe6737f8e7c6d5f0bd6f40acd6c3ae..fc26a38bace766772e97e872be8e08263ee58f01 100644
--- a/htdocs/langs/ro_RO/opensurvey.lang
+++ b/htdocs/langs/ro_RO/opensurvey.lang
@@ -1,18 +1,18 @@
# Dolibarr language file - Source file is en_US - opensurvey
-# Survey=Poll
-# Surveys=Polls
-# OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select type of poll...
-# NewSurvey=New poll
-# NoSurveysInDatabase=%s poll(s) into database.
-# OpenSurveyArea=Polls area
-# AddACommentForPoll=You can add a comment into poll...
+Survey=Sondaj
+Surveys=Sondaje
+OrganizeYourMeetingEasily=Organizeaza intalnirile și sondaje dvs cu ușurință. Mai întâi selectați tipul sondajului ...
+NewSurvey=Sondaj nou
+NoSurveysInDatabase=%s sondaj(e) in baza de date
+OpenSurveyArea=Zona Sondaje
+AddACommentForPoll=Puteţi adăuga un comentariu în sondaj...
AddComment=Adaugă comentariu
CreatePoll=Creaţi sondaj
PollTitle=Titlu sondaj
-# ToReceiveEMailForEachVote=Receive an email for each vote
+ToReceiveEMailForEachVote=Primeşte unui email pentru fiecare vot
TypeDate=Tip dată
TypeClassic=Tip standard
-# OpenSurveyStep2=Select your dates amoung the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it
+OpenSurveyStep2=Selectati datele între zilele libere (gri). Zilele selectate sunt în verde Puteți deselecta o zi selectată anterior, făcând clic din nou pe ea
RemoveAllDays=Elimină toate zilele
CopyHoursOfFirstDay=Copiază orelele ale primei zile
RemoveAllHours=Elimină toate orele
@@ -20,14 +20,14 @@ SelectedDays=Zile selectate
TheBestChoice=CEa mai bună alegere curentă este
TheBestChoices=Cea mai bună alegere curentă are
with=cu
-# OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.
+OpenSurveyHowTo=Dacă sunteți de acord să votaţi în acest sondaj, va trebui să vă dați numele, alegeți valorile ce se potrivesc cel mai bine pentru dvs și validați cu butonul plus, de la capătul liniei.
CommentsOfVoters=Comentariul voturilor
ConfirmRemovalOfPoll=Sunteţi sigur că doriţi să înlăturaţi acest sondaj ( şi toate voturile)
RemovePoll=Înlătură sondajul
-# UrlForSurvey=URL to communicate to get a direct access to poll
-# PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll:
-# CreateSurveyDate=Create a date poll
-# CreateSurveyStandard=Create a standard poll
+UrlForSurvey=URL-ul pentru comunicare să obțină acces direct la sondaj
+PollOnChoice=Dvs. creaţi un sondaj pentru a face un sondaj multi-alegere . Introduceți mai întâi toate opțiunile posibile pentru sondajul dvs:
+CreateSurveyDate=Creare sondaj date
+CreateSurveyStandard=Creare sondaj standard
CheckBox=Simplu checkbox
YesNoList=Listă (goală/da/nu)
PourContreList=Listă (goală/pentru/impotrivă)
@@ -35,7 +35,7 @@ AddNewColumn=Adaugă coloană nouă
TitleChoice=Etichetă Alegere
ExportSpreadsheet=Exportă rezultatul în foaie de calcul
ExpireDate=Data limită
-# NbOfSurveys=Number of polls
+NbOfSurveys=Numărul sondajelor
NbOfVoters=Nr-ul voturilor
SurveyResults=Rezultate
PollAdminDesc=Vi se permite să schimbaţi toate liniile de vot ale acestui sondaj cu butonul "Editează". Puteți, de asemenea, elimina o coloană sau o linie cu % s. Puteți adăuga, de asemenea, o nouă coloană cu % s.
@@ -53,14 +53,14 @@ AddEndHour=Adaugă o oră de final
votes=vot( uri)
NoCommentYet=Niciun comentariu nu a fost postat încă pentru acest sondaj
CanEditVotes=Puteţi schimba votul altora
-# CanComment=Voters can comment in the poll
-# CanSeeOthersVote=Voters can see other people's vote
+CanComment=Votanţii pot comenta in sondaj
+CanSeeOthersVote=Votanţii pot vedea votul celorlarţi
SelectDayDesc=Pentru fiecare zi selectată, puteți alege, sau nu, orele întălnirii în următorul format: <br>- gol,<br>- "8h", "8H" or "8:00" pentru a da ora de start a întâlnirii, <br> - "8-11", "8h-11h", "8H-11H" or "8:00-11:00" pentru a da startul și ora finală, <br> - ""8h15-11h15", "8H15-11H15" or "8:15-11:15" pentru același lucru, dar cu minute.
BackToCurrentMonth=Înapoi la luna curentă
-# ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation
-# ErrorOpenSurveyOneChoice=Enter at least one choice
-# ErrorOpenSurveyDateFormat=Date must have the format YYYY-MM-DD
-# ErrorInsertingComment=There was an error while inserting your comment
-# MoreChoices=Enter more choices for the voters
-# SurveyExpiredInfo=The voting time of this poll has expired.
-# EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
+ErrorOpenSurveyFillFirstSection=Nu ati completat prima secțiune a creării sondaj
+ErrorOpenSurveyOneChoice=Introduceţi cel puţin o alegere
+ErrorOpenSurveyDateFormat=Data trebuie să aiba formatul YYYY-MM-DD
+ErrorInsertingComment=Era o eroare când se insera comentariul dvs.
+MoreChoices=Introdu mai multe opţiuni pentru votanţi
+SurveyExpiredInfo=Timpul pentru votarea acestui sondaj a expirat
+EmailSomeoneVoted=%sa completat o linie.\nPuteţi găsi sondajul dvs. la linkul: \n%s
diff --git a/htdocs/langs/ro_RO/orders.lang b/htdocs/langs/ro_RO/orders.lang
index 91d54bc413e8c748cc9c0904dfb1a5b60356ee37..579ae622ecc679516f86a7fbef33becc523c678e 100644
--- a/htdocs/langs/ro_RO/orders.lang
+++ b/htdocs/langs/ro_RO/orders.lang
@@ -53,9 +53,9 @@ ShippingExist=O expediţie există
DraftOrWaitingApproved=Comenzi Schiţe sau încă neaprobate
DraftOrWaitingShipped=Comenzi Schiţe sau validate încă neexpediate
MenuOrdersToBill=Comenzi livrate
-MenuOrdersToBill2=Comenzi de facturat
+MenuOrdersToBill2=Billable orders
SearchOrder=Caută Comanda
-# SearchACustomerOrder=Search a customer order
+SearchACustomerOrder=Caută o comandă client
ShipProduct=Expediază produs
Discount=Discount
CreateOrder=Crează Comanda
@@ -65,7 +65,7 @@ ValidateOrder=Validează comanda
UnvalidateOrder=Devalidează comandă
DeleteOrder=Şterge comada
CancelOrder=Anulează comanda
-AddOrder=Adaugă comanda
+AddOrder=Crează comanda
AddToMyOrders=Adaugă la comenzile mele
AddToOtherOrders=Adauga la alte comenzi
AddToDraftOrders=Adaugă la comanda schiţă
@@ -101,7 +101,6 @@ RelatedOrders=Comenzi reatasate
OnProcessOrders=Comenzi în curs de tratare
RefOrder=Ref. comanda
RefCustomerOrder=Ref. Comandă Client
-CustomerOrder=Comandă client
RefCustomerOrderShort=Ref. Com. Client
SendOrderByMail=Trimite comanda prin e-mail
ActionsOnOrder=Evenimente pe comanda
@@ -132,8 +131,6 @@ Error_COMMANDE_ADDON_NotDefined=Constanta COMMANDE_ADDON nedefinită
Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Eşec la încărcarea fișierului modul '%s'
Error_FailedToLoad_COMMANDE_ADDON_File=Eşec la încărcarea fișierului modul '%s'
Error_OrderNotChecked=Nici o comandă de facturat selectată
-
-
# Sources
OrderSource0=Propunere Comercială
OrderSource1=Internet
@@ -144,7 +141,6 @@ OrderSource5=Comercial
OrderSource6=Magazin
QtyOrdered=Cant. comandată
AddDeliveryCostLine=Adaugă o linie cost livrare indicând greutatea comenzii
-
# Documents models
PDFEinsteinDescription=Un model complet pentru (logo. ..)
PDFEdisonDescription=Un simplu pentru model
@@ -155,14 +151,12 @@ OrderByFax=Fax
OrderByEMail=Email
OrderByWWW=Online
OrderByPhone=Telefon
-
CreateInvoiceForThisCustomer=Comenzi facturate
NoOrdersToInvoice=Nici o comandă facturabilă
CloseProcessedOrdersAutomatically=Clasează automat "Procesat" toate comenzile selectate.
-MenuOrdersToBill2=Comenzi de facturat
OrderCreation=Creare comandă
Ordered=Comandat
OrderCreated=Comenzile dvs au fost generate
OrderFail=O eroare întâlnită în timpul creării comezilor dvs
CreateOrders=Crează Comenzi
-# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+ToBillSeveralOrderSelectCustomer=Pentru crearea unei facturi pentru câteva comenzi, click mai întâi pe client apoi alege "%s".
diff --git a/htdocs/langs/ro_RO/oscommerce.lang b/htdocs/langs/ro_RO/oscommerce.lang
deleted file mode 100644
index ee9094a377d2dda6b7211b8c30df12e830d1f91a..0000000000000000000000000000000000000000
--- a/htdocs/langs/ro_RO/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=OS Commerce modul de configurare
-OSCommerceSetupSaved=OS Commerce setup salvate
-OSCommerceServer=Sistem de operare server gazdă Comert / IP
-OSCommerceDatabaseName=OS Commerce denumirea de baze de date
-OSCommercePrefix=OS Commerce tabele prefix
-OSCommerceUser=OS Commerce baza de date de login
diff --git a/htdocs/langs/ro_RO/other.lang b/htdocs/langs/ro_RO/other.lang
index 1c7e44a33a6a0a21365138ffa12f52acf7781f27..8d336efc6fffb56343b933fd8cd56cb9ca82a5fa 100644
--- a/htdocs/langs/ro_RO/other.lang
+++ b/htdocs/langs/ro_RO/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=Cod de securitate
Calendar=Calendar
-AddTrip=Adaugă Deplasare
Tools=Instrumente
ToolsDesc=Aceasta zona este dedicata instrumentele grup nu diverse disponibile în meniul de alte intrări. <br><br> Aceste instrumente se poate ajunge din meniul de pe partea.
Birthday=Zi de naştere
@@ -17,14 +16,14 @@ Notify_ORDER_SUPPLIER_APPROVE=Furnizor pentru a aprobat
Notify_ORDER_SUPPLIER_REFUSE=Furnizor pentru a refuzat
Notify_ORDER_VALIDATE=Comandă client validată
Notify_PROPAL_VALIDATE=Propunere client validată
-Notify_PROPAL_CLOSE_SIGNED=Customer propal closed signed
-Notify_PROPAL_CLOSE_REFUSED=Customer propal closed refused
+Notify_PROPAL_CLOSE_SIGNED=Propunere client semnată inchisă
+Notify_PROPAL_CLOSE_REFUSED=Propunere client refuzată inchisă
Notify_WITHDRAW_TRANSMIT=Transmitere de retragere
Notify_WITHDRAW_CREDIT=Credit de retragere
Notify_WITHDRAW_EMIT=Isue retragere
Notify_ORDER_SENTBYMAIL=Comanda clientului trimise prin poştă
Notify_COMPANY_CREATE=Terţ a creat
-Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
+Notify_COMPANY_SENTBYMAIL=Emailuri trimise din cardul terţului
Notify_PROPAL_SENTBYMAIL=Propunerea comercial trimise prin poştă
Notify_BILL_PAYED=Factura platita clienţilor
Notify_BILL_CANCEL=Factura client anulat
@@ -34,20 +33,21 @@ Notify_ORDER_SUPPLIER_SENTBYMAIL=Pentru furnizorul trimis prin e-mail
Notify_BILL_SUPPLIER_VALIDATE=Factura furnizorului validate
Notify_BILL_SUPPLIER_PAYED=Factura platita cu furnizorul
Notify_BILL_SUPPLIER_SENTBYMAIL=Factura Furnizor trimise prin poştă
-Notify_BILL_SUPPLIER_CANCELED=Supplier invoice cancelled
+Notify_BILL_SUPPLIER_CANCELED=Factură Furnizor anulată
Notify_CONTRACT_VALIDATE=Contract validate
Notify_FICHEINTER_VALIDATE=De intervenţie validate
Notify_SHIPPING_VALIDATE=Transport validate
Notify_SHIPPING_SENTBYMAIL=Transport trimise prin poştă
Notify_MEMBER_VALIDATE=Membru validate
-Notify_MEMBER_MODIFY=Member modified
+Notify_MEMBER_MODIFY=Membru modificat
Notify_MEMBER_SUBSCRIPTION=Membru subscris
Notify_MEMBER_RESILIATE=Membru reziliat
Notify_MEMBER_DELETE=Membre elimină
-Notify_PROJECT_CREATE=Project creation
-Notify_TASK_CREATE=Task created
-Notify_TASK_MODIFY=Task modified
-Notify_TASK_DELETE=Task deleted
+Notify_PROJECT_CREATE=Creare proiect
+Notify_TASK_CREATE=Task creat
+Notify_TASK_MODIFY=Task modificat
+Notify_TASK_DELETE=Task sters
+SeeModuleSetup=Vezi setare modul
NbOfAttachedFiles=Numărul de ataşat fişiere / documente
TotalSizeOfAttachedFiles=Total marimea ataşat fişiere / documente
MaxSize=Mărimea maximă a
@@ -57,14 +57,14 @@ Miscellaneous=Diverse
NbOfActiveNotifications=Număr de notificări
PredefinedMailTest=Acesta este un e-mail de test. \\ NMesajul două linii sunt separate printr-un retur de car.
PredefinedMailTestHtml=Acesta este un e-mail <b>de testare</b> (test de cuvânt trebuie să fie în aldine). <br> Cele două linii sunt separate printr-un retur de car.
-PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nVeţi găsi aici factura __FACREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ \n\n Am dori să vă avertizăm că factura __FACREF__ pare a nu fi platită. Deci, vă ataşăm din nou factura, ca un memento. \n\n__PERSONALIZED__ Cu respect \n\n__SIGNATURE__
+PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nVeţi găsi aici propunerea comercială__PROPREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__
+PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nVeţi găsi aici comanda __ORDERREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYVeţi găsi aici comanda noastră__ORDERREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nVeţi găsi aici factura __FACREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__
+PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nVeţi găsi aici livrarea __SHIPPINGREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__
+PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nVeţi găsi aici intervenţia__FICHINTERREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__
PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
DemoDesc=Dolibarr este un compact ERP / CRM compus din mai multe module funcţionale. Un demo care include toate modulele nu înseamnă nimic, deoarece aceasta nu se produce. Deci, mai multe demo-profile sunt disponibile.
ChooseYourDemoProfil=Alegeţi demo care se potrivesc cu profilul de activitate ...
@@ -80,6 +80,16 @@ ModifiedBy=Modificat de %s
ValidatedBy=Validate de %s
CanceledBy=Anulată de către %s
ClosedBy=Închise de %s
+CreatedById=Id Utilizator care a creat
+ModifiedById=Id Utilizator care a făcut ultima modificare
+ValidatedById=Id Utilizator care a validat
+CanceledById=Id Utilizator care a anulat
+ClosedById=Id Utilizator care a închis
+CreatedByLogin=Login Utilizator care a creat
+ModifiedByLogin=Login Utilizator care a facut ultima modificare
+ValidatedByLogin=Login Utilizator care a validat
+CanceledByLogin=Login Utilizator care a anulat
+ClosedByLogin=Login Utilizator care a inchis
FileWasRemoved=Fişier a fost şters
DirWasRemoved=Director a fost eliminat
FeatureNotYetAvailableShort=Disponibil într-o versiune viitoare
@@ -193,25 +203,26 @@ ForgetIfNothing=Dacă nu ați solicitat această schimbare, ignoraţi acest e-ma
##### Calendar common #####
AddCalendarEntry=Adăugaţi în calendar intrare %s
-NewCompanyToDolibarr=Compania %s adăugat în Dolibarr
-ContractValidatedInDolibarr=Contract %s validat în Dolibarr
-ContractCanceledInDolibarr=Contract %s anulat în Dolibarr
-ContractClosedInDolibarr=Contract %s închis în Dolibarr
-PropalClosedSignedInDolibarr=Propunere %s, semnată la Dolibarr
-PropalClosedRefusedInDolibarr=Propunere %s refuzată în Dolibarr
-PropalValidatedInDolibarr=Propunere %s validată în Dolibarr
-InvoiceValidatedInDolibarr=Factura %s validată în Dolibarr
-InvoicePaidInDolibarr=Factura %s-a schimbat la plata în Dolibarr
-InvoiceCanceledInDolibarr=Factura %s anulată în Dolibarr
-PaymentDoneInDolibarr=Plata %s făcut în Dolibarr
-CustomerPaymentDoneInDolibarr=Clientul plată %s făcut în Dolibarr
-SupplierPaymentDoneInDolibarr=Furnizor de plată %s făcut în Dolibarr
-MemberValidatedInDolibarr=Statele %s validat în Dolibarr
-MemberResiliatedInDolibarr=Statele %s resiliated în Dolibarr
-MemberDeletedInDolibarr=Statele %s elimină din Dolibarr
-MemberSubscriptionAddedInDolibarr=Abonamente de stat %s adăugat în Dolibarr
-ShipmentValidatedInDolibarr=%s Transport validate în Dolibarr
-ShipmentDeletedInDolibarr=Livrarea %s ştearsă din Dolibarr
+NewCompanyToDolibarr=Compania %s adăugată
+ContractValidatedInDolibarr=Contract %s validat
+ContractCanceledInDolibarr=Contract %s anulat
+ContractClosedInDolibarr=Contract %s închis
+PropalClosedSignedInDolibarr=Propunere %s semnată
+PropalClosedRefusedInDolibarr=Propunere %s refuzată
+PropalValidatedInDolibarr=Propunere %s validată
+PropalClassifiedBilledInDolibarr=Propunerea %s clasificată facturată
+InvoiceValidatedInDolibarr=Factura %s validată
+InvoicePaidInDolibarr=Factura %s schimbată la plată
+InvoiceCanceledInDolibarr=Factura %s anulată
+PaymentDoneInDolibarr=Plată %s efectuată
+CustomerPaymentDoneInDolibarr=Plată client %s efectuată
+SupplierPaymentDoneInDolibarr=Plată furnizor %s efectuată
+MemberValidatedInDolibarr=Membru %s validat
+MemberResiliatedInDolibarr=Membru %s reziliat
+MemberDeletedInDolibarr=Membru %s şters
+MemberSubscriptionAddedInDolibarr=Înscrierea pentru membrul %s adăugat
+ShipmentValidatedInDolibarr=Livrare %s validată
+ShipmentDeletedInDolibarr=Livrare %s ştearsă
##### Export #####
Export=Export
ExportsArea=Zona Export
diff --git a/htdocs/langs/ro_RO/paybox.lang b/htdocs/langs/ro_RO/paybox.lang
index 486131b53cf06f933e89789e365ad1e84c02765f..5e7b247ee58c52373e0d0c30b6eeb4d51ed6267a 100644
--- a/htdocs/langs/ro_RO/paybox.lang
+++ b/htdocs/langs/ro_RO/paybox.lang
@@ -35,3 +35,6 @@ MessageKO=Mesaj de pe pagina anulat schimbul de plată
NewPayboxPaymentReceived=O nouă plată Paybox primită
NewPayboxPaymentFailed=O plată nouă Paybox încercată dar eşuată
PAYBOX_PAYONLINE_SENDEMAIL=Email pentru avertizare după o plată (realizată sau nu)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/ro_RO/paypal.lang b/htdocs/langs/ro_RO/paypal.lang
index 79074690235a10d7515d746703d82b009eb5c79f..ad8da61c84be951d252eb2d71959a013b1d39249 100644
--- a/htdocs/langs/ro_RO/paypal.lang
+++ b/htdocs/langs/ro_RO/paypal.lang
@@ -20,6 +20,6 @@ YouAreCurrentlyInSandboxMode=Sunteţi în prezent în "sandbox" modul
NewPaypalPaymentReceived=O plată nouă Paypal primită
NewPaypalPaymentFailed=O plată nouă Paypal încercată dar eşuată
PAYPAL_PAYONLINE_SENDEMAIL=E-mail pentru avertizare după o plată (realizată sau nu)
-ReturnURLAfterPayment=Return URL after payment
-ValidationOfPaypalPaymentFailed=Validation of Paypal payment failed
-PaypalConfirmPaymentPageWasCalledButFailed=Payment confirmation page for Paypal was called by Paypal but confirmation failed
+ReturnURLAfterPayment=URL-ul return după plată
+ValidationOfPaypalPaymentFailed=Validarea Paypal plată eşuată
+PaypalConfirmPaymentPageWasCalledButFailed=Pagina confirmare plata pentru Paypal a aplelată de Paypal dar confirmarea a eşuat
diff --git a/htdocs/langs/ro_RO/products.lang b/htdocs/langs/ro_RO/products.lang
index 366c9e9a76a1fea59fb8129ac4c04557384fd9d0..94de8dd384d2ef9e6ccb3784f96ed67a5d930a11 100644
--- a/htdocs/langs/ro_RO/products.lang
+++ b/htdocs/langs/ro_RO/products.lang
@@ -13,10 +13,10 @@ NewProduct=Produs nou
NewService=Serviciu nou
ProductCode=Cod produs
ServiceCode=Cod serviciu
-ProductVatMassChange=Mass VAT change
-ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
-MassBarcodeInit=Mass barcode init
-MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
+ProductVatMassChange=Modificare TVA în masă
+ProductVatMassChangeDesc=Această pagină poate fi folosită pentru a modifica o rată TVA definită la produse sau servicii de la o valoare la alta. Atenție, această schimbare se face în toată baza de date.
+MassBarcodeInit=Init cod de bare în masă
+MassBarcodeInitDesc=Această pagină poate fi utilizată pentru a inițializa un cod de bare pe obiectele care nu au coduri de bare definit. Verificați înainte dacă modulul cod de bare este complet configurat.
ProductAccountancyBuyCode=Cont Contabilitate (cumpărare)
ProductAccountancySellCode=Cont Contabilitate (vânzare)
ProductOrService=Produs sau serviciu
@@ -28,10 +28,10 @@ ProductsAndServicesStatistics=Statistici Produse si Servicii
ProductsStatistics=Statistici Produse
ProductsOnSell=Produse disponibile
ProductsNotOnSell=Produse fără mişcare
-ProductsOnSellAndOnBuy=Products not for sale nor purchase
+ProductsOnSellAndOnBuy=Produse nesupuse vânzării sau cumpărării
ServicesOnSell=Servicii disponibile
ServicesNotOnSell=Servicii fără miscare
-ServicesOnSellAndOnBuy=Services not for sale nor purchase
+ServicesOnSellAndOnBuy=Servicii nesupuse vânzării sau cumpărării
InternalRef=Referinţă internă
LastRecorded=Ultimele produse / servicii disponibile înregistrate
LastRecordedProductsAndServices=Ultimele %s produse / servicii înregistrate
@@ -72,20 +72,20 @@ PublicPrice=Preţ Public
CurrentPrice=Preţ curent
NewPrice=Preţ nou
MinPrice=Preţ min. vânzare
-MinPriceHT=Minim. selling price (net of tax)
-MinPriceTTC=Minim. selling price (inc. tax)
+MinPriceHT=Preţ minim vânzare (fără taxe)
+MinPriceTTC=Preţ minim vânzare (inc. tax)
CantBeLessThanMinPrice=Prețul de vânzare nu poate fi mai mic decât minimul permis pentru acest produs (% s fără taxe). Acest mesaj poate apărea, de asemenea, dacă tastați o reducere prea important.
ContractStatus=Status Contract
ContractStatusClosed=Închis
ContractStatusRunning=În service
ContractStatusExpired=expirat
ContractStatusOnHold=Fără service
-ContractStatusToRun=To get running
+ContractStatusToRun=De pus în funcţiune
ContractNotRunning=Acest contract nu este în execuţie
ErrorProductAlreadyExists=Un produs cu referinţa %s există deja.
ErrorProductBadRefOrLabel=Valoare greșită pentru referință sau eticheta.
ErrorProductClone=A apărut o problemă în timp ce sw încerca clonarea produsului sau a serviciului.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Eroare Preţul nu poate fi mai mic decât Preţul Minim
Suppliers=Furnizori
SupplierRef=Ref. produs furnizor
ShowProduct=Afişează produs
@@ -114,15 +114,15 @@ BarcodeValue=Valoarea coduri de bare
NoteNotVisibleOnBill=Notă (nevizibilă pe facturi, propuneri ...)
CreateCopy=Crează o copie
ServiceLimitedDuration=Dacă produsul este un serviciu cu durată limitată:
-MultiPricesAbility=Several level of prices per product/service
+MultiPricesAbility=Câteva nivele ale preţurilor produs/serviciu
MultiPricesNumPrices=Numărul de preţ
MultiPriceLevelsName=Categorii Preţ
-AssociatedProductsAbility=Activează produse virtuale
-AssociatedProducts=Produse virtuale
-AssociatedProductsNumber=Număr produse ce compun produsul virtual
-ParentProductsNumber=Numărul produselor virtuale părinte
-IfZeroItIsNotAVirtualProduct=Dacă 0, acest produs nu este un produs virtual
-IfZeroItIsNotUsedByVirtualProduct=Dacă 0, acest produs nu este folosit de niciun produs virtual
+AssociatedProductsAbility=Activează funcţia pachete virtuale
+AssociatedProducts=Pachet produs
+AssociatedProductsNumber=Număr produse ce compun acest pachet produse virtual
+ParentProductsNumber=Numărul pachetelor produselor părinte
+IfZeroItIsNotAVirtualProduct=Dacă 0, acest produs nu este un pachet produs virtual
+IfZeroItIsNotUsedByVirtualProduct=Dacă 0, acest produs nu este folosit de niciun pachet produs virtual
EditAssociate=Compus ca produs virtual
Translation=Traduceri
KeywordFilter=Filtru de cuvinte cheie
@@ -132,7 +132,7 @@ AddDel=Adăugare / Retrage
Quantity=Cantitate
NoMatchFound=Nici un rezultat găsit
ProductAssociationList=Lista de legate de produse / servicii: nume de produse / servicii (cantitatea afectate)
-ProductParentList=Lista de produse / servicii cu acest produs, ca o componentă
+ProductParentList=Lista de pachete produse / servicii cu acest produs, ca o componentă
ErrorAssociationIsFatherOfThis=Un produs este selectat de părinte cu curent produs
DeleteProduct=A şterge un produs / serviciu
ConfirmDeleteProduct=Sunteţi sigur că doriţi să ştergeţi acest produs / serviciu?
@@ -161,12 +161,12 @@ NoSupplierPriceDefinedForThisProduct=Nu furnizor preţ / Cantitate definite pent
RecordedProducts=Produse înregistrate
RecordedServices=Servicii înregistrate
RecordedProductsAndServices=Produse / servicii înregistrate
-PredefinedProductsToSell=Predefined products to sell
-PredefinedServicesToSell=Predefined services to sell
-PredefinedProductsAndServicesToSell=Predefined products/services to sell
-PredefinedProductsToPurchase=Predefined product to purchase
-PredefinedServicesToPurchase=Predefined services to purchase
-PredefinedProductsAndServicesToPurchase=Predefined products/services to puchase
+PredefinedProductsToSell=Produse Predefinite pentru vânzare
+PredefinedServicesToSell=Servicii Predefinite pentru vânzare
+PredefinedProductsAndServicesToSell=Produse/Servicii Predefinite pentru vânzare
+PredefinedProductsToPurchase=Produse Predefinite pentru cumpărare
+PredefinedServicesToPurchase=Servicii Predefinite pentru cumpărare
+PredefinedProductsAndServicesToPurchase=Produse/Servicii Predefinite pentru cumpărare
GenerateThumb=Generaţi thumb
ProductCanvasAbility=Utilizaţi speciale "panza" addons
ServiceNb=Service # %s
@@ -179,18 +179,18 @@ CloneProduct=Clone produs sau un serviciu
ConfirmCloneProduct=Sigur doriţi să clonaţi produsul sau serviciul <b>%s</b> ?
CloneContentProduct=Clone toate principalele informatii de produs / serviciu
ClonePricesProduct=Clone principalele informatii si preturi
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clonează pachet produs/serviciu
ProductIsUsed=Acest produs este utilizat
NewRefForClone=Ref. de produs / serviciu nou
CustomerPrices=Preţuri Clienţii
SuppliersPrices=Preţuri Furnizori
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+SuppliersPricesOfProductsOrServices=Preţuri Furnizori ( al produselor şi serviciilor)
CustomCode=Codul vamal
CountryOrigin=Ţara de origine
HiddenIntoCombo=Ascuns în liste selectaţi
Nature=Natura
-ProductCodeModel=Product ref template
-ServiceCodeModel=Service ref template
+ProductCodeModel=Model ref Produs
+ServiceCodeModel=Model ref Serviciu
AddThisProductCard=Crează Fişă produs
HelpAddThisProductCard=Această opţiune vă permite să creaţi sau clonaţi un produs dacă acesta nu există
AddThisServiceCard=Crează Fişă Serviciu
@@ -214,31 +214,31 @@ CostPmpHT=Net total VWAP
ProductUsedForBuild=Autoconsum de producție
ProductBuilded=Producţie completată
ProductsMultiPrice=Produse preţ multiplu
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
+ProductsOrServiceMultiPrice=Preţuri Clienti ( al produselor şi serviciilor, multi-preţ)
ProductSellByQuarterHT=Cifra de afaceri trimestrială a produselor VWAP
ServiceSellByQuarterHT=Cifra de afaceri trimestrială servicii VWAP
Quarter1=Trimestru 1.
Quarter2=Trimestru 2.
Quarter3=Trimestru 3.
Quarter4=Trimestru 4.
-BarCodePrintsheet=Print bar code
-PageToGenerateBarCodeSheets=With this tool, you can print sheets of bar code stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button <b>%s</b>.
-NumberOfStickers=Number of stickers to print on page
-PrintsheetForOneBarCode=Print several stickers for one barcode
-BuildPageToPrint=Generate page to print
-FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
-FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty.
-DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
-BarCodeDataForProduct=Barcode information of product %s :
-BarCodeDataForThirdparty=Barcode information of thirdparty %s :
-ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
-PriceByCustomer=Price by customer
-PriceCatalogue=Unique price per product/service
-PricingRule=Pricing Rules
-AddCustomerPrice=Add price by customers
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Price by customer log
-MinimumPriceLimit=Minimum price can't be lower that %s
-MinimumRecommendedPrice=Minimum recommended price is : %s
+BarCodePrintsheet=Print cod de bare
+PageToGenerateBarCodeSheets=Cu acest instrument, puteți imprima foi de autocolante de coduri de bare. Alegeți formatul de pagina dvs. de autocolant, tipul și valoarea codurilor de bare, apoi faceți clic pe butonul <b>%s</b>.
+NumberOfStickers=Numărul de autocolante de printat pe pagina
+PrintsheetForOneBarCode=Print câteva autocolante pentru un cod de bare
+BuildPageToPrint=Generare pagina pentru imprimantă
+FillBarCodeTypeAndValueManually=Completați tip cod de bare și valoarea manual.
+FillBarCodeTypeAndValueFromProduct=Completați tip cod de bare și valoareadin codul de bare al produsului.
+FillBarCodeTypeAndValueFromThirdParty=Completați tip cod de bare și valoareadin codul de bare al terţului.
+DefinitionOfBarCodeForProductNotComplete=Definiția tipului sau valoarea codului de bare nu e completă pentru produsul %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definiția tipului sau valoarea codului de bare nu e completă pentru terţul %s.
+BarCodeDataForProduct=Informaţii cod bare al produsului %s :
+BarCodeDataForThirdparty=Informaţii cod bare al terţului %s :
+ResetBarcodeForAllRecords=Defineşte valoare coduri de bare pentru toate înregistrările (aceasta va reseta, de asemenea, valorile deja definite, cu valori noi)
+PriceByCustomer=Preţ pe client
+PriceCatalogue=Preţ unic pe produs/serviciu
+PricingRule=Reguli preturi
+AddCustomerPrice=Adaugă Preţ pe client
+ForceUpdateChildPriceSoc=Setează acelasi preţ pe subsidiarele clientuli
+PriceByCustomerLog=Log Preţ pe client
+MinimumPriceLimit=Preţul minim nu poate fi mai mic decat %s
+MinimumRecommendedPrice=Preţul minim recomandat este: %s
diff --git a/htdocs/langs/ro_RO/projects.lang b/htdocs/langs/ro_RO/projects.lang
index 6f95e6755efc6d45b1a00f391ddf6aeff5c5e776..8d89f5a4f9d2c601b998aba86a2951ee114e763a 100644
--- a/htdocs/langs/ro_RO/projects.lang
+++ b/htdocs/langs/ro_RO/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Această vedere prezintă toate proiectele şi sarcinile (permisiuni d
Myprojects=Proiectele mele
ProjectsArea=Zona Proiecte
NewProject=Proiect nou
-AddProject=Adaugă proiect
+AddProject=Creare proiect
DeleteAProject=Şterge proiect
DeleteATask=Şterge task
ConfirmDeleteAProject=Sunteţi sigur că doriţi să ştergeţi acest proiect?
@@ -45,7 +45,7 @@ TaskDateStart=Data start task
TaskDateEnd=Data de final task
TaskDescription=Descriere task
NewTask=Task nou
-AddTask=Adaugă Task
+AddTask=Creare sarcină
AddDuration=Adaugă durată
Activity=Activitate
Activities=Activităţi / Taskuri
@@ -85,13 +85,13 @@ ActionsOnProject=Evenimente pe proiect
YouAreNotContactOfProject=Nu sunteţi un contact al acestui proiect privat
DeleteATimeSpent=Ştergeţi timpul consumat
ConfirmDeleteATimeSpent=Ssigur doriţi să ştergeţi acest timp consumat?
-DoNotShowMyTasksOnly=See also tasks not assigned to me
-ShowMyTasksOnly=View only tasks assigned to me
+DoNotShowMyTasksOnly=Afişează, de asemenea, şi taskurile ce nu sunt atribuite mie
+ShowMyTasksOnly=Vezi numai taskurile atribuite mie
TaskRessourceLinks=Resurse
ProjectsDedicatedToThisThirdParty=Proiecte dedicate acestui terţ
NoTasks=Nr sarcini pentru acest proiect
LinkedToAnotherCompany=Legat de terţe părţi, alta
-TaskIsNotAffectedToYou=Task not assigned to you
+TaskIsNotAffectedToYou=Sarcină neatribuită ţie
ErrorTimeSpentIsEmpty=Timpul consumat nu este completat
ThisWillAlsoRemoveTasks=Această acţiune va şterge, de asemenea, toate taskurile proiectului (<b>%s</b> ) la acest moment şitoţi timpii petrecuţi.
IfNeedToUseOhterObjectKeepEmpty=Dacă unele obiecte (facturi, comenzi, ...), care aparţin altui terţ, trebuie să fie legate de proiect, pentru creare, menţine acest gol pentru a avea proiectul fiind multiterţi.
@@ -120,13 +120,13 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
SelectElement=Selectați elementul
AddElement=Link către element
-UnlinkElement=Unlink element
+UnlinkElement=Element nelegat
# Documents models
DocumentModelBaleine=Modelul de rapor al unui proiect complet t (logo. ..)
PlannedWorkload = Volum de lucru Planificat
WorkloadOccupation= Volum de lucru Procent
ProjectReferers=Obiecte asociate
SearchAProject=Cauta proiect
-ProjectMustBeValidatedFirst=Project must be validated first
+ProjectMustBeValidatedFirst=Proiectul trebuie validat mai întâi
ProjectDraft=Proiecte draft
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Asociază o resursă la timpul alocat
diff --git a/htdocs/langs/ro_RO/propal.lang b/htdocs/langs/ro_RO/propal.lang
index 46580bc3e247660d6598a92a9b0d74d0965d905b..250c4a62f8b50d2e4e250e2c1d8908383314385d 100644
--- a/htdocs/langs/ro_RO/propal.lang
+++ b/htdocs/langs/ro_RO/propal.lang
@@ -16,7 +16,7 @@ Prospect=Prospect
ProspectList=Listă Prospecte
DeleteProp=Ştergere Propunere Comercială
ValidateProp=Validează Propunere Comercială
-AddProp=Adaugă propunere
+AddProp=Crează propunere
ConfirmDeleteProp=Sigur doriţi să ştergeţi această propunere comercială ?
ConfirmValidateProp=Sigur doriţi să validaţi această propunere comercială <b>%s</b>?
LastPropals=Ultimele %s propuneri
@@ -55,8 +55,6 @@ NoOpenedPropals=Nu sunt propuneri comerciale deschise
NoOtherOpenedPropals=Nu există alte propuneri comerciale deschise
RefProposal=Ref. Propuneri comerciale
SendPropalByMail=Trimite propunerea comercială pe mail
-FileNotUploaded=Fişierul nu a fost încărcat
-FileUploaded=Fişierul a fost încărcat cu succes
AssociatedDocuments=Documente asociate la propunere:
ErrorCantOpenDir=Nu se poate deschide directorul
DatePropal=Dată Propunere
diff --git a/htdocs/langs/ro_RO/resource.lang b/htdocs/langs/ro_RO/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..d64075dfbf595897a63e3eebf19194d8f71030dd
--- /dev/null
+++ b/htdocs/langs/ro_RO/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
diff --git a/htdocs/langs/ro_RO/sendings.lang b/htdocs/langs/ro_RO/sendings.lang
index 46203a59c29488092db8042b22f935a3fd09067f..b1d76156af116ef02f4ae9d64f7455fdc9af2e1c 100644
--- a/htdocs/langs/ro_RO/sendings.lang
+++ b/htdocs/langs/ro_RO/sendings.lang
@@ -54,13 +54,15 @@ StatsOnShipmentsOnlyValidated=Statisticil ectuate privind numai livrările valid
DateDeliveryPlanned=Data de livrare planificată
DateReceived=Data de livrare reală
SendShippingByEMail=Trimite dispoziţia de livrare prin e-mail
-SendShippingRef=Submission of shipment %s
+SendShippingRef=Transmitere livrare %s
ActionsOnShipping=Evenimente pe livrare
LinkToTrackYourPackage=Link pentru a urmări pachetul dvs
ShipmentCreationIsDoneFromOrder=Pentru moment, crearea unei noi livrări se face din fişa comenzii.
RelatedShippings=Livrări asociate
ShipmentLine=Linie de livrare
CarrierList=Lista transportatori
+SendingRunning=Produs pentru comanda client deja trimis
+SuppliersReceiptRunning=Produs pentru comanda furnizor deja recepţionată
# Sending methods
SendingMethodCATCH=Colectată de client
@@ -74,5 +76,5 @@ SumOfProductVolumes=Volumul total al produselor
SumOfProductWeights=Greutatea totală a produselor
# warehouse details
-DetailWarehouseNumber= Warehouse details
-DetailWarehouseFormat= W:%s (Qty : %d)
+DetailWarehouseNumber= Detalii Depozit
+DetailWarehouseFormat= W:%s (Cant : %d)
diff --git a/htdocs/langs/ro_RO/stocks.lang b/htdocs/langs/ro_RO/stocks.lang
index f90183710525950375b389f4fe04beb697303f7e..24f32791525a0eb511cd9b3e7f1074f9c745fabe 100644
--- a/htdocs/langs/ro_RO/stocks.lang
+++ b/htdocs/langs/ro_RO/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Eticheta Depozit este obligatorie
CorrectStock=Corectează stoc
ListOfWarehouses=Lista depozite
ListOfStockMovements=Lista mişcări de stoc
-StocksArea=Zona Stocuri
+StocksArea=Warehouses area
Location=Locație
LocationSummary=Nume scurt locaţie
NumberOfDifferentProducts=Numărul de produse diferite
@@ -94,8 +94,8 @@ DesiredStock=Stoc dorit
StockToBuy=De comandat
Replenishment=Reaprovizionare
ReplenishmentOrders=Comenzi reaprovizionare
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+VirtualDiffersFromPhysical=Potrivit opțiunilor decreştere/ descreştere , stocul fizic și stocul virtual (fizic + Comenzicurente) pot diferi
+UseVirtualStockByDefault=Utilizați stoc virtual implicit, în loc de stoc fizic, pentru facilitatea de reaprovizionare
UseVirtualStock=Utilizeaza Stoc Virtual
UsePhysicalStock=Utilizeaza Stoc Fizic
CurentSelectionMode=Mod selectie curent
@@ -107,19 +107,19 @@ AlertOnly= Numai Alerte
WarehouseForStockDecrease=Depozitul <b>%s</b> va fi utilizat pentru scăderea stocului
WarehouseForStockIncrease=Depozitul <b>%s</b> va fi utilizat pentru creşterea stocului
ForThisWarehouse=Pentru acest depozit
-ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
+ReplenishmentStatusDesc=Aceasta este lista cu toate produsele având stocul mai mic decât stocul dorit (sau valoarea de alertă dacă casuţa "doar alertă " este bifată) și sugerăm să vă creaţi comenzi furnizor pentru a completa diferența.
ReplenishmentOrdersDesc=Aceasta este lista cu toate comenzile furnizor deschise
Replenishments=Reaprovizionări
NbOfProductBeforePeriod=Cantitatea de produs %s în stoc înainte de perioada selectată (< %s)
NbOfProductAfterPeriod=Cantitatea de produs %s în stoc după perioada selectată (> %s)
-MassMovement=Mass movement
+MassMovement=Mişcare în masă
MassStockMovement=Transfer stoc în masă
SelectProductInAndOutWareHouse=Selectați un produs, o cantitate, un depozit sursă și un depozit țintă, apoi faceți clic pe"%s". Odată făcut acest lucru pentru toate transferurile cerute, faceți clic pe "%s".
RecordMovement=Înregistrare transfer
ReceivingForSameOrder=Recepţii pentru această comandă
-StockMovementRecorded=Stock movements recorded
+StockMovementRecorded=Mişcări stoc înregistrate
RuleForStockAvailability=Reguli pentru cereri stoc
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
+StockMustBeEnoughForInvoice=Nivelul stocului trebuie să fie suficient pentru a adăuga produsul/serviciul în factură
+StockMustBeEnoughForOrder=Nivelul stocului trebuie să fie suficient pentru a adăuga produsul/serviciul în comandă
+StockMustBeEnoughForShipment= Nivelul stocului trebuie să fie suficient pentru a adăuga produsul/serviciul în livrare
diff --git a/htdocs/langs/ro_RO/suppliers.lang b/htdocs/langs/ro_RO/suppliers.lang
index cba0bff3e2173d94552f6dab238596e68fe1bb74..04593e3e5f23d88d139c8a7a6510d50e2051a253 100644
--- a/htdocs/langs/ro_RO/suppliers.lang
+++ b/htdocs/langs/ro_RO/suppliers.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=Furnizori
Supplier=Furnizor
-AddSupplier=Adaugă furnizor
+AddSupplier=Crează un furnizor
SupplierRemoved=Furnizor şters
SuppliersInvoice=Factură furnizor
NewSupplier=Furnizor nou
@@ -40,5 +40,5 @@ AddSupplierInvoice=Crează factură furnizor
ListOfSupplierProductForSupplier=Lista produse şi preţuri pentru furnizorul <b>%s</b>
NoneOrBatchFileNeverRan=Nici una sau tratate <b>%s</b> ne executate recent
SentToSuppliers=Trimite la furnizori
-ListOfSupplierOrders=List of supplier orders
-MenuOrdersSupplierToBill=Supplier orders to invoice
+ListOfSupplierOrders=Lista comenzi furnizori
+MenuOrdersSupplierToBill=Comenzi Furnizor de facturat
diff --git a/htdocs/langs/ro_RO/trips.lang b/htdocs/langs/ro_RO/trips.lang
index 2fbe16713ad5eeea8acb4cfd2bdfa51b45fe08fd..1846842c4398d2ee040298bd5f6cc6a1c6509008 100644
--- a/htdocs/langs/ro_RO/trips.lang
+++ b/htdocs/langs/ro_RO/trips.lang
@@ -4,7 +4,7 @@ Trips=Deplasări
TripsAndExpenses=Decont de cheltuieli
TripsAndExpensesStatistics=Statistici Deconturi de cheltuieli
TripCard=Fişă Cheltuieli
-AddTrip=Adaugă Decont de cheltuieli
+AddTrip=Creare deplasare
ListOfTrips=Lista cheltuieli
ListOfFees=Lista note cheltuieli
NewTrip=Decont de cheltuieli nou
@@ -19,4 +19,4 @@ TF_TRIP=Deplasare
ListTripsAndExpenses=Lista Deconturi de cheltuieli
ExpensesArea=Zona Deconturi de cheltuieli
SearchATripAndExpense=Caută Decont de cheltuieli
-ClassifyRefunded=Classify 'Refunded'
+ClassifyRefunded=Clasează "Rambursată"
diff --git a/htdocs/langs/ro_RO/users.lang b/htdocs/langs/ro_RO/users.lang
index 8f4120b809229817b086fed30df1e8013db02c41..31d081749200f78b26a47d6a3b204be6dfdbc416 100644
--- a/htdocs/langs/ro_RO/users.lang
+++ b/htdocs/langs/ro_RO/users.lang
@@ -1,5 +1,5 @@
# Dolibarr language file - Source file is en_US - users
-HRMArea=HRM area
+HRMArea=Zona HRM
UserCard=Utilizator carte
ContactCard=Contact carte
GroupCard=Grupul de carte
@@ -63,7 +63,6 @@ ShowGroup=Arata grup
ShowUser=Arata utilizator
NonAffectedUsers=Non afectate utilizatori
UserModified=Utilizator modificate cu succes
-GroupModified=Grupul modificate cu succes
PhotoFile=Foto fişier
UserWithDolibarrAccess=Utilizator cu acces Dolibarr
ListOfUsersInGroup=Lista de utilizatori în acest grup
@@ -87,7 +86,7 @@ MyInformations=Mea de date
ExportDataset_user_1=Dolibarr utilizatorii şi proprietăţi
DomainUser=Domeniu utilizatorul %s
Reactivate=Reactivaţi
-CreateInternalUserDesc=This form allows you to create an user internal to your company/foundation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+CreateInternalUserDesc=Acest formular va permite sa creaţi un utilizator intern al companiei/ fundaţiei dvs . Pentru a crea un utilizator extern (client, furnizor, ...), folosiţi butonul "Creaţi utilizator Dolibarr " din cardul contact al terţului.
InternalExternalDesc=Un utilizator <b>intern</b> este un utilizator care este parte a firmei dvs. / Fundaţia. <br> Un utilizator <b>extern</b> este un client, furnizor sau de altă parte. <br><br> În ambele cazuri, permissions defineşte drepturile pe Dolibarr, externe, de asemenea, utilizatorul poate avea un alt administrator de meniu decât utilizator intern (a se vedea Home - Setup - Display)
PermissionInheritedFromAGroup=Permisiunea acordată deoarece moştenită de la un utilizator al unui grup.
Inherited=Moştenit
@@ -103,7 +102,7 @@ UserDisabled=User %s cu handicap
UserEnabled=User %s activat
UserDeleted=User %s eliminat
NewGroupCreated=Grupul creat %s
-GroupModified=Grupul modificate cu succes
+GroupModified=Group %s modified
GroupDeleted=Grupul %s eliminat
ConfirmCreateContact=Yu Sunteţi sigur că doriţi să creaţi un cont pentru acest Dolibarr de contact?
ConfirmCreateLogin=Sunteţi sigur că doriţi să creaţi un cont pentru acest Dolibarr membru?
@@ -114,8 +113,10 @@ YourRole=Dvs. de roluri
YourQuotaOfUsersIsReached=Cota dvs. de utilizatori activi este atins!
NbOfUsers=NB de utilizatori
DontDowngradeSuperAdmin=Numai un superadmin poate declasa un superadmin
-HierarchicalResponsible=Responsabil ierarhic
+HierarchicalResponsible=Supervisor
HierarchicView=Vedere ierarhică
UseTypeFieldToChange=Foloseşte câmpul Tip pentru schimbare
OpenIDURL=URL OpenID
LoginUsingOpenID=Utilizați OpenID pentru login
+WeeklyHours=Ore saptămânale
+ColorUser=Culoarea utilizatorului
diff --git a/htdocs/langs/ro_RO/withdrawals.lang b/htdocs/langs/ro_RO/withdrawals.lang
index f9bdf12b34fe0f24922ca8907cecb721a280be22..38374aafce8b7b6eb0f1b84465d813bd6f98ecea 100644
--- a/htdocs/langs/ro_RO/withdrawals.lang
+++ b/htdocs/langs/ro_RO/withdrawals.lang
@@ -14,12 +14,13 @@ WithdrawalReceiptShort=Chitanţă
LastWithdrawalReceipts=Ultima %s retragere încasări
WithdrawedBills=Withdrawed facturi
WithdrawalsLines=Retragerile de linii de
-RequestStandingOrderToTreat=Cerere de ordine de plată pentru a trata
-RequestStandingOrderTreated=Cerere de ordine de plată trataţi
+RequestStandingOrderToTreat=Cerere pentru ordine de plată de procesat
+RequestStandingOrderTreated=Cerere pentru ordine de plată procesată
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Nu a fost încă posibil. Statutul Withdraw trebuie să fie setat la "creditat" înaintea declarării respinge pe liniile specifice.
CustomersStandingOrders=Clientul ordine de plată
CustomerStandingOrder=Client permanent pentru
-NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
-NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information
+NbOfInvoiceToWithdraw=Nr. facturii cu retrage cererea
+NbOfInvoiceToWithdrawWithInfo=Nr. facturii cu cererea retrage pentru clienții care au informațiile contului bancar definit
InvoiceWaitingWithdraw=Factura de aşteptare pentru al retrage
AmountToWithdraw=Suma de a se retrage
WithdrawsRefused=Retrage refuzat
@@ -34,20 +35,19 @@ ThirdPartyBankCode=Terţă parte de cod bancar
ThirdPartyDeskCode=A treia parte birou cod
NoInvoiceCouldBeWithdrawed=Nu withdrawed factură cu succes. Verificaţi dacă factura sunt pe companii cu un valide BAN.
ClassCredited=Clasifica creditat
-ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
+ClassCreditedConfirm=Sunteţi sigur că doriţi sa clasificaţi această retragere ca creditată pe contul bancar?
TransData=Data transmiterii
TransMetod=Metoda transmitere
Send=Trimite
Lines=Linii
-StandingOrderReject=Issue a rejection
-InvoiceRefused=Încărcaţi respingere la client
+StandingOrderReject=Emite o respinge
WithdrawalRefused=Retragere refuzată
WithdrawalRefusedConfirm=Sunteţi sigur că doriţi să introduceţi un respingere de retragere pentru societate
RefusedData=Data respingerii
RefusedReason=Motivul respingerii
RefusedInvoicing=Facturare respingerea
NoInvoiceRefused=Nu încărcaţi respingerea
-InvoiceRefused=Încărcaţi respingere la client
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=Status
StatusUnknown=Necunoscut
StatusWaiting=Aşteptare
@@ -76,19 +76,19 @@ WithBankUsingRIB=Pentru conturile bancare folosind RIB
WithBankUsingBANBIC=Pentru conturile bancare folosind codul IBAN / BIC / SWIFT
BankToReceiveWithdraw=Cont bancar pentru a primi retrage
CreditDate=Credit pe
-WithdrawalFileNotCapable=Imposibil de a genera primirea fişier de retragere pentru ţara dvs.
+WithdrawalFileNotCapable=Imposibil de a genera fișierul chitanţă de retragere pentru țara dvs %s (Țara dvs. nu este acceptată)
ShowWithdraw=Arată Retragere
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Cu toate acestea, dacă factura are cel puțin o plată de retragere încă neprelucrată, aceasta nu va fi setată ca plătită permite în prealabil gestionarea retragerii.
+DoStandingOrdersBeforePayments=Acest tab vă permite să solicitaţi un ordin de plată. Odată ce este complet, puteți introduce plata pentru a închide factura.
WithdrawalFile=Fişier Retragere
SetToStatusSent=Setează statusul "Fişier Trimis"
-ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+ThisWillAlsoAddPaymentOnInvoice=Aceasta se va aplica, de asemenea, plății facturilor și vor fi clasificate ca "Plătit"
### Notifications
InfoCreditSubject=Plata %s comandă în picioare de către bancă
InfoCreditMessage=%s pentru picioare a fost plătit de către bancă <br> Datele de plata: %s
InfoTransSubject=Transmiterea %s ordine permanente la banca
-InfoTransMessage=The standing order %s has been sent to bank by %s %s.<br><br>
+InfoTransMessage=Ordinul de plată %s a fost trimis la bancă de %s %s. <br><br>
InfoTransData=Suma: %s <br> Metoda: %s <br> Data: %s
InfoFoot=Acesta este un mesaj automat trimis de Dolibarr
InfoRejectSubject=Pentru a refuzat permanent
diff --git a/htdocs/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang
index 8cab9d2b651d75b0721d76fda619e2034e4509b4..39c2732ec29852cf93d41614ed1812c2a4c1ce4f 100644
--- a/htdocs/langs/ru_RU/accountancy.lang
+++ b/htdocs/langs/ru_RU/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts
Validate=Validate
Addanaccount=Add an accounting account
AccountAccounting=Accounting account
-Ventilation=Ventilation
+Ventilation=Breakdown
ToDispatch=To dispatch
Dispatched=Dispatched
-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
TradeMargin=Trade margin
Reports=Reports
ByCustomerInvoice=By invoices customers
@@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger
Bookkeeping=General ledger
AccountBalanceByMonth=Account balance by month
-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
Line=Line
CAHTF=Total purchase supplier HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice
IntoAccount=In the accounting account
Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
+VentilationAuto=Automatic breakdown
Processing=Processing
EndProcessing=The end of processing
@@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account
ACCOUNTING_SEPARATORCSV=Separator CSV
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
@@ -140,14 +140,14 @@ Active=Statement
NewFiscalYear=New fiscal year
-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
TotalVente=Total turnover HT
TotalMarge=Total sales margin
DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
ChangeAccount=Change the accounting account for lines selected by the account:
Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
@@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically
ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index f9ec0b0c2104e19ebd1c38a76ad21f56d7ac3058..fce5cff17a91cd99857223cd2747df6ad7bf28e1 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -437,8 +437,8 @@ Module52Name=Акции
Module52Desc=Акции 'управлению продуктами
Module53Name=Услуги
Module53Desc=Услуги по управлению
-Module54Name=Договоры
-Module54Desc=Контракты и услуги управления
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=Штрих-коды
Module55Desc=Штрих-коды управления
Module56Name=Телефония
@@ -475,8 +475,8 @@ Module320Name=RSS Подача
Module320Desc=Добавить RSS канал внутри Dolibarr экране страниц
Module330Name=Закладки
Module330Desc=Закладки управления
-Module400Name=Проекты
-Module400Desc=Проекты управления внутри других модулей
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=Webcalendar
Module410Desc=Webcalendar интеграции
Module500Name=Special expenses (tax, social contributions, dividends)
@@ -484,7 +484,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di
Module510Name=Зарплаты
Module510Desc=Management of employees salaries and payments
Module600Name=Уведомления
-Module600Desc=Отправить уведомления (по электронной почте) о Dolibarr деловых мероприятий
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Пожертвования
Module700Desc=Пожертвования управления
Module1200Name=Mantis
@@ -514,16 +514,16 @@ Module5000Name=Multi-компании
Module5000Desc=Позволяет управлять несколькими компаниями
Module6000Name=Бизнес-Процесс
Module6000Desc=Workflow management
-Module20000Name=Holidays
-Module20000Desc=Declare and follow employees holidays
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
Module39000Name=Product batch
Module39000Desc=Batch number, eat-by and sell-by date management on products
Module50000Name=PayBox
Module50000Desc=Модуль предлагает онлайн страницу оплаты с помощью кредитной карты с PayBox
Module50100Name=Кассовое
Module50100Desc=Кассовое модуль
-Module50200Name= Paypal
-Module50200Desc= Модуль предлагает онлайн страницу оплаты с помощью кредитной карты с Paypal
+Module50200Name=Paypal
+Module50200Desc=Модуль предлагает онлайн страницу оплаты с помощью кредитной карты с Paypal
Module50400Name=Accounting (advanced)
Module50400Desc=Accounting management (double parties)
Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=Прочитайте Регламент
Permission152=Настройка Регламент
Permission153=Прочитайте Регламент поступления
Permission154=Кредитные / отказаться регламент поступления
-Permission161=Читайте контракты
-Permission162=Создать / изменить контракты
-Permission163=Активировать услугу по контракту
-Permission164=Отключить службу контракта
-Permission165=Удалить контрактов
-Permission171=Читать поездок
-Permission172=Создать / изменить экскурсии
-Permission173=Удалить поездок
-Permission178=Экспорт поездок
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Read trips and expenses (own and his subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
Permission180=Читать поставщиков
Permission181=Читать поставщик заказов
Permission182=Создать / изменить поставщика заказы
@@ -671,7 +672,7 @@ Permission300=Читать штрих-коды
Permission301=Создать / изменить штрих-коды
Permission302=Удалить штрих-коды
Permission311=Читать услуги
-Permission312=Назначить службы на контракт
+Permission312=Assign service/subscription to contract
Permission331=Читать закладок
Permission332=Создать / изменить закладки
Permission333=Удаление закладок
@@ -701,8 +702,8 @@ Permission701=Читать пожертвований
Permission702=Создать / изменить пожертвований
Permission703=Удалить пожертвований
Permission1001=Читать запасов
-Permission1002=Создание / изменение запасов
-Permission1003=Удалить запасов
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=Читать фондового движения
Permission1005=Создать / изменить фондового движения
Permission1101=Читать доставка заказов
@@ -1038,7 +1039,6 @@ YesInSummer=Yes in summer
OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
SuhosinSessionEncrypt=Session storage encrypted by Suhosin
ConditionIsCurrently=Condition is currently %s
-TestNotPossibleWithCurrentBrowsers=Автоматическое определение невозможно
YouUseBestDriver=Вы используете драйвер %s, который на текущий момент является самым подходящим
YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
NbOfProductIsLowerThanNoPb=У вас только %s Товаров/Услуг в базе данных. Это не требует никакой оптимизации.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=Вернуться бухгалтерские код
ModuleCompanyCodePanicum=Возврат порожних бухгалтерские код.
ModuleCompanyCodeDigitaria=Бухгалтерия код зависит от третьей стороны кода. Код состоит из символов "С" в первой позиции следуют первые 5 символов сторонних код.
UseNotifications=Использование уведомлений
-NotificationsDesc=Уведомления функция позволяет отправить молча автоматической почте, для некоторых Dolibarr событий, для компаний, которые настроены на
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
ModelModules=Документы шаблоны
DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
WatermarkOnDraft=Watermark по проекту документа
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=Добавить дату доставки спосо
UseOptionLineIfNoQuantity=Соответствие продукта / услуги с нулевой суммой считается вариант
FreeLegalTextOnProposal=Свободный текст на коммерческие предложения
WatermarkOnDraftProposal=Водяные знаки на черновиках Коммерческих предложений ("Нет" если пусто)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=Приказ 'Management Setup
OrdersNumberingModules=Приказы нумерации модулей
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list
ValidOrderAfterPropalClosed=Чтобы проверить порядок после предложения ближе, позволяет не шаг за временное распоряжение
FreeLegalTextOnOrders=Свободный текст распоряжения
WatermarkOnDraftOrders=Водяные знаки на черновиках Заказов ("Нет" если пусто)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
##### Clicktodial #####
ClickToDialSetup=Нажмите для набора модуля настройки
ClickToDialUrlDesc=Url called when a click on phone picto is done. Dans l'url, vous pouvez utiliser les balises<br><b>__PHONETO__</b> qui sera remplacé par le téléphone de l'appelé<br><b>__PHONEFROM__</b> qui sera remplacé par le téléphone de l'appelant (le votre)<br><b>__LOGIN__</b> qui sera remplacé par votre login clicktodial (défini sur votre fiche utilisateur)<br><b>__PASS__</b> qui sera remplacé par votre mot de passe clicktodial (défini sur votre fiche utilisateur).
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=Вмешательство нумерации мод
TemplatePDFInterventions=Вмешательство карту документы моделей
WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
##### Contracts #####
-ContractsSetup=Контракты модуль установки
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=Контракты нумерации модулей
TemplatePDFContracts=Contracts documents models
FreeLegalTextOnContracts=Free text on contracts
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
CacheByServer=Кэшируется сервером
CacheByClient=Кэшируется броузером
CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Автоматическое определение невозможно
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=Продукты модуль настройки
ServiceSetup=Услуги установки модуля
@@ -1382,9 +1384,10 @@ MailingSetup=Отправка модуля настройки
MailingEMailFrom=Отправитель EMail (С) по электронной почте было отправлено по электронной почте: модуль
MailingEMailError=Вернуться EMail (ошибки-до) для сообщений электронной почты с ошибками
##### Notification #####
-NotificationSetup=Почтовый модуль настройки
+NotificationSetup=EMail notification module setup
NotificationEMailFrom=Отправитель EMail (С) по электронной почте направил уведомление
-ListOfAvailableNotifications=Список доступных уведомлений (Этот список зависит от активированных модулей)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
##### Sendings #####
SendingsSetup=Отправка модуля настройки
SendingsReceiptModel=Отправка получения модели
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=Соединение с сервером ' %s' на базе '
OSCommerceTestKo1=Соединение с сервером ' %s' успешными, но база данных ' %s' не может быть достигнута.
OSCommerceTestKo2=Соединение с сервером ' %s' пользователя ' %s' провалилась.
##### Stock #####
-StockSetup=Конфигурация модуля запас
-UserWarehouse=Использование персональных пользователей запасов
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=Меню исключить
TreeMenu=Дерево меню
@@ -1478,11 +1482,14 @@ ClickToDialDesc=Этот модуль позволяет добавлять ик
##### Point Of Sales (CashDesk) #####
CashDesk=Точка продаж
CashDeskSetup=Кассовое модуль настройки
-CashDeskThirdPartyForSell=Общие третьей стороне для использования на продажу
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Денежные счета, используемого для продает
CashDeskBankAccountForCheque= Счет будет использоваться для получения выплат чеком
CashDeskBankAccountForCB= Учетной записи для использования на получение денежных выплат по кредитным картам
-CashDeskIdWareHouse=Datawarehous для пользователя продает
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Закладка Настройка модуля
BookmarkDesc=Этот модуль позволяет управлять закладками. Вы также можете добавить ярлыки для любых Dolibarr страниц или externale веб-сайтов на левом меню.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Delete fiscal year
ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
Opened=Opened
Closed=Closed
-
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
Format=Формат
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
diff --git a/htdocs/langs/ru_RU/agenda.lang b/htdocs/langs/ru_RU/agenda.lang
index 709c39ab1190da130f7686280608211595116a24..fbe2fb1cfcf06ef1efc2c8155573fd7f47dba3de 100644
--- a/htdocs/langs/ru_RU/agenda.lang
+++ b/htdocs/langs/ru_RU/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= Автоматическое заполнение дня
AgendaAutoActionDesc= Определить здесь события, для которого вы хотите Dolibarr создать автоматическое действие в повестку дня. Если ничего не будет проверяться (по умолчанию), только вручную действия, будут включены в повестку дня.
AgendaSetupOtherDesc= Эта страница позволяет настроить и другие параметры модуля дня.
AgendaExtSitesDesc=Эта страница позволяет настроить внешний календарей.
-ActionsEvents= События, за которые Dolibarr создадут действий в повестку дня автоматически
-PropalValidatedInDolibarr= Предложение проверены
-InvoiceValidatedInDolibarr= Счет проверены
+ActionsEvents=События, за которые Dolibarr создадут действий в повестку дня автоматически
+PropalValidatedInDolibarr=Предложение проверены
+InvoiceValidatedInDolibarr=Счет проверены
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=Счет %s вернуться к проекту статус
InvoiceDeleteDolibarr=Счет-фактура %s удалена
OrderValidatedInDolibarr= Заказ %s проверен
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Заказ %s утвержден
OrderRefusedInDolibarr=Order %s refused
OrderBackToDraftInDolibarr=Заказ %s возращен в статус черновик
OrderCanceledInDolibarr=Заказ %s отменен
-InterventionValidatedInDolibarr=Intervensjon %s validert
ProposalSentByEMail=Коммерческое предложение %s отправлены по электронной почте
OrderSentByEMail=Заказ покупателя %s отправлен по электронной почте
InvoiceSentByEMail=Счет-фактура клиента %s отправлен по электронной почте
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=Поставщик порядке %s отправлен
SupplierInvoiceSentByEMail=Поставщиком счета %s отправлены по электронной почте
ShippingSentByEMail=Доставка %s отправлены по электронной почте
ShippingValidated= Shipping %s validated
-InterventionSentByEMail=Вмешательство %s отправлены по электронной почте
-InterventionClassifiedBilled=Intervention %s classified as Billed
NewCompanyToDolibarr= Третья группа создала
DateActionPlannedStart= Планируемая дата начала
DateActionPlannedEnd= Планируемая дата окончания
@@ -70,9 +68,9 @@ DateActionStart= Начальная дата
DateActionEnd= Конечная дата
AgendaUrlOptions1=Можно также добавить следующие параметры для фильтрации вывода:
AgendaUrlOptions2=<b>login=<b>логин= %s</b> ограничить выход на действия, созданный, пострадавших или сделали <b>пользователем %s.</b>
-AgendaUrlOptions3=<b>logina=<b>logina= %s</b> ограничить выход на действия, созданные <b>пользователем %s.</b>
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
AgendaUrlOptions4=<b>logint=<b>logint= %s</b> ограничить выход на действия пользователя, <b>пострадавших %s.</b>
-AgendaUrlOptions5=<b>logind=<b>logind= %s</b> ограничить выход на действия пользователя, <b>проделанной %s.</b>
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
AgendaShowBirthdayEvents=Показать рождения контакты
AgendaHideBirthdayEvents=Скрыть рождения контакты
Busy=Занят
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=URL для доступа. Ческих файлов
ExtSiteNoLabel=Нет описания
WorkingTimeRange=Working time range
WorkingDaysRange=Working days range
-AddEvent=Add event
+AddEvent=Create event
MyAvailability=My availability
diff --git a/htdocs/langs/ru_RU/bills.lang b/htdocs/langs/ru_RU/bills.lang
index f8d7128343b2dc11bbba7873d4c1dd3a083415ca..5d8569d427e581b31853e4edfc7fba572eefd326 100644
--- a/htdocs/langs/ru_RU/bills.lang
+++ b/htdocs/langs/ru_RU/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Кредитовое авизо
InvoiceAvoirAsk=Кредитовое авизо для исправления счета-фактуры
InvoiceAvoirDesc=<b>Кредитовое авизо</b> - это 'обратный' счет-фактура, который используется для решения проблемы, когда выставлен счета-фактуры в сумме отличной от действительно оплаченной (если клиентом оплатил слишком много по ошибке, или не наоборот - не оплатил счет-фактуру полностью, поскольку он вернулся некоторые продукты, например).
invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
-invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
ReplaceInvoice=Заменить счет-фактуру %s
ReplacementInvoice=Заменяющий счет-фактура
ReplacedByInvoice=Заменен счетом-фактурой %s
@@ -87,7 +87,7 @@ ClassifyCanceled=Классифицировать как 'Аннулирован
ClassifyClosed=Классифицировать как 'Закрыт'
ClassifyUnBilled=Classify 'Unbilled'
CreateBill=Создать счет-фактуру
-AddBill=Добавить счет-фактуру или кредитовое авизо
+AddBill=Create invoice or credit note
AddToDraftInvoices=Add to draft invoice
DeleteBill=Удалить счет-фактуру
SearchACustomerInvoice=Поиск счета-фактуры Покупателю
@@ -99,7 +99,7 @@ DoPaymentBack=Возвратить платеж
ConvertToReduc=Преобразовать в будущую скидку
EnterPaymentReceivedFromCustomer=Ввести платеж, полученный от покупателя
EnterPaymentDueToCustomer=Произвести платеж за счет Покупателя
-DisabledBecauseRemainderToPayIsZero=Неактивно, поскольку напоминание о платеже равно нулю
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
Amount=Сумма
PriceBase=Ценовая база
BillStatus=Статус счета-фактуры
@@ -137,8 +137,6 @@ BillFrom=Продавец
BillTo=Покупатель
ActionsOnBill=Действия со счетом-фактурой
NewBill=Новый счет-фактура
-Prélèvements=Постоянные поручения
-Prélèvements=Постоянные поручения
LastBills=Последние %s счетов-фактур
LastCustomersBills=Последние %s счетов-фактур Покупателям
LastSuppliersBills=Последние %s счетов-фактур Поставщиков
@@ -156,9 +154,9 @@ ConfirmCancelBill=Вы уверены, что хотите отменить сч
ConfirmCancelBillQuestion=Почему вы хотите классифицировать этот счет-фактуру как 'Аннулирован'?
ConfirmClassifyPaidPartially=Вы уверены, что хотите изменить статус счет-фактуры <b>%s</b> на 'Оплачен'?
ConfirmClassifyPaidPartiallyQuestion=Этот счет-фактура не оплачен полностью. Укажите причины закрытия счета-фактуры?
-ConfirmClassifyPaidPartiallyReasonAvoir=Остаток к оплате <b>(%s %s)</b> предоставлен в виде скидки, так как платеж был произведен досрочно. Я отрегулирую НДС при помощи кредитового авизо.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Остаток к оплате <b>(%s %s)</b> предоставлен в виде скидки, так как платеж был произведен досрочно. Я согласен потерять НДС по этой скидке.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Остаток к оплате <b>(%s %s)</b> предоставлен в виде скидки, так как платеж был произведен досрочно. Я восстановлю НДС по этой скидке без кредитового авизо.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
ConfirmClassifyPaidPartiallyReasonBadCustomer=Плохой Покупатель
ConfirmClassifyPaidPartiallyReasonProductReturned=Продукция частично возвращена
ConfirmClassifyPaidPartiallyReasonOther=Сумма, аннулированная по другим причинам
@@ -191,9 +189,9 @@ AlreadyPaid=Уже оплачен
AlreadyPaidBack=Already paid back
AlreadyPaidNoCreditNotesNoDeposits=Уже оплачен (без кредитовых авизо и взносов)
Abandoned=Брошен
-RemainderToPay=Остаток к оплате
-RemainderToTake=Остаток к получению
-RemainderToPayBack=Remainder to pay back
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
Rest=Pending
AmountExpected=Заявленная сумма
ExcessReceived=Полученный излишек
@@ -219,19 +217,18 @@ NoInvoice=Нет счетов-фактур
ClassifyBill=Классифицировать счет-фактуру
SupplierBillsToPay=Счета-фактуры Поставщиков для оплаты
CustomerBillsUnpaid=Неоплаченные счета-фактуры Покупателям
-DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters
-DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=Не подлежащий взысканию
SetConditions=Установить условия оплаты
SetMode=Установить режим оплаты
Billed=Выставлен
-RepeatableInvoice=Шаблон счета-фактуры
-RepeatableInvoices=Шаблоны счетов-фактур
-Repeatable=Шаблон
-Repeatables=Шаблоны
-ChangeIntoRepeatableInvoice=Преобразовать в шаблон
-CreateRepeatableInvoice=Создать шаблон счета-фактуры
-CreateFromRepeatableInvoice=Создать по шаблонк счета-фактуры
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
CustomersInvoicesAndInvoiceLines=Счета-фактуры Покупателям и строки счетов-фактур
CustomersInvoicesAndPayments=Счета-фактуры Покупателям и платежи
ExportDataset_invoice_1=Счета-фактуры Покупателям и строки счетов-фактур
diff --git a/htdocs/langs/ru_RU/categories.lang b/htdocs/langs/ru_RU/categories.lang
index c9179be2bb4fc03183beb0aef7b9193b8f40994f..7def19ba9986fa90eef8fc2c7b6aa017502456d2 100644
--- a/htdocs/langs/ru_RU/categories.lang
+++ b/htdocs/langs/ru_RU/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Связи между поставщиками и категория
CatCusLinks=Связи между клиентами/потенц. клиентами и категориями
CatProdLinks=Связи между Продуктами/Услугами и категориями
CatMemberLinks=Связи между участниками и категориями
-CatProdLinks=Связи между Продуктами/Услугами и категориями
-CatCusLinks=Связи между клиентами/потенц. клиентами и категориями
-CatSupLinks=Связи между поставщиками и категориями
DeleteFromCat=Удалить из категории
DeletePicture=Удалить изображение
ConfirmDeletePicture=Подтверждаете удаление изображения?
@@ -112,3 +109,4 @@ CategoriesSetup=Настройка категорий
CategorieRecursiv=Автоматически связать с родительской категорией
CategorieRecursivHelp=Если активировать, то продукт будет связан с родительской категорией при добавлении в подкатегорию
AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category
diff --git a/htdocs/langs/ru_RU/compta.lang b/htdocs/langs/ru_RU/compta.lang
index 61902cc19f6a1fe6d905f363d9abe15e4ce1ccf2..9c6f18e721396f402d24cc98efd94bb3d1bc0451 100644
--- a/htdocs/langs/ru_RU/compta.lang
+++ b/htdocs/langs/ru_RU/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Плохо заказчику бухгалт
SuppliersProductsSellSalesTurnover=Генерируемый оборот по продажам поставщиков продукции.
CheckReceipt=Проверьте депозит
CheckReceiptShort=Проверьте депозит
+LastCheckReceiptShort=Last %s check receipts
NewCheckReceipt=Новые скидки
NewCheckDeposit=Новая проверка депозит
NewCheckDepositOn=Новый депозит проверить на счету: %s
diff --git a/htdocs/langs/ru_RU/contracts.lang b/htdocs/langs/ru_RU/contracts.lang
index 158bfa2048b4b5ed824eb11f4f2df5ee4a1652de..0e2e79dd3c3aa417360e7a68f46205b7b7418faa 100644
--- a/htdocs/langs/ru_RU/contracts.lang
+++ b/htdocs/langs/ru_RU/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Раздел договоров
ListOfContracts=Список договоров
-LastContracts=Последние %s измененных договоров
+LastModifiedContracts=Last %s modified contracts
AllContracts=Все договоры
ContractCard=Карточка договора
ContractStatus=Статус договора
@@ -27,7 +27,7 @@ MenuRunningServices=Запуск служб
MenuExpiredServices=Истекшим сроком службы
MenuClosedServices=Закрытые услуги
NewContract=Новый договор
-AddContract=Добавить договор
+AddContract=Create contract
SearchAContract=Искать договор
DeleteAContract=Удалить договор
CloseAContract=Закрыть контракта
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Список запуска контракта ли
ListOfRunningServices=Список запущенных служб
NotActivatedServices=Не активируется услуг (в том числе утверждены контракты)
BoardNotActivatedServices=Услуги для активации среди утверждены контракты
-LastContracts=Последние %s измененных договоров
+LastContracts=Last % contracts
LastActivatedServices=Последнее %s активированных услуг
LastModifiedServices=Последнее% с измененными услуги
EditServiceLine=Изменить направление
diff --git a/htdocs/langs/ru_RU/cron.lang b/htdocs/langs/ru_RU/cron.lang
index 00eaed513b6b787b4d1c41b368426a09ca39b680..e99cb254519a7fa12a1a87a04e3de4a78103f7bf 100644
--- a/htdocs/langs/ru_RU/cron.lang
+++ b/htdocs/langs/ru_RU/cron.lang
@@ -18,9 +18,8 @@ CronExplainHowToRunUnix=On Unix environment you should use crontab to run Comman
CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
# Menu
CronJobs=Запланированные задания
-CronListActive= Список активных заданий
-CronListInactive= Список неактивных заданий
-CronListActive= Список активных заданий
+CronListActive=List of active/scheduled jobs
+CronListInactive=Список неактивных заданий
# Page list
CronDateLastRun=Последний раз выполнено
CronLastOutput=Last run output
diff --git a/htdocs/langs/ru_RU/donations.lang b/htdocs/langs/ru_RU/donations.lang
index bb883e3a0d23bfcce788a63eee5b465c6b73c7c6..e8339fe9701e57b632beba07c57988be74f03bd6 100644
--- a/htdocs/langs/ru_RU/donations.lang
+++ b/htdocs/langs/ru_RU/donations.lang
@@ -4,7 +4,7 @@ Donations=Пожертвования
DonationRef=Donation ref.
Donor=Донор
Donors=Доноры
-AddDonation=Добавить пожертвование
+AddDonation=Create a donation
NewDonation=Новое пожертвование
ShowDonation=Show donation
DonationPromise=Обещание пожертвования
@@ -31,3 +31,8 @@ DonationRecipient=Donation recipient
ThankYou=Thank You
IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
MinimumAmount=Minimum amount is %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/ru_RU/externalsite.lang b/htdocs/langs/ru_RU/externalsite.lang
index 98e718918a35863771574d3577a72f9da02a9f62..08fbccee1d6575491c55bc953c97019de631e63f 100644
--- a/htdocs/langs/ru_RU/externalsite.lang
+++ b/htdocs/langs/ru_RU/externalsite.lang
@@ -2,3 +2,4 @@
ExternalSiteSetup=Установка ссылки на внешние веб-сайт
ExternalSiteURL=URL внешнего сайта
ExternalSiteModuleNotComplete=Модуль ВнешнийСайт не был надлежащим образом настроен.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/ru_RU/holiday.lang b/htdocs/langs/ru_RU/holiday.lang
index 1018ab82acec191c9aa9f9851bb561e0d609acc8..5d133e0bbf75359e837da918240d42fd6f28820c 100644
--- a/htdocs/langs/ru_RU/holiday.lang
+++ b/htdocs/langs/ru_RU/holiday.lang
@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
CantCreateCP=You don't have the right to make leave requests.
InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=Обновить
CantUpdate=You cannot update this leave request.
NoDateDebut=Вы должны выбрать начальную дату
NoDateFin=Вы должны выбрать конечную дату
-ErrorDureeCP=Ваш запрос на выходной не содержит рабочих дней
-TitleValidCP=Approve the request holidays
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
ConfirmValidCP=Are you sure you want to approve the leave request?
DateValidCP=Дата утверждена
TitleToValidCP=Send leave request
ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the request holidays
+TitleRefuseCP=Refuse the leave request
ConfirmRefuseCP=Are you sure you want to refuse the leave request?
NoMotifRefuseCP=Вы должны выбрать причину отказа на запрос о выходных днях
-TitleCancelCP=Cancel the request holidays
+TitleCancelCP=Cancel the leave request
ConfirmCancelCP=Are you sure you want to cancel the leave request?
DetailRefusCP=Причина отказа
DateRefusCP=Дата отказа
@@ -78,7 +77,7 @@ ActionByCP=Performed by
UserUpdateCP=Для пользователя
PrevSoldeCP=Предыдущий баланс
NewSoldeCP=Новый баланс
-alreadyCPexist=A request for holidays has already been done on this period.
+alreadyCPexist=A leave request has already been done on this period.
UserName=Имя
Employee=Сотрудник
FirstDayOfHoliday=First day of vacation
@@ -88,25 +87,25 @@ ManualUpdate=Manual update
HolidaysCancelation=Leave request cancelation
## Configuration du Module ##
-ConfCP=Настройка модуля выходных дней
+ConfCP=Configuration of leave request module
DescOptionCP=Описание опции
ValueOptionCP=Значение
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
ConfirmConfigCP=Проверить конфигурацию
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
UpdateConfCPOK=Обновлено успешно
ErrorUpdateConfCP=Во время обновления произошла ошибка. Пожалуйста, попробуйте еще раз.
-AddCPforUsers=Please add the balance of holidays of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
Module27130Name= Management of leave requests
Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
TitleOptionEventCP=Settings of leave requets for events
ValidEventCP=Проверить
UpdateEventCP=Update events
diff --git a/htdocs/langs/ru_RU/interventions.lang b/htdocs/langs/ru_RU/interventions.lang
index 25c47fa96a5ea3072a947dfc38124e373d33f64c..8e5b1d3c14f233e4b454894f9c399d24630a6b1e 100644
--- a/htdocs/langs/ru_RU/interventions.lang
+++ b/htdocs/langs/ru_RU/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Вмешательство
Interventions=Мероприятия
InterventionCard=Вмешательство карту
NewIntervention=Новая интервенция
-AddIntervention=Добавить вмешательства
+AddIntervention=Create intervention
ListOfInterventions=Перечень мероприятий
EditIntervention=Editer вмешательства
ActionsOnFicheInter=Действия по вмешательству
@@ -30,6 +30,15 @@ StatusInterInvoiced=Объявленный
RelatedInterventions=Связанные с ней мероприятия
ShowIntervention=Показать вмешательства
SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Представители следующих мер вмешательства
TypeContact_fichinter_internal_INTERVENING=Вмешательство
diff --git a/htdocs/langs/ru_RU/mails.lang b/htdocs/langs/ru_RU/mails.lang
index b05271e4bb91c3f90218597c52956da6818c6988..670a7e81b4c60ce639f917422039a9d76aa977e6 100644
--- a/htdocs/langs/ru_RU/mails.lang
+++ b/htdocs/langs/ru_RU/mails.lang
@@ -115,7 +115,7 @@ SentBy=Прислал
MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
MailingNeedCommand2=Однако вы можете отправить их в Интернете, добавив параметр MAILING_LIMIT_SENDBYWEB с величиной максимальное количество писем вы хотите отправить на сессии.
ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=Очистить список
ToClearAllRecipientsClickHere=Чтобы очистить получателей список для этого адреса, нажмите кнопку
ToAddRecipientsChooseHere=Чтобы добавить адресатов, выберите в этих списках
@@ -133,6 +133,9 @@ Notifications=Уведомления
NoNotificationsWillBeSent=Нет электронной почте уведомления, планируется к этому мероприятию и компании
ANotificationsWillBeSent=1 уведомление будет отправлено по электронной почте
SomeNotificationsWillBeSent=%s уведомления будут отправлены по электронной почте
-AddNewNotification=Включить новое уведомление запросу
-ListOfActiveNotifications=Список всех активных уведомлений запросов
+AddNewNotification=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
ListOfNotificationsDone=Список всех уведомлений по электронной почте отправлено
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index d95bbc81215214dd5173d20d5beeb5d4dc318f4e..bdd90bf67cf77960e4663bcfbf1f8417901c7403 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Не удалось найти польз
ErrorNoVATRateDefinedForSellerCountry=Ошибка, ставки НДС не установлены для страны '%s'.
ErrorNoSocialContributionForSellerCountry=Ошибка, не определен тип социальных взносов для страны %s.
ErrorFailedToSaveFile=Ошибка, не удалось сохранить файл.
-ErrorOnlyPngJpgSupported=Ошибка, поддерживаются только форматы файлов изображений .PNG и .JPG.
-ErrorImageFormatNotSupported=Ваш PHP не поддерживает функции для преобразования изображений в этом формате.
SetDate=Установить дату
SelectDate=Выбрать дату
SeeAlso=Смотрите также %s
BackgroundColorByDefault=Цвет фона по умолчанию
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
FileWasNotUploaded=Файл выбран как вложение, но пока не загружен. Для этого нажмите "Вложить файл".
NbOfEntries=Кол-во записей
GoToWikiHelpPage=Читать он-лайн помощь (нужен доступ к Интернету)
@@ -266,6 +266,7 @@ Afternoon=После полудня
Quadri=Квадри
MonthOfDay=Месяц дня
HourShort=ч
+MinuteShort=mn
Rate=Курс
UseLocalTax=Включить налог
Bytes=Байт
@@ -340,6 +341,7 @@ FullList=Полный список
Statistics=Статистика
OtherStatistics=Другие статистические данные
Status=Статус
+Favorite=Favorite
ShortInfo=Инфо
Ref=Ref.
RefSupplier=Ref. поставщика
@@ -365,6 +367,7 @@ ActionsOnCompany=Действия для этого контрагента
ActionsOnMember=События об этом члене
NActions=%s действий
NActionsLate=% с опозданием
+RequestAlreadyDone=Request already recorded
Filter=Фильтр
RemoveFilter=Удалить фильтр
ChartGenerated=Диаграмма сгенерирована
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Дополнительная настройка атрибу
URLPhoto=Адрес фотографии/логотипа
SetLinkToThirdParty=Ссылка на другой третьей стороне
CreateDraft=Создать проект
+SetToDraft=Back to draft
ClickToEdit=Нажмите, чтобы изменить
ObjectDeleted=Объект удален %s
ByCountry=По стране
@@ -678,7 +682,7 @@ ViewPrivateNote=Посмотреть заметки
XMoreLines=%s строк(и) скрыто
PublicUrl=Public URL
AddBox=Add box
-
+SelectElementAndClickRefresh=Select an element and click Refresh
# Week day
Monday=Понедельник
Tuesday=Вторник
diff --git a/htdocs/langs/ru_RU/margins.lang b/htdocs/langs/ru_RU/margins.lang
index 88f41b1ea28adae5676d72db003beaf70fe83169..2c8124105981e01ec7568fdd3ac927a9fc1caaae 100644
--- a/htdocs/langs/ru_RU/margins.lang
+++ b/htdocs/langs/ru_RU/margins.lang
@@ -38,4 +38,7 @@ BuyingCost=Себестоимость
UnitCharges=Unit charges
Charges=Charges
AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/ru_RU/orders.lang b/htdocs/langs/ru_RU/orders.lang
index c5f655e4781894415f4680e6c876851b67990105..6d2e03bcbb34ab122e360dfe47e8cdf38450605c 100644
--- a/htdocs/langs/ru_RU/orders.lang
+++ b/htdocs/langs/ru_RU/orders.lang
@@ -53,7 +53,7 @@ ShippingExist=Отгрузки существует
DraftOrWaitingApproved=Проект или утверждены еще не заказал
DraftOrWaitingShipped=Проект или подтверждены не отгружен
MenuOrdersToBill=Заказы на законопроект
-MenuOrdersToBill2=Orders to bill
+MenuOrdersToBill2=Billable orders
SearchOrder=Поиск тем
SearchACustomerOrder=Search a customer order
ShipProduct=Судно продукта
@@ -65,7 +65,7 @@ ValidateOrder=Проверка порядка
UnvalidateOrder=Unvalidate порядке
DeleteOrder=Удалить тему
CancelOrder=Отмена порядка
-AddOrder=Добавить тему
+AddOrder=Create order
AddToMyOrders=Добавить в мои заказы
AddToOtherOrders=Добавить в других заказов
AddToDraftOrders=Add to draft order
@@ -154,7 +154,6 @@ OrderByPhone=Телефон
CreateInvoiceForThisCustomer=Bill orders
NoOrdersToInvoice=No orders billable
CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-MenuOrdersToBill2=Orders to bill
OrderCreation=Order creation
Ordered=Ordered
OrderCreated=Your orders have been created
diff --git a/htdocs/langs/ru_RU/oscommerce.lang b/htdocs/langs/ru_RU/oscommerce.lang
deleted file mode 100644
index 8388024980c4aed7b19245bf29548cbf19667666..0000000000000000000000000000000000000000
--- a/htdocs/langs/ru_RU/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=Настройка модуля OS Commerce
-OSCommerceSetupSaved=Настройка OS Commerce сохранена
-OSCommerceServer=Хост/IP сервера OS Commerce
-OSCommerceDatabaseName=Имя базы данных OS Commerce
-OSCommercePrefix=Префикс таблиц OS Commerce
-OSCommerceUser=Имя пользователя базы данных OS Commerce
diff --git a/htdocs/langs/ru_RU/other.lang b/htdocs/langs/ru_RU/other.lang
index e0c8cefb34b89031e359cbc2fccb7670058174b7..62d309beae836053e1eb07a44ba556ac763052e2 100644
--- a/htdocs/langs/ru_RU/other.lang
+++ b/htdocs/langs/ru_RU/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=Защитный код
Calendar=Календарь
-AddTrip=Добавить поездку
Tools=Инструменты
ToolsDesc=Эта область посвящена группе разные инструменты не доступны в другие пункты меню. <br><br> Эти инструменты могут быть достигнуты из меню на стороне.
Birthday=День рождения
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation
Notify_TASK_CREATE=Task created
Notify_TASK_MODIFY=Task modified
Notify_TASK_DELETE=Task deleted
+SeeModuleSetup=See module setup
NbOfAttachedFiles=Количество прикрепленных файлов / документов
TotalSizeOfAttachedFiles=Общий размер присоединенных файлов / документы
MaxSize=Максимальный размер
@@ -80,6 +80,16 @@ ModifiedBy=Модифицированное% по S
ValidatedBy=Подтверждено %s
CanceledBy=Отменена %s
ClosedBy=Закрытые% по S
+CreatedById=User id who created
+ModifiedById=User id who made last change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made last change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
FileWasRemoved=Файл был удален
DirWasRemoved=Каталог был удален
FeatureNotYetAvailableShort=Имеющиеся в следующей версии
@@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your
##### Calendar common #####
AddCalendarEntry=Добавить запись в календаре %s
-NewCompanyToDolibarr=Компания S% добавлен в Dolibarr
-ContractValidatedInDolibarr=Контракт %s проверены в Dolibarr
-ContractCanceledInDolibarr=Контракт %s отменена в Dolibarr
-ContractClosedInDolibarr=Контракт% с закрытым в Dolibarr
-PropalClosedSignedInDolibarr=Предложение% ы подписали в Dolibarr
-PropalClosedRefusedInDolibarr=Предложение %s отказала в Dolibarr
-PropalValidatedInDolibarr=Предложение %s проверены в Dolibarr
-InvoiceValidatedInDolibarr=Счет %s проверены в Dolibarr
-InvoicePaidInDolibarr=Счет %s изменено на выигрыш в Dolibarr
-InvoiceCanceledInDolibarr=Счет %s отменена в Dolibarr
-PaymentDoneInDolibarr=Оплата %s сделали в Dolibarr
-CustomerPaymentDoneInDolibarr=Заказчиком оплаты %s сделали в Dolibarr
-SupplierPaymentDoneInDolibarr=Поставщик оплаты %s сделали в Dolibarr
-MemberValidatedInDolibarr=Член %s проверены в Dolibarr
-MemberResiliatedInDolibarr=Член %s resiliated в Dolibarr
-MemberDeletedInDolibarr=Член %s исключить из Dolibarr
-MemberSubscriptionAddedInDolibarr=Подписка на члена %s добавили в Dolibarr
-ShipmentValidatedInDolibarr=Отгрузка %s подтверждены в Dolibarr
-ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
##### Export #####
Export=Экспорт
ExportsArea=Экспорт области
diff --git a/htdocs/langs/ru_RU/paybox.lang b/htdocs/langs/ru_RU/paybox.lang
index 1a971a60055e1c7248a0e3422852a6932cccdab5..ffa474a9646cc2144c87222397b18f0fccc82b24 100644
--- a/htdocs/langs/ru_RU/paybox.lang
+++ b/htdocs/langs/ru_RU/paybox.lang
@@ -32,6 +32,9 @@ VendorName=Имя поставщика
CSSUrlForPaymentForm=CSS-стилей URL для оплаты форме
MessageOK=Сообщение на странице проверки возвращение оплаты
MessageKO=Сообщение на странице отменен возврат оплаты
-# NewPayboxPaymentReceived=New Paybox payment received
-# NewPayboxPaymentFailed=New Paybox payment tried but failed
-# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+NewPayboxPaymentReceived=New Paybox payment received
+NewPayboxPaymentFailed=New Paybox payment tried but failed
+PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/ru_RU/resource.lang b/htdocs/langs/ru_RU/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..d64075dfbf595897a63e3eebf19194d8f71030dd
--- /dev/null
+++ b/htdocs/langs/ru_RU/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
diff --git a/htdocs/langs/ru_RU/sendings.lang b/htdocs/langs/ru_RU/sendings.lang
index c97f43111a8e7a62f8301cf68890b7d77e3956b9..d78afdf7338e43ce5fed07446dd9ef748276d3bd 100644
--- a/htdocs/langs/ru_RU/sendings.lang
+++ b/htdocs/langs/ru_RU/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=На данный момент, создание
RelatedShippings=Related shippings
ShipmentLine=Shipment line
CarrierList=List of transporters
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
# Sending methods
SendingMethodCATCH=Catch заказчиком
diff --git a/htdocs/langs/ru_RU/stocks.lang b/htdocs/langs/ru_RU/stocks.lang
index 7634aae0a3bed040eae24ac4da0e36f52dfa02d5..28174e8f2524e88b390b57a94c6f325b7d69007b 100644
--- a/htdocs/langs/ru_RU/stocks.lang
+++ b/htdocs/langs/ru_RU/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Склад этикетке необходимо
CorrectStock=Правильно запас
ListOfWarehouses=Список складов
ListOfStockMovements=Список акций движения
-StocksArea=Акции области
+StocksArea=Warehouses area
Location=Вместо
LocationSummary=Сокращенное наименование расположение
NumberOfDifferentProducts=Кол-во различных продуктов
diff --git a/htdocs/langs/ru_RU/users.lang b/htdocs/langs/ru_RU/users.lang
index 8ab8f95e2f9bb701e45e855347a0de68f0f9f81b..94c544bc7ea2b40b54cb1ad38f127a6b72835238 100644
--- a/htdocs/langs/ru_RU/users.lang
+++ b/htdocs/langs/ru_RU/users.lang
@@ -63,7 +63,6 @@ ShowGroup=Показать группы
ShowUser=Показать пользователей
NonAffectedUsers=Расходы пользователей
UserModified=Пользователь изменен успешно
-GroupModified=Группа успешно изменен
PhotoFile=Фото файл
UserWithDolibarrAccess=Пользователь с доступом Dolibarr
ListOfUsersInGroup=Список пользователей в эту группу
@@ -103,7 +102,7 @@ UserDisabled=Пользователь %s-инвалидов
UserEnabled=Пользователь %s активированного
UserDeleted=Пользователь %s удален
NewGroupCreated=Группа создала %s
-GroupModified=Группа успешно изменен
+GroupModified=Group %s modified
GroupDeleted=Группа удалить %s
ConfirmCreateContact=Вы уверены, что Ю. хотите создать Dolibarr счета для этого обратиться?
ConfirmCreateLogin=Вы уверены, что хотите создать учетную запись для Dolibarr этот член?
@@ -114,8 +113,10 @@ YourRole=Ваша роль
YourQuotaOfUsersIsReached=Квота активных пользователей будет достигнута!
NbOfUsers=Кол-во пользователей
DontDowngradeSuperAdmin=Только суперамин может понизить суперамин
-HierarchicalResponsible=Hierarchical responsible
+HierarchicalResponsible=Supervisor
HierarchicView=Hierarchical view
UseTypeFieldToChange=Use field Type to change
OpenIDURL=OpenID URL
LoginUsingOpenID=Использовать OpenID для входа
+WeeklyHours=Weekly hours
+ColorUser=Color of the user
diff --git a/htdocs/langs/ru_RU/withdrawals.lang b/htdocs/langs/ru_RU/withdrawals.lang
index 760ba7a4671b70112602ca7afca29d600ba5fdaf..4e8a688b7ce1e48b1d17fac0736e9189fd93ca74 100644
--- a/htdocs/langs/ru_RU/withdrawals.lang
+++ b/htdocs/langs/ru_RU/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=Квитанция
LastWithdrawalReceipts=Последнее% с выводом квитанции
WithdrawedBills=Withdrawed счетов-фактур
WithdrawalsLines=Снятие линии
-RequestStandingOrderToTreat=Запрос Регламента для лечения
-RequestStandingOrderTreated=Запрос Регламента лечение
+RequestStandingOrderToTreat=Request for standing orders to process
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=Клиент Регламент
CustomerStandingOrder=Для постоянных клиентов
NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
@@ -40,14 +41,13 @@ TransMetod=Метод передачи
Send=Отправить
Lines=Линии
StandingOrderReject=Выпуск отклонить
-InvoiceRefused=Зарядка отказа клиента
WithdrawalRefused=Выплаты Refuseds
WithdrawalRefusedConfirm=Вы уверены, что вы хотите ввести снятия отказа общества
RefusedData=Дата отказа
RefusedReason=Причина для отказа
RefusedInvoicing=Счета отказ
NoInvoiceRefused=Не заряжайте отказ
-InvoiceRefused=Зарядка отказа клиента
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=Статус
StatusUnknown=Неизвестный
StatusWaiting=Ожидание
@@ -76,7 +76,7 @@ WithBankUsingRIB=Для банковских счетов с использов
WithBankUsingBANBIC=Для банковских счетов с использованием IBAN / BIC / SWIFT
BankToReceiveWithdraw=Банковский счет для получения отзывает
CreditDate=Кредит на
-WithdrawalFileNotCapable=Невозможно создать файл вывода квитанцию для вашей страны
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
ShowWithdraw=Показать Вывод
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Однако, если счет-фактура имеет по крайней мере один вывод оплаты еще не обработан, то он не будет установлен, как оплачиваются, чтобы управлять снятие ранее.
DoStandingOrdersBeforePayments=Это вкладок позволяет запросить за постоянного платежного поручения. Как только она будет закончена, вы можете ввести оплату, чтобы закрыть счета.
diff --git a/htdocs/langs/sk_SK/accountancy.lang b/htdocs/langs/sk_SK/accountancy.lang
index 8cab9d2b651d75b0721d76fda619e2034e4509b4..39c2732ec29852cf93d41614ed1812c2a4c1ce4f 100644
--- a/htdocs/langs/sk_SK/accountancy.lang
+++ b/htdocs/langs/sk_SK/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts
Validate=Validate
Addanaccount=Add an accounting account
AccountAccounting=Accounting account
-Ventilation=Ventilation
+Ventilation=Breakdown
ToDispatch=To dispatch
Dispatched=Dispatched
-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
TradeMargin=Trade margin
Reports=Reports
ByCustomerInvoice=By invoices customers
@@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger
Bookkeeping=General ledger
AccountBalanceByMonth=Account balance by month
-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
Line=Line
CAHTF=Total purchase supplier HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice
IntoAccount=In the accounting account
Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
+VentilationAuto=Automatic breakdown
Processing=Processing
EndProcessing=The end of processing
@@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account
ACCOUNTING_SEPARATORCSV=Separator CSV
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
@@ -140,14 +140,14 @@ Active=Statement
NewFiscalYear=New fiscal year
-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
TotalVente=Total turnover HT
TotalMarge=Total sales margin
DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
ChangeAccount=Change the accounting account for lines selected by the account:
Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
@@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically
ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index 630d682937416fb21558cfdc2721fd018b8b75f1..0647339602675b756166df21c36b1817e58b0377 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -437,8 +437,8 @@ Module52Name=Zásoby
Module52Desc=Skladové hospodárstvo (výrobky)
Module53Name=Služby
Module53Desc=Správa služieb
-Module54Name=Zmluvy
-Module54Desc=Zmluva a riadenie služieb
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=Čiarové kódy
Module55Desc=Barcode riadenie
Module56Name=Telefónia
@@ -475,8 +475,8 @@ Module320Name=RSS Feed
Module320Desc=Pridať RSS kanál vnútri obrazoviek Dolibarr
Module330Name=Záložky
Module330Desc=Správa záložiek
-Module400Name=Projekty
-Module400Desc=Projektový manažment vo vnútri iných modulov
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=WebCalendar
Module410Desc=WebCalendar integrácia
Module500Name=Special expenses (tax, social contributions, dividends)
@@ -484,7 +484,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di
Module510Name=Salaries
Module510Desc=Management of employees salaries and payments
Module600Name=Upozornenie
-Module600Desc=Zasielať upozornenia e-mailom na niektorých firemných akcií Dolibarr tretích strán kontakty
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Dary
Module700Desc=Darovanie riadenie
Module1200Name=Mantis
@@ -514,16 +514,16 @@ Module5000Name=Multi-spoločnosť
Module5000Desc=Umožňuje spravovať viac spoločností
Module6000Name=Workflow
Module6000Desc=Workflow management
-Module20000Name=Prázdniny
-Module20000Desc=Deklarovať a dodržiavať zamestnanci dovolenku
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
Module39000Name=Product batch
Module39000Desc=Batch number, eat-by and sell-by date management on products
Module50000Name=Paybox
Module50000Desc=Modul ponúknuť on-line platby kreditnou kartou stránku s Paybox
Module50100Name=Bod predaja
Module50100Desc=Mieste predaja modulu
-Module50200Name= Paypal
-Module50200Desc= Modul ponúknuť on-line platby kreditnou kartou stránku s Paypal
+Module50200Name=Paypal
+Module50200Desc=Modul ponúknuť on-line platby kreditnou kartou stránku s Paypal
Module50400Name=Accounting (advanced)
Module50400Desc=Accounting management (double parties)
Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=Prečítajte si trvalé príkazy
Permission152=Vytvoriť / upraviť trvalých príkazov žiadosť
Permission153=Prevodovka trvalých príkazov príjmy
Permission154=Kredit / odmietnuť trvalých príkazov príjmy
-Permission161=Čítajte zmluvy
-Permission162=Vytvoriť / upraviť zmluvy
-Permission163=Aktivácia služby zmluvy
-Permission164=Zakázať službu zmluvy
-Permission165=Odstrániť zmluvy
-Permission171=Prečítajte si výlety
-Permission172=Vytvoriť / upraviť výlety
-Permission173=Odstrániť výlety
-Permission178=Export výlety
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Read trips and expenses (own and his subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
Permission180=Prečítajte si dodávateľa
Permission181=Prečítajte si dodávateľských objednávok
Permission182=Vytvoriť / upraviť dodávateľskej objednávky
@@ -671,7 +672,7 @@ Permission300=Prečítajte čiarových kódov
Permission301=Vytvoriť / upraviť čiarových kódov
Permission302=Odstrániť čiarových kódov
Permission311=Prečítajte služby
-Permission312=Priradiť službu zmluvy
+Permission312=Assign service/subscription to contract
Permission331=Prečítajte si záložky
Permission332=Vytvoriť / upraviť záložky
Permission333=Odstránenie záložky
@@ -701,8 +702,8 @@ Permission701=Prečítajte si dary
Permission702=Vytvoriť / upraviť dary
Permission703=Odstrániť dary
Permission1001=Prečítajte si zásoby
-Permission1002=Vytvoriť / upraviť zásoby
-Permission1003=Odstrániť zásoby
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=Prečítajte skladové pohyby
Permission1005=Vytvoriť / upraviť skladové pohyby
Permission1101=Prečítajte si dodacie
@@ -1038,7 +1039,6 @@ YesInSummer=Áno v lete
OnlyFollowingModulesAreOpenedToExternalUsers=Na vedomie, že iba nasledujúce moduly otvoril externým používateľom (nech sú povolenia týchto užívateľov):
SuhosinSessionEncrypt=Úložisko relácie šifrovaná Suhosin
ConditionIsCurrently=Podmienkou je v súčasnej dobe %s
-TestNotPossibleWithCurrentBrowsers=Automatická detekcia nie je možné
YouUseBestDriver=Pomocou ovládača %s, že je najlepší vodič súčasnej dobe k dispozícii.
YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
NbOfProductIsLowerThanNoPb=Máte len %s produktov / služieb do databázy. To však nie je nutné žiadne špeciálne optimalizácie.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=Vrátiť evidencia kód postavený podľa: <br> %s nas
ModuleCompanyCodePanicum=Späť prázdny evidencia kód.
ModuleCompanyCodeDigitaria=Účtovníctvo kód závisí na kóde tretích strán. Kód sa skladá zo znaku "C" na prvom mieste nasleduje prvých 5 znakov kódu tretích strán.
UseNotifications=Použitie oznámenia
-NotificationsDesc=E-maily oznámenia vám umožňuje odosielať automatické ticho mail, na niektoré udalosti Dolibarr, tretím stranám (zákazníkov alebo dodávateľov), ktoré sú konfigurované pre. Voľba aktívneho oznámenia a terče kontaktov sa vykonáva jedna tretina strán v čase.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
ModelModules=Dokumenty šablóny
DocumentModelOdt=Generovanie dokumentov z OpenDocuments šablón (. ODT alebo ODS. Súbory OpenOffice, KOffice, TextEdit, ...)
WatermarkOnDraft=Vodoznak na návrhu dokumentu
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=Pridať dodacia lehota schopnosť
UseOptionLineIfNoQuantity=Rad výrobkov / služieb s nulovej hodnoty je považovaný za možnosť
FreeLegalTextOnProposal=Voľný text o obchodných návrhov
WatermarkOnDraftProposal=Vodoznak na predlôh návrhov komerčných (none ak prázdny)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=Objednať riadenie nastavenia
OrdersNumberingModules=Objednávky číslovanie modelov
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list
ValidOrderAfterPropalClosed=Pre potvrdenie objednávky po návrhu užší, umožňuje, aby krok za dočasné poradí
FreeLegalTextOnOrders=Voľný text o objednávkach
WatermarkOnDraftOrders=Vodoznak na konceptoch objednávok (ak žiadny prázdny)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
##### Clicktodial #####
ClickToDialSetup=Kliknite pre Dial Nastavenie modulu
ClickToDialUrlDesc=Url volaná, keď sa vykonáva kliknutím na tel Piktogram. Do poľa URL môžete použiť značky <br> <b>__PHONETO__</b> Ktorý bude nahradený s telefónnym číslom osoby volať <br> <b>__PHONEFROM__</b> Ktorý bude nahradený telefónne číslo volajúceho (vaše) <br> <b>__LOGIN__</b> Ktorý bude nahradený s clicktodial prihlásenie (definované na karte užívateľa) <br> <b>__PASS__</b> Ktorý bude nahradený s clicktodial heslo (definované na karte užívateľa).
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=Intervenčné číslovanie modely
TemplatePDFInterventions=Intervenčné kariet dokumenty modely
WatermarkOnDraftInterventionCards=Vodoznak na dokumentoch intervenčných karty (ak žiadny prázdny)
##### Contracts #####
-ContractsSetup=Zákazky modul nastavenia
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=Zákazky číslovanie moduly
TemplatePDFContracts=Contracts documents models
FreeLegalTextOnContracts=Free text on contracts
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Súbory typu %s nekomprimuje servera HTTP
CacheByServer=Cache serverom
CacheByClient=Cache v prehliadači
CompressionOfResources=Kompresia odpovedí HTTP
-TestNotPossibleWithCurrentBrowsers=Automatická detekcia nie je možné
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=Produkty modul nastavenia
ServiceSetup=Služby modul nastavenia
@@ -1382,9 +1384,10 @@ MailingSetup=E-mailom Nastavenie modulu
MailingEMailFrom=Odosielateľa (From) pre emailov zasielaných e-mailom na modul
MailingEMailError=Späť E-mail (chyby-do) e-maily s chybami
##### Notification #####
-NotificationSetup=Oznámenie bu email modul nastavenia
+NotificationSetup=EMail notification module setup
NotificationEMailFrom=Odosielateľa (From) e-maily zaslané na oznámenia
-ListOfAvailableNotifications=Zoznam dostupných oznámenia (Tento zoznam závisí na aktivovaných modulov)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
##### Sendings #####
SendingsSetup=Odoslanie Nastavenie modulu
SendingsReceiptModel=Odoslanie potvrdenky modelu
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=Pripojenie k serveru "%s" na databázu "%s"
OSCommerceTestKo1=Pripojenie k "%s" servera úspešná, ale databáza "%s" by nebolo možné dosiahnuť.
OSCommerceTestKo2=Pripojenie k serveru "%s" s užívateľom "%s 'zlyhalo.
##### Stock #####
-StockSetup=Konfigurácia modulu sklad
-UserWarehouse=Používajte osobné užívateľské zásoby
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=Menu zmazaný
TreeMenu=Strom menu
@@ -1478,11 +1482,14 @@ ClickToDialDesc=Tento modul umožňuje pridať ikonu po telefónnych čísel. Kl
##### Point Of Sales (CashDesk) #####
CashDesk=Bod predaja
CashDeskSetup=Mieste predaja modulu nastavenie
-CashDeskThirdPartyForSell=Generic treťou stranou použiť pre predáva
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Predvolený účet použiť na príjem platieb v hotovosti
CashDeskBankAccountForCheque= Predvolený účet použiť pre príjem platieb šekom
CashDeskBankAccountForCB= Predvolený účet použiť pre príjem platieb prostredníctvom kreditnej karty
-CashDeskIdWareHouse=Sklad použiť pre predáva
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Záložka Nastavenie modulu
BookmarkDesc=Tento modul umožňuje spravovať záložky. Môžete tiež pridať skratky pre všetky Dolibarr stránky alebo external webových stránok na vašom ľavom menu.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Delete fiscal year
ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
Opened=Opened
Closed=Closed
-
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
diff --git a/htdocs/langs/sk_SK/agenda.lang b/htdocs/langs/sk_SK/agenda.lang
index 109fb062205d972581d7023fd2a59f290b9c5602..b267c89fb22c425096a7bf1f530bd4c9d0e9a7ca 100644
--- a/htdocs/langs/sk_SK/agenda.lang
+++ b/htdocs/langs/sk_SK/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= Automatické plnenie
AgendaAutoActionDesc= Definujte tu udalosti, na ktoré chcete Dolibarr vytvoriť automaticky udalosť v programe. Pokiaľ nie je označená (v predvolenom nastavení), bude iba manuálne činnosti byť zahrnuté do programu rokovania.
AgendaSetupOtherDesc= Táto stránka poskytuje možnosti, ako dať export vašich akcií Dolibarr do externého kalendára (thunderbird, Google kalendár, ...)
AgendaExtSitesDesc=Táto stránka umožňuje deklarovať externé zdroje kalendárov vidieť svoje akcie do programu Dolibarr.
-ActionsEvents= Udalosti, pre ktoré Dolibarr vytvorí akciu v programe automaticky
-PropalValidatedInDolibarr= Návrh %s overená
-InvoiceValidatedInDolibarr= Faktúra %s overená
+ActionsEvents=Udalosti, pre ktoré Dolibarr vytvorí akciu v programe automaticky
+PropalValidatedInDolibarr=Návrh %s overená
+InvoiceValidatedInDolibarr=Faktúra %s overená
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=Faktúra %s vrátiť do stavu návrhu
InvoiceDeleteDolibarr=Faktúra %s zmazaná
OrderValidatedInDolibarr= Objednať %s overená
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Objednať %s schválený
OrderRefusedInDolibarr=Order %s refused
OrderBackToDraftInDolibarr=Objednať %s vrátiť do stavu návrhu
OrderCanceledInDolibarr=Objednať %s zrušený
-InterventionValidatedInDolibarr=Intervenčné %s overená
ProposalSentByEMail=Komerčné návrh %s zaslaná e-mailom
OrderSentByEMail=%s zákazníkov objednávka zaslaná e-mailom
InvoiceSentByEMail=%s faktúre Zákazníka zaslaná e-mailom
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=%s Dodávateľ objednávka zaslaná e-mailom
SupplierInvoiceSentByEMail=%s dodávateľskej faktúry zasielané e-mailom
ShippingSentByEMail=Prepravné %s zaslaná e-mailom
ShippingValidated= Shipping %s validated
-InterventionSentByEMail=Intervenčné %s zaslaná e-mailom
-InterventionClassifiedBilled=Intervention %s classified as Billed
NewCompanyToDolibarr= Tretia strana vytvorená
DateActionPlannedStart= Plánovaný dátum začatia
DateActionPlannedEnd= Plánovaný dátum ukončenia
@@ -70,9 +68,9 @@ DateActionStart= Dátum začatia
DateActionEnd= Dátum ukončenia
AgendaUrlOptions1=Môžete tiež pridať nasledujúce parametre filtrovania výstupu:
AgendaUrlOptions2=<b>login = %s</b> obmedziť výstup na akcie vytvorené, pridelených alebo vykonať užívateľa <b>%s.</b>
-AgendaUrlOptions3=<b>Logina = %s</b> obmedziť výstup na akcie vytvorené užívateľom <b>%s.</b>
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
AgendaUrlOptions4=<b>logint = %s</b> obmedziť výstup na akcie priradených užívateľských <b>%s.</b>
-AgendaUrlOptions5=<b>logind = %s</b> obmedziť výstup na akcie vykonané užívateľom <b>%s.</b>
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
AgendaShowBirthdayEvents=Zobraziť narodeniny kontaktov
AgendaHideBirthdayEvents=Skryť narodeniny kontaktov
Busy=Zaneprázdnený
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=URL pre prístup. Súbor iCal
ExtSiteNoLabel=Nie Popis
WorkingTimeRange=Working time range
WorkingDaysRange=Working days range
-AddEvent=Add event
+AddEvent=Create event
MyAvailability=My availability
diff --git a/htdocs/langs/sk_SK/bills.lang b/htdocs/langs/sk_SK/bills.lang
index 08453c7534dc15107f36e156eb4bfb9f1a9741f7..2ac41eb7580b2e1d1339dcbd452ee7bc93dc55b0 100644
--- a/htdocs/langs/sk_SK/bills.lang
+++ b/htdocs/langs/sk_SK/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Dobropis
InvoiceAvoirAsk=Dobropis opraviť faktúru
InvoiceAvoirDesc=<b>Dobropis</b> je negatívny faktúra slúži na riešenie skutočnosť, že faktúra je množstvo, ktoré sa líšia ako suma skutočne vyplatená (pretože zákazník zaplatil príliš veľa omylom, alebo nebude vyplatená úplne, pretože on sa vrátil niektoré výrobky, napríklad).
invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
-invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
ReplaceInvoice=Vymeňte faktúry %s
ReplacementInvoice=Náhradné faktúra
ReplacedByInvoice=Nahradil faktúre %s
@@ -87,7 +87,7 @@ ClassifyCanceled=Klasifikovať "Opustené"
ClassifyClosed=Klasifikáciu "uzavretým"
ClassifyUnBilled=Classify 'Unbilled'
CreateBill=Vytvoriť faktúru
-AddBill=Pridať faktúru alebo dobropis
+AddBill=Create invoice or credit note
AddToDraftInvoices=Pridať k návrhu faktúru
DeleteBill=Odstrániť faktúru
SearchACustomerInvoice=Hľadať zákazníckej faktúre
@@ -99,7 +99,7 @@ DoPaymentBack=Do platobnej chrbát
ConvertToReduc=Prevod do budúcnosti zľavou
EnterPaymentReceivedFromCustomer=Zadajte platby, ktoré obdržal od zákazníka
EnterPaymentDueToCustomer=Vykonať platbu zo strany zákazníka
-DisabledBecauseRemainderToPayIsZero=Zakázané, pretože zvyšok zaplatiť, je nulová
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
Amount=Množstvo
PriceBase=Cena základnej
BillStatus=Stav faktúry
@@ -137,8 +137,6 @@ BillFrom=Z
BillTo=Na
ActionsOnBill=Akcie na faktúre
NewBill=Nová faktúra
-Prélèvements=Trvalý príkaz
-Prélèvements=Trvalý príkaz
LastBills=Posledný %s faktúry
LastCustomersBills=Posledné %s zákazníkom faktúry
LastSuppliersBills=Posledné %s dodávateľov faktúry
@@ -156,9 +154,9 @@ ConfirmCancelBill=Ste si istí, že chcete zrušiť faktúry <b>%s?</b>
ConfirmCancelBillQuestion=Prečo chcete klasifikovať faktúra "opustený"?
ConfirmClassifyPaidPartially=Ste si istí, že chcete zmeniť fakturačnú <b>%s</b> do stavu platené?
ConfirmClassifyPaidPartiallyQuestion=Táto faktúra nebola zaplatená úplne. Aké sú dôvody pre vás zavrieť túto faktúru?
-ConfirmClassifyPaidPartiallyReasonAvoir=Zvyšok platiť <b>(%s %s)</b> je zľava poskytnutá, pretože platba bola uskutočnená pred horizonte. Aj zjednať DPH s dobropisu.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Zvyšok platiť <b>(%s %s)</b> je zľava poskytnutá, pretože platba bola uskutočnená pred horizonte. Súhlasím stratiť DPH u tejto zľavy.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Zvyšok platiť <b>(%s %s)</b> je zľava poskytnutá, pretože platba bola uskutočnená pred horizonte. Som späť DPH na tejto zľave bez dobropisu.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad zákazník
ConfirmClassifyPaidPartiallyReasonProductReturned=Produkty čiastočne vrátil
ConfirmClassifyPaidPartiallyReasonOther=Suma opustená iného dôvodu
@@ -191,9 +189,9 @@ AlreadyPaid=Už zaplatené
AlreadyPaidBack=Už vráti
AlreadyPaidNoCreditNotesNoDeposits=Už zaplatená (bez dobropisov a vklady)
Abandoned=Opustený
-RemainderToPay=Zvyšok platiť
-RemainderToTake=Zvyšná časť, ktorý sa
-RemainderToPayBack=Zvyšok splatiť
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
Rest=Až do
AmountExpected=Nárokovanej čiastky
ExcessReceived=Nadbytok obdržal
@@ -219,19 +217,18 @@ NoInvoice=No faktúra
ClassifyBill=Klasifikovať faktúru
SupplierBillsToPay=Dodávatelia faktúry platiť
CustomerBillsUnpaid=Nezaplatené faktúry zákazníkmi
-DispenseMontantLettres=Návrhom zákona o mechanicko sú oslobodení od poradia, v listoch
-DispenseMontantLettres=Návrhom zákona o mechanicko sú oslobodení od poradia, v listoch
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=Nevratná
SetConditions=Nastaviť platobné podmienky
SetMode=Nastaviť platobný režim
Billed=Účtované
-RepeatableInvoice=Prednastavená faktúra
-RepeatableInvoices=Preddefinované faktúry
-Repeatable=Vopred definované
-Repeatables=Vopred definované
-ChangeIntoRepeatableInvoice=Prevod do vopred definovanej
-CreateRepeatableInvoice=Vytvorte preddefinovanú faktúru
-CreateFromRepeatableInvoice=Vytvoriť z preddefinovaných faktúre
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
CustomersInvoicesAndInvoiceLines=Zákazníkov faktúry a faktúra je vedenie
CustomersInvoicesAndPayments=Zákazníkov faktúry a platby
ExportDataset_invoice_1=Zákazník faktúry a faktúra je zoznam liniek
diff --git a/htdocs/langs/sk_SK/categories.lang b/htdocs/langs/sk_SK/categories.lang
index 09458668a00d365d65bcdbea33f47788932cda71..36369689d28f35a94a9dbf258c709c4155b2b91c 100644
--- a/htdocs/langs/sk_SK/categories.lang
+++ b/htdocs/langs/sk_SK/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Väzby medzi dodávateľmi a kategórií
CatCusLinks=Väzby medzi zákazníkmi / vyhliadky a kategórií
CatProdLinks=Väzby medzi produktov / služieb a kategórií
CatMemberLinks=Väzby medzi členmi a kategórií
-CatProdLinks=Väzby medzi produktov / služieb a kategórií
-CatCusLinks=Väzby medzi zákazníkmi / vyhliadky a kategórií
-CatSupLinks=Väzby medzi dodávateľmi a kategórií
DeleteFromCat=Odobrať z kategórie
DeletePicture=Picture delete
ConfirmDeletePicture=Confirm picture deletion?
@@ -112,3 +109,4 @@ CategoriesSetup=Categories setup
CategorieRecursiv=Link with parent category automatically
CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category
diff --git a/htdocs/langs/sk_SK/compta.lang b/htdocs/langs/sk_SK/compta.lang
index 358e190443cdfb96d48847309622642d3bc98a7d..a3dd3513e49d0fba6c48edc8a63a1efca9164f69 100644
--- a/htdocs/langs/sk_SK/compta.lang
+++ b/htdocs/langs/sk_SK/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad zákazník účtovný kód pre %s
SuppliersProductsSellSalesTurnover=Celkový obrat z predaja výrobkov dodávateľa.
CheckReceipt=Pozrite sa vklad
CheckReceiptShort=Pozrite sa vklad
+LastCheckReceiptShort=Last %s check receipts
NewCheckReceipt=Nová zľava
NewCheckDeposit=Nová kontrola záloha
NewCheckDepositOn=Vytvorte potvrdenie o vklade na účet: %s
diff --git a/htdocs/langs/sk_SK/contracts.lang b/htdocs/langs/sk_SK/contracts.lang
index e2db98824216742005addec70f8106625554f3d7..d69c3405dd94fb0fdbb342215ca4f1d2867b2a17 100644
--- a/htdocs/langs/sk_SK/contracts.lang
+++ b/htdocs/langs/sk_SK/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Zákazky oblasť
ListOfContracts=Prehľad zmlúv
-LastContracts=Posledné %s upravenej zmluvy
+LastModifiedContracts=Last %s modified contracts
AllContracts=Všetky zmluvy
ContractCard=Zmluva karty
ContractStatus=Stav zmluvy
@@ -27,7 +27,7 @@ MenuRunningServices=Spustené služby
MenuExpiredServices=Prepadnuté služby
MenuClosedServices=Uzavreté služby
NewContract=Nová zmluva
-AddContract=Pridať zákazku
+AddContract=Create contract
SearchAContract=Hľadať zmluvu
DeleteAContract=Odstránenie zmluvu
CloseAContract=Zavrieť zmluvu
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Zoznam bežiacich zmlúv liniek
ListOfRunningServices=Zoznam spustených služieb
NotActivatedServices=Neaktívne služby (u overených zmlúv)
BoardNotActivatedServices=Služby pre aktiváciu u overených zmlúv
-LastContracts=Posledné %s upravenej zmluvy
+LastContracts=Last % contracts
LastActivatedServices=Posledné %s aktiváciu služby
LastModifiedServices=Posledné %s upravené služby
EditServiceLine=Upraviť linka
diff --git a/htdocs/langs/sk_SK/cron.lang b/htdocs/langs/sk_SK/cron.lang
index 70531a3fa7d6f4679bc8637c11a0b6dcee6d0bb4..2697b30432366c35cbfb32202c437ff958774b01 100644
--- a/htdocs/langs/sk_SK/cron.lang
+++ b/htdocs/langs/sk_SK/cron.lang
@@ -1,49 +1,32 @@
# Dolibarr language file - Source file is en_US - cron
-#
# About page
-#
About = O
CronAbout = O Cron
CronAboutPage = Cron o stránke
-
-#
# Right
-#
Permission23101 = Prečítajte si naplánovaná úloha
Permission23102 = Vytvoriť / aktualizovať naplánovanú úlohu
Permission23103 = Odstrániť naplánovaná úloha
Permission23104 = Vykonať naplánované úlohy,
-
-#
# Admin
-#
CronSetup= Naplánované úlohy správy Nastavenie
-# URLToLaunchCronJobs=URL to check and launch cron jobs if required
-# OrToLaunchASpecificJob=Or to check and launch a specific job
+URLToLaunchCronJobs=URL to check and launch cron jobs if required
+OrToLaunchASpecificJob=Or to check and launch a specific job
KeyForCronAccess=Bezpečnostný kľúč pre URL spustiť cron
FileToLaunchCronJobs=Príkazový riadok spustiť cron
CronExplainHowToRunUnix=V oblasti životného prostredia Unix, mali by ste použiť crontab spustiť príkazový riadok zakaždým, minút
CronExplainHowToRunWin=Na Microsoft (tm) Windows environement môžete použiť naplánovaná úloha nástroja spustiť príkazový riadok zakaždým, minút
-
-
-#
# Menu
-#
CronJobs=Naplánované úlohy
-CronListActive= Zoznam aktívnych úloh
-CronListInactive= Zoznam postihnutých miest
-CronListActive= Zoznam aktívnych úloh
-
-
-#
+CronListActive=List of active/scheduled jobs
+CronListInactive=Zoznam postihnutých miest
# Page list
-#
CronDateLastRun=Posledný beh
CronLastOutput=Posledný beh výstup
CronLastResult=Posledný kód výsledku
CronListOfCronJobs=Zoznam naplánovaných úloh
CronCommand=Príkaz
-# CronList=Jobs list
+CronList=Jobs list
CronDelete= Odstrániť cron
CronConfirmDelete= Ste si istí, že chcete zmazať tento cron?
CronExecute=Začatie práce
@@ -70,10 +53,7 @@ CronLabel=Popis
CronNbRun=Nb. začať
CronEach=Každý
JobFinished=Práca zahájená a dokončená
-
-#
#Page card
-#
CronAdd= Pridať pracovných miest
CronHourStart= Začnite hodinu a dátum úlohy
CronEvery= A úloha vykonať každý
@@ -95,20 +75,12 @@ CronObjectHelp=Názov objektu načítať. <BR> Napr načítať metódy objektu v
CronMethodHelp=Objekt spôsob štartu. <BR> Napr načítať metódy objektu výrobku Dolibarr / htdocs / produktu / trieda / product.class.php, hodnota metódy je <i>fecth</i>
CronArgsHelp=Metóda argumenty. <BR> Napr načítať metódy objektu výrobku Dolibarr / htdocs / produktu / trieda / product.class.php, môže byť hodnota paramters byť <i>0, ProductRef</i>
CronCommandHelp=Systém príkazového riadka spustiť.
-
-#
# Info
-#
CronInfoPage=Informácie
-
-
-#
# Common
-#
CronType=Typ úlohy
CronType_method=Volanie metódy triedy Dolibarr
CronType_command=Shell príkaz
CronMenu=Cron
CronCannotLoadClass=Nemožno načítať triedu alebo objekt %s %s
-
UseMenuModuleToolsToAddCronJobs=Choďte do menu "Home - Moduly náradie - Zoznam úloh" vidieť a upravovať naplánované úlohy.
diff --git a/htdocs/langs/sk_SK/donations.lang b/htdocs/langs/sk_SK/donations.lang
index 78454eefb8e61daa3404bd8f6e7d732ab7d8dee7..4c7165f68d3f93de2d7b527b8c6895cb37839909 100644
--- a/htdocs/langs/sk_SK/donations.lang
+++ b/htdocs/langs/sk_SK/donations.lang
@@ -4,7 +4,7 @@ Donations=Dary
DonationRef=Darovanie čj.
Donor=Darca
Donors=Darcovia
-AddDonation=Pridať dar
+AddDonation=Create a donation
NewDonation=Nový darcovstvo
ShowDonation=Zobraziť dar
DonationPromise=Darčekové sľub
@@ -31,3 +31,8 @@ DonationRecipient=Darovanie príjemcu
ThankYou=Ďakujem
IConfirmDonationReception=Príjemca deklarovať príjem, ako dar, tieto sumy
MinimumAmount=Minimum amount is %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/sk_SK/externalsite.lang b/htdocs/langs/sk_SK/externalsite.lang
index 85a7a90b45e7552dfe2c83ffe148104a03d53530..fc5548dc14851751727768cc6aff1cfb62c0f194 100644
--- a/htdocs/langs/sk_SK/externalsite.lang
+++ b/htdocs/langs/sk_SK/externalsite.lang
@@ -2,3 +2,4 @@
ExternalSiteSetup=Nastavenie odkaz na externé webové stránky
ExternalSiteURL=Externé URL stránok
ExternalSiteModuleNotComplete=Modul ExternalSite nebol správne nakonfigurovaný.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/sk_SK/holiday.lang b/htdocs/langs/sk_SK/holiday.lang
index 99ce30644ebd8e15efcea65819a1c5f8274b601f..3b3b9c6a95f5daed1b4d7d68945a9d4d22bfdd88 100644
--- a/htdocs/langs/sk_SK/holiday.lang
+++ b/htdocs/langs/sk_SK/holiday.lang
@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
CantCreateCP=You don't have the right to make leave requests.
InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=Aktualizovať
CantUpdate=You cannot update this leave request.
NoDateDebut=Musíte vybrať počiatočný dátum.
NoDateFin=Musíte vybrať dátum ukončenia.
-ErrorDureeCP=Vaša žiadosť o dovolenku neobsahuje pracovný deň.
-TitleValidCP=Žiadosť odsúhlasí dovolenku
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
ConfirmValidCP=Are you sure you want to approve the leave request?
DateValidCP=Dátum schválenia
TitleToValidCP=Send leave request
ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Žiadosť odmietnuť dovolenku
+TitleRefuseCP=Refuse the leave request
ConfirmRefuseCP=Are you sure you want to refuse the leave request?
NoMotifRefuseCP=Musíte si vybrať dôvod pre odmietnutie žiadosti.
-TitleCancelCP=Zrušiť požiadavku dovolenku
+TitleCancelCP=Cancel the leave request
ConfirmCancelCP=Are you sure you want to cancel the leave request?
DetailRefusCP=Dôvod odmietnutia
DateRefusCP=Dátum odmietnutia
@@ -78,7 +77,7 @@ ActionByCP=Účinkujú
UserUpdateCP=Pre užívateľa
PrevSoldeCP=Predchádzajúci Balance
NewSoldeCP=New Balance
-alreadyCPexist=Žiadosť o dovolenku už bolo vykonané na toto obdobie.
+alreadyCPexist=A leave request has already been done on this period.
UserName=Názov
Employee=Zamestnanec
FirstDayOfHoliday=First day of vacation
@@ -88,25 +87,25 @@ ManualUpdate=Manuálna aktualizácia
HolidaysCancelation=Leave request cancelation
## Configuration du Module ##
-ConfCP=Konfigurácia modulu dovolenku
+ConfCP=Configuration of leave request module
DescOptionCP=Popis možnosti
ValueOptionCP=Hodnota
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
ConfirmConfigCP=Overenie konfigurácie
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
UpdateConfCPOK=Aktualizované úspešne.
ErrorUpdateConfCP=Došlo k chybe pri aktualizácii, skúste to prosím znova.
-AddCPforUsers=Prosím, pridajte rovnováhu prázdnin užívateľom <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">kliknutím tu</a> .
-DelayForSubmitCP=Uzávierka žiadať o dovolenku
-AlertapprobatortorDelayCP=Zabráňte approbator ak sviatok žiadosť nezodpovedá lehotu
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
Module27130Name= Management of leave requests
Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
TitleOptionEventCP=Settings of leave requets for events
ValidEventCP=Potvrdiť
UpdateEventCP=Aktualizácia akcie
diff --git a/htdocs/langs/sk_SK/interventions.lang b/htdocs/langs/sk_SK/interventions.lang
index 8b72c569161ede8bf349d025e35743f314978f60..c118974c8e368ba2582a94166726532be476a376 100644
--- a/htdocs/langs/sk_SK/interventions.lang
+++ b/htdocs/langs/sk_SK/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Intervencie
Interventions=Intervencie
InterventionCard=Intervencie karty
NewIntervention=Nový zásah
-AddIntervention=Pridať zásah
+AddIntervention=Create intervention
ListOfInterventions=Zoznam zásahov
EditIntervention=Upraviť zásah
ActionsOnFicheInter=Akcie zamerané na intervenciu
@@ -30,6 +30,15 @@ StatusInterInvoiced=Účtované
RelatedInterventions=Súvisiace zákroky
ShowIntervention=Zobraziť zásah
SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Zástupca nasledujúce-up zásah
TypeContact_fichinter_internal_INTERVENING=Zásah
diff --git a/htdocs/langs/sk_SK/mails.lang b/htdocs/langs/sk_SK/mails.lang
index 10915612721bae49effd0f7327a2e0f58783ef76..fa0c8ce1506c82ed936801a12d127730b6b662ac 100644
--- a/htdocs/langs/sk_SK/mails.lang
+++ b/htdocs/langs/sk_SK/mails.lang
@@ -115,7 +115,7 @@ SentBy=Odosielateľ:
MailingNeedCommand=Z bezpečnostných dôvodov, odosielanie e-mailom, je lepšie, keď vykonáva z príkazového riadku. Ak máte jeden, požiadajte správcu servera spustiť nasledujúci príkaz pre odoslanie e-mailom všetkým príjemcom:
MailingNeedCommand2=Však môžete zaslať on-line pridaním parametra MAILING_LIMIT_SENDBYWEB s hodnotou max počet e-mailov, ktoré chcete poslať zasadnutí. K tomu, prejdite na doma - Nastavenie - Ostatné.
ConfirmSendingEmailing=Ak nemôžete alebo radšej posielať ich s www prehliadača, prosím, potvrdzujete, že ste istí, že chcete poslať e-mailom teraz z vášho prehliadača?
-LimitSendingEmailing=Poznámka: V riadku odoslanie emailings sú obmedzené na bezpečnosť a časový limit dôvody k <b>%s</b> príjemcu zaslaním relácie.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=Vymazať zoznam
ToClearAllRecipientsClickHere=Kliknite tu pre vymazanie zoznamu príjemcov tohto rozosielanie
ToAddRecipientsChooseHere=Pridajte príjemcu výberom zo zoznamu
@@ -133,6 +133,9 @@ Notifications=Upozornenie
NoNotificationsWillBeSent=Žiadne oznámenia e-mailom sú naplánované pre túto udalosť a spoločnosť
ANotificationsWillBeSent=1 bude zaslaný e-mailom
SomeNotificationsWillBeSent=%s oznámenia bude zaslané e-mailom
-AddNewNotification=Aktivácia novej e-mailovej notifikácie žiadosti
-ListOfActiveNotifications=Vypísať všetky aktívne požiadavky oznámení e-mailov
+AddNewNotification=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
ListOfNotificationsDone=Vypísať všetky e-maily odosielané oznámenia
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang
index 3df1636120486ac67835fee27bd8e3d02f149529..63bdace80bfec582ecd06917518ada7afe15134f 100644
--- a/htdocs/langs/sk_SK/main.lang
+++ b/htdocs/langs/sk_SK/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Nepodarilo sa nájsť užívateľa <b>%s</
ErrorNoVATRateDefinedForSellerCountry=Chyba, žiadne sadzby DPH stanovenej pre krajinu "%s".
ErrorNoSocialContributionForSellerCountry=Chyba, žiadny sociálny príspevok typu definované pre krajinu "%s".
ErrorFailedToSaveFile=Chyba sa nepodarilo uložiť súbor.
-ErrorOnlyPngJpgSupported=Chyba, iba. Png a Jpg image súbor vo formáte sú podporované.
-ErrorImageFormatNotSupported=Vaše PHP nepodporuje funkcie, ktoré chcete previesť obrázky v tomto formáte.
SetDate=Set date
SelectDate=Select a date
SeeAlso=Pozri tiež %s
BackgroundColorByDefault=Predvolené farba pozadia
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
FileWasNotUploaded=Súbor vybraný pre pripojenie, ale ešte nebol nahraný. Kliknite na "Priložiť súbor" za to.
NbOfEntries=Nb záznamov
GoToWikiHelpPage=Prečítajte si nápovedu (vyžadovaný prístup k Internetu)
@@ -266,6 +266,7 @@ Afternoon=Afternoon
Quadri=Quadri
MonthOfDay=Mesiaca odo dňa
HourShort=H
+MinuteShort=mn
Rate=Sadzba
UseLocalTax=Vrátane DPH
Bytes=Bytov
@@ -340,6 +341,7 @@ FullList=Plný zoznam
Statistics=Štatistika
OtherStatistics=Ďalšie štatistiky
Status=Postavenie
+Favorite=Favorite
ShortInfo=Info.
Ref=Ref
RefSupplier=Ref dodávateľ
@@ -365,6 +367,7 @@ ActionsOnCompany=Akcia o tejto tretej osobe
ActionsOnMember=Akcia o tomto členovi
NActions=%s udalosti
NActionsLate=%s neskoro
+RequestAlreadyDone=Request already recorded
Filter=Filter
RemoveFilter=Vyberte filter
ChartGenerated=Graf generovaný
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Extra nastavenia atribútov
URLPhoto=URL of photo/logo
SetLinkToThirdParty=Odkaz na inej tretej osobe
CreateDraft=Vytvorte návrh
+SetToDraft=Back to draft
ClickToEdit=Kliknutím možno upraviť
ObjectDeleted=Objekt %s zmazaný
ByCountry=Podľa krajiny
@@ -678,7 +682,7 @@ ViewPrivateNote=View notes
XMoreLines=%s line(s) hidden
PublicUrl=Public URL
AddBox=Add box
-
+SelectElementAndClickRefresh=Select an element and click Refresh
# Week day
Monday=Pondelok
Tuesday=Utorok
diff --git a/htdocs/langs/sk_SK/margins.lang b/htdocs/langs/sk_SK/margins.lang
index 92bb3272b8213d538ec42904bcb2ad21fb448e06..081f1ba7f8e34eab441d3cc1fd50d96ccddf21a9 100644
--- a/htdocs/langs/sk_SK/margins.lang
+++ b/htdocs/langs/sk_SK/margins.lang
@@ -38,4 +38,7 @@ BuyingCost=Veľkoobchodná cena
UnitCharges=Jednotkové náklady
Charges=Poplatky
AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/sk_SK/orders.lang b/htdocs/langs/sk_SK/orders.lang
index 906a5e2e66291b1cb8239803c5b85995a9a8aab2..5cf1ecc1818dc14184b5430aca3f1bab0632119d 100644
--- a/htdocs/langs/sk_SK/orders.lang
+++ b/htdocs/langs/sk_SK/orders.lang
@@ -53,9 +53,9 @@ ShippingExist=Zásielka existuje
DraftOrWaitingApproved=Návrh alebo schválená ešte objednať
DraftOrWaitingShipped=Návrh alebo overené doposiaľ odoslaný
MenuOrdersToBill=Objednávky dodaný
-MenuOrdersToBill2=Objednávky do účtu
+MenuOrdersToBill2=Billable orders
SearchOrder=Hľadať účelom
-# SearchACustomerOrder=Search a customer order
+SearchACustomerOrder=Search a customer order
ShipProduct=Loď produkt
Discount=Zľava
CreateOrder=Vytvoriť objednávku
@@ -65,7 +65,7 @@ ValidateOrder=Potvrdenie objednávky
UnvalidateOrder=Unvalidate objednávku
DeleteOrder=Zmazať objednávku
CancelOrder=Zrušenie objednávky
-AddOrder=Objednané
+AddOrder=Create order
AddToMyOrders=Pridať do mojich objednávok
AddToOtherOrders=Pridať do iných objednávok
AddToDraftOrders=Pridať k predlohe
@@ -101,7 +101,6 @@ RelatedOrders=Súvisiace objednávky
OnProcessOrders=V procese objednávky
RefOrder=Ref objednávka
RefCustomerOrder=Ref objednávka zákazníka
-CustomerOrder=Zákazníka
RefCustomerOrderShort=Ref zák. objednávka
SendOrderByMail=Objednávku zašlite poštou
ActionsOnOrder=Akcie na objednávku
@@ -132,8 +131,6 @@ Error_COMMANDE_ADDON_NotDefined=Konštantná COMMANDE_ADDON nie je definované
Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Nepodarilo sa načítať súbor modulu "%s"
Error_FailedToLoad_COMMANDE_ADDON_File=Nepodarilo sa načítať súbor modulu "%s"
Error_OrderNotChecked=Žiadne objednávky do faktúry vybranej
-
-
# Sources
OrderSource0=Komerčné návrh
OrderSource1=Internet
@@ -144,7 +141,6 @@ OrderSource5=Obchodné
OrderSource6=Skladujte
QtyOrdered=Množstvo objednať
AddDeliveryCostLine=Pridať prepravné čiaru označujúcu hmotnosť objednávky
-
# Documents models
PDFEinsteinDescription=Kompletné objednávka modelu (logo. ..)
PDFEdisonDescription=Jednoduchý model, aby
@@ -155,14 +151,12 @@ OrderByFax=Fax
OrderByEMail=EMail
OrderByWWW=Online
OrderByPhone=Telefón
-
CreateInvoiceForThisCustomer=Bill objednávky
NoOrdersToInvoice=Žiadne objednávky zúčtovateľné
CloseProcessedOrdersAutomatically=Klasifikovať "spracovanie" všetky vybrané príkazy.
-MenuOrdersToBill2=Objednávky do účtu
OrderCreation=Objednať tvorba
Ordered=Objednal
OrderCreated=Vaše objednávky boli vytvorené
OrderFail=Došlo k chybe pri vytváraní objednávky
CreateOrders=Vytvorenie objednávky
-# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
diff --git a/htdocs/langs/sk_SK/oscommerce.lang b/htdocs/langs/sk_SK/oscommerce.lang
deleted file mode 100644
index 4c5f86689787b51da577b07afe632a26a741f413..0000000000000000000000000000000000000000
--- a/htdocs/langs/sk_SK/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=OS Commerce modul nastavenia
-OSCommerceSetupSaved=OS Commerce nastavenie uloží
-OSCommerceServer=OS Commerce Server host / ip
-OSCommerceDatabaseName=OS Commerce názov databázy
-OSCommercePrefix=OS Commerce tabuľky prefix
-OSCommerceUser=OS Commerce databázy login
diff --git a/htdocs/langs/sk_SK/other.lang b/htdocs/langs/sk_SK/other.lang
index f3774d486a182fb143cac38cba76d5a26ee16966..113f2d7dc2e32a90f43ff356beb0ab88535896d2 100644
--- a/htdocs/langs/sk_SK/other.lang
+++ b/htdocs/langs/sk_SK/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=Bezpečnostný kód
Calendar=Kalendár
-AddTrip=Pridať výlet
Tools=Nástroje
ToolsDesc=Táto oblasť je určená pre skupiny rôznych strojov, ktoré nie sú k dispozícii na iné položky menu. <br><br> Tieto nástroje sa dostanete z menu na boku.
Birthday=Narodeniny
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation
Notify_TASK_CREATE=Task created
Notify_TASK_MODIFY=Task modified
Notify_TASK_DELETE=Task deleted
+SeeModuleSetup=See module setup
NbOfAttachedFiles=Počet pripojených súborov / dokumentov
TotalSizeOfAttachedFiles=Celková veľkosť pripojených súborov / dokumentov
MaxSize=Maximálny rozmer
@@ -80,6 +80,16 @@ ModifiedBy=Zmenil %s
ValidatedBy=Overená %s
CanceledBy=Zrušená %s
ClosedBy=Uzavrel %s
+CreatedById=User id who created
+ModifiedById=User id who made last change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made last change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
FileWasRemoved=Súbor %s bol odstránený
DirWasRemoved=Adresár %s bol odstránený
FeatureNotYetAvailableShort=K dispozícii v budúcej verzii
@@ -193,25 +203,26 @@ ForgetIfNothing=Ak ste o túto zmenu, stačí zabudnúť na tento e-mail. Vaše
##### Calendar common #####
AddCalendarEntry=Pridať záznam do kalendára %s
-NewCompanyToDolibarr=Spoločnosť %s pridané do Dolibarr
-ContractValidatedInDolibarr=Zmluva %s potvrdené v Dolibarr
-ContractCanceledInDolibarr=Zmluva %s zrušených v Dolibarr
-ContractClosedInDolibarr=Zmluva %s uzavretá v Dolibarr
-PropalClosedSignedInDolibarr=Návrh %s podpísaná v Dolibarr
-PropalClosedRefusedInDolibarr=Návrh %s odmietol v Dolibarr
-PropalValidatedInDolibarr=Návrh %s potvrdené v Dolibarr
-InvoiceValidatedInDolibarr=Faktúra %s potvrdené v Dolibarr
-InvoicePaidInDolibarr=Faktúra zmenené %s na platenú v Dolibarr
-InvoiceCanceledInDolibarr=Faktúra %s zrušených v Dolibarr
-PaymentDoneInDolibarr=Platobné %s vykonáva v Dolibarr
-CustomerPaymentDoneInDolibarr=%s o platobnej morálke zákazníkov vykonáva v Dolibarr
-SupplierPaymentDoneInDolibarr=%s Dodávateľ platba vykonaná v Dolibarr
-MemberValidatedInDolibarr=Členské %s potvrdené v Dolibarr
-MemberResiliatedInDolibarr=Členské %s resiliated v Dolibarr
-MemberDeletedInDolibarr=Členské %s odstránený z Dolibarr
-MemberSubscriptionAddedInDolibarr=Zasielanie noviniek pre členské %s pridaný Dolibarr
-ShipmentValidatedInDolibarr=Zásielky %s validované Dolibarr
-ShipmentDeletedInDolibarr=Zásielky %s odstránený z Dolibarr
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
##### Export #####
Export=Export
ExportsArea=Vývoz plocha
diff --git a/htdocs/langs/sk_SK/paybox.lang b/htdocs/langs/sk_SK/paybox.lang
index 55f42d51961fcf552a106456269656374aad10bb..081913f19c8b0075f2ae05c57f55930913b3ca79 100644
--- a/htdocs/langs/sk_SK/paybox.lang
+++ b/htdocs/langs/sk_SK/paybox.lang
@@ -35,3 +35,6 @@ MessageKO=Správa o zrušení strane platobnej návrate
NewPayboxPaymentReceived=Nový Paybox prijatej platby
NewPayboxPaymentFailed=Nový Paybox platba snažil sa ale prepadal
PAYBOX_PAYONLINE_SENDEMAIL=E-mail upozorniť po platbe (úspech alebo zlyhanie)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/sk_SK/resource.lang b/htdocs/langs/sk_SK/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..d64075dfbf595897a63e3eebf19194d8f71030dd
--- /dev/null
+++ b/htdocs/langs/sk_SK/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
diff --git a/htdocs/langs/sk_SK/sendings.lang b/htdocs/langs/sk_SK/sendings.lang
index 843cc586b96e8500224cd8ee726da6ee08603186..453108624228b5a19c848a1c9fc417f937dca461 100644
--- a/htdocs/langs/sk_SK/sendings.lang
+++ b/htdocs/langs/sk_SK/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=Pre túto chvíľu, je vytvorenie novej zásielk
RelatedShippings=Súvisiace shippings
ShipmentLine=Zásielka linka
CarrierList=Zoznam dopravcov
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
# Sending methods
SendingMethodCATCH=Chytiť zákazníka
diff --git a/htdocs/langs/sk_SK/stocks.lang b/htdocs/langs/sk_SK/stocks.lang
index 729d8482509a74951f35578aafc8fd34f2edb3df..29234c34891fcce5e004e4e96bc9039df6814afb 100644
--- a/htdocs/langs/sk_SK/stocks.lang
+++ b/htdocs/langs/sk_SK/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Sklad štítok je nutné
CorrectStock=Správne skladom
ListOfWarehouses=Zoznam skladov
ListOfStockMovements=Zoznam skladových pohybov
-StocksArea=Zásoby oblasť
+StocksArea=Warehouses area
Location=Umiestnenie
LocationSummary=Krátky názov umiestnenia
NumberOfDifferentProducts=Počet rôznych výrobkov
diff --git a/htdocs/langs/sk_SK/users.lang b/htdocs/langs/sk_SK/users.lang
index 1937a91ca35f761ab81847d08c0c1ca07cf03cd0..1d40f6a7f35285a976f02c98d538989a622b33ee 100644
--- a/htdocs/langs/sk_SK/users.lang
+++ b/htdocs/langs/sk_SK/users.lang
@@ -63,7 +63,6 @@ ShowGroup=Zobraziť skupinu
ShowUser=Zobraziť užívateľa
NonAffectedUsers=Non priradené užívatelia
UserModified=Užívateľ bolo úspešne upravené
-GroupModified=Skupina úspešne upravené
PhotoFile=Súbor s fotografiou
UserWithDolibarrAccess=Užívateľ s prístupom Dolibarr
ListOfUsersInGroup=Zoznam užívateľov tejto skupiny
@@ -103,7 +102,7 @@ UserDisabled=Užívateľ %s zakázané
UserEnabled=Užívateľ %s aktivovaná
UserDeleted=Užívateľ %s odstránené
NewGroupCreated=Skupina vytvorila %s
-GroupModified=Skupina úspešne upravené
+GroupModified=Group %s modified
GroupDeleted=Skupina %s odstránené
ConfirmCreateContact=Ste si istí, že chcete vytvoriť účet Dolibarr pre tento kontakt?
ConfirmCreateLogin=Ste si istí, že chcete vytvoriť účet Dolibarr pre tohto člena?
@@ -114,8 +113,10 @@ YourRole=Vaša rola
YourQuotaOfUsersIsReached=Vaša kvóta aktívnych používateľov je dosiahnutý!
NbOfUsers=Nb užívateľov
DontDowngradeSuperAdmin=Iba superadmin môže downgrade superadmin
-HierarchicalResponsible=Hierarchická zodpovednosť
+HierarchicalResponsible=Supervisor
HierarchicView=Hierarchické zobrazenie
UseTypeFieldToChange=Použite typ poľa pre zmenu
OpenIDURL=OpenID URL
LoginUsingOpenID=Použite OpenID pre prihlásenie
+WeeklyHours=Weekly hours
+ColorUser=Color of the user
diff --git a/htdocs/langs/sk_SK/withdrawals.lang b/htdocs/langs/sk_SK/withdrawals.lang
index b9e7a958d46b316e9a39c9fd1a50a4b64a0cdcb8..f7fc78cb9afcf005495b64f77b3ef700b9d355ed 100644
--- a/htdocs/langs/sk_SK/withdrawals.lang
+++ b/htdocs/langs/sk_SK/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=Príjem
LastWithdrawalReceipts=Posledné príjmy %s stiahnutiu
WithdrawedBills=Stiahnuté z faktúry
WithdrawalsLines=Abstinenčné linky
-RequestStandingOrderToTreat=Žiadosť o trvalých príkazov na liečbu
-RequestStandingOrderTreated=Žiadosť o trvalých príkazov liečiť
+RequestStandingOrderToTreat=Request for standing orders to process
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=Objednávky zákazníkov stojaci
CustomerStandingOrder=Zákazník trvalý príkaz
NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
@@ -40,14 +41,13 @@ TransMetod=Transmission method
Send=Odoslať
Lines=Riadky
StandingOrderReject=Issue a rejection
-InvoiceRefused=Faktúra odmietol
WithdrawalRefused=Withdrawal refused
WithdrawalRefusedConfirm=Ste si istí, že chcete zadať stiahnutiu odmietnutie pre spoločnosť
RefusedData=Dátum odmietnutia
RefusedReason=Dôvod odmietnutia
RefusedInvoicing=Fakturácia odmietnutie
NoInvoiceRefused=Nenabíjajte odmietnutie
-InvoiceRefused=Faktúra odmietol
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=Postavenie
StatusUnknown=Neznámy
StatusWaiting=Čakanie
@@ -76,7 +76,7 @@ WithBankUsingRIB=U bankových účtov pomocou RIB
WithBankUsingBANBIC=U bankových účtov pomocou IBAN / BIC / SWIFT
BankToReceiveWithdraw=Bankový účet pre príjem odstúpi
CreditDate=Kredit na
-WithdrawalFileNotCapable=Nemožno vytvárať stiahnutiu príjmu súbor pre vašu krajinu
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
ShowWithdraw=Zobraziť Natiahnite
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
diff --git a/htdocs/langs/sl_SI/accountancy.lang b/htdocs/langs/sl_SI/accountancy.lang
index 8cab9d2b651d75b0721d76fda619e2034e4509b4..2b4fde49279480b610e333a78e5dae525db4941f 100644
--- a/htdocs/langs/sl_SI/accountancy.lang
+++ b/htdocs/langs/sl_SI/accountancy.lang
@@ -1,158 +1,158 @@
# Dolibarr language file - en_US - Accounting Expert
CHARSET=UTF-8
-Accounting=Accounting
-Globalparameters=Global parameters
-Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
-Menuaccount=Accounting accounts
-Menuthirdpartyaccount=Thirdparty accounts
-MenuTools=Tools
-
-ConfigAccountingExpert=Configuration of the module accounting expert
-Journaux=Journals
-JournalFinancial=Financial journals
-Exports=Exports
-Modelcsv=Model of export
-Selectmodelcsv=Select a model of export
-Modelcsv_normal=Classic export
-Modelcsv_CEGID=Export towards CEGID Expert
-BackToChartofaccounts=Return chart of accounts
+Accounting=Računovodstvo
+Globalparameters=Globalni parametri
+Chartofaccounts=Kontni
+Fiscalyear=Fiskalna leta
+Menuaccount=Računovodski izkazi
+Menuthirdpartyaccount=Thirdparty računi
+MenuTools=Orodja
+
+ConfigAccountingExpert=Konfiguracija modula računovodskega strokovnjaka
+Journaux=Revije
+JournalFinancial=Finančne revije
+Exports=Izvoz
+Modelcsv=Model izvoza
+Selectmodelcsv=Izberite model izvoza
+Modelcsv_normal=Classic izvoz
+Modelcsv_CEGID=Izvoz v CEGID Expert
+BackToChartofaccounts=Vrni se kontni
Back=Return
-Definechartofaccounts=Define a chart of accounts
-Selectchartofaccounts=Select a chart of accounts
-Validate=Validate
-Addanaccount=Add an accounting account
-AccountAccounting=Accounting account
-Ventilation=Ventilation
-ToDispatch=To dispatch
-Dispatched=Dispatched
-
-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
-TradeMargin=Trade margin
-Reports=Reports
-ByCustomerInvoice=By invoices customers
-ByMonth=By Month
-NewAccount=New accounting account
+Definechartofaccounts=Določite kontni
+Selectchartofaccounts=Izberite kontni
+Validate=Potrjevanje
+Addanaccount=Dodaj računovodskega račun
+AccountAccounting=Računovodstvo račun
+Ventilation=Breakdown
+ToDispatch=Odpremo
+Dispatched=Odpošlje
+
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+TradeMargin=Trgovska marža
+Reports=Poročila
+ByCustomerInvoice=Z računov strank,
+ByMonth=Po mesecih
+NewAccount=Novi računovodski račun
Update=Update
-List=List
-Create=Create
-UpdateAccount=Modification of an accounting account
-UpdateMvts=Modification of a movement
-WriteBookKeeping=Record accounts in general ledger
-Bookkeeping=General ledger
-AccountBalanceByMonth=Account balance by month
-
-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
+List=Seznam
+Create=Ustvari
+UpdateAccount=Sprememba obračunskega računa
+UpdateMvts=Sprememba pretoka
+WriteBookKeeping=Evidenčnih računov v glavno knjigo
+Bookkeeping=Glavna knjiga
+AccountBalanceByMonth=Stanje na računu po mesecu
+
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
Line=Line
-CAHTF=Total purchase supplier HT
-InvoiceLines=Lines of invoice to be ventilated
-InvoiceLinesDone=Ventilated lines of invoice
-IntoAccount=In the accounting account
+CAHTF=Skupaj nakup dobavitelj HT
+InvoiceLines=Linije računa, ki se prezračuje
+InvoiceLinesDone=Prezračevane linije računa
+IntoAccount=Obračunskega računa
-Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
+Ventilate=Prezračiti
+VentilationAuto=Automatic breakdown
Processing=Processing
-EndProcessing=The end of processing
-AnyLineVentilate=Any lines to ventilate
-SelectedLines=Selected lines
-Lineofinvoice=Line of invoice
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
-
-ACCOUNTING_SEPARATORCSV=Separator CSV
-
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
-
-AccountLength=Length of the accounting accounts shown in Dolibarr
-AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
-
-ACCOUNTING_SELL_JOURNAL=Sell journal
-ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
-ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
-ACCOUNTING_SOCIAL_JOURNAL=Social journal
-
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
-ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait
-
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
-
-Doctype=Type of document
-Docdate=Date
+EndProcessing=Konec obdelave
+AnyLineVentilate=Vrsticami prezračiti
+SelectedLines=Izbrane vrstice
+Lineofinvoice=Line računa
+VentilatedinAccount=Uspešno prezračen v obračunskem računu
+NotVentilatedinAccount=Ni prezračen v obračunskem računu
+
+ACCOUNTING_SEPARATORCSV=Ločilo CSV
+
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+
+AccountLength=Dolžina računovodstva računov prikazan v Dolibarrju
+AccountLengthDesc=Funkcija omogoča, da Predstavljati dolžino obračunskega računa z zamenjavo prostorov z ničelno sliki. Ta funkcija se dotakne le zaslon, ne spreminja računovodskih račune registrirane v Dolibarrju. Za izvoz, to funkcijo je potrebno, da so združljivi z določeno programsko opremo.
+ACCOUNTING_LENGTH_GACCOUNT=Dolžina glavne knjige
+ACCOUNTING_LENGTH_AACCOUNT=Dolžina računih tretjih oseb
+
+ACCOUNTING_SELL_JOURNAL=Prodam revija
+ACCOUNTING_PURCHASE_JOURNAL=Nakup revij
+ACCOUNTING_BANK_JOURNAL=Bank revija
+ACCOUNTING_CASH_JOURNAL=Cash revija
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Razno revija
+ACCOUNTING_SOCIAL_JOURNAL=Socialna revija
+
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Račun za prenos
+ACCOUNTING_ACCOUNT_SUSPENSE=Račun čakanja
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Računovodstvo račun privzeto za kupljene izdelke (če ni opredeljen v listu izdelkov)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Računovodstvo račun privzeto za prodanih proizvodov (če ni opredeljen v listu izdelkov)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Računovodstvo račun privzeto za kupljene storitve (če to ni opredeljeno v storitvenem stanja)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Računovodstvo račun privzeto za prodanih storitev (če ni opredeljen v storitvenem stanja)
+
+Doctype=Vrsta dokumenta
+Docdate=Datum
Docref=Reference
-Numerocompte=Account
+Numerocompte=Račun
Code_tiers=Thirdparty
-Labelcompte=Label account
-Debit=Debit
+Labelcompte=Račun Label
+Debit=Debetne
Credit=Credit
-Amount=Amount
+Amount=Znesek
Sens=Sens
-Codejournal=Journal
+Codejournal=Revija
-DelBookKeeping=Delete the records of the general ledger
+DelBookKeeping=Izbriši zapise v glavno knjigo
-SellsJournal=Sells journal
-PurchasesJournal=Purchases journal
-DescSellsJournal=Sells journal
-DescPurchasesJournal=Purchases journal
-BankJournal=Bank journal
-DescBankJournal=Bank journal including all the types of payments other than cash
-CashJournal=Cash journal
-DescCashJournal=Cash journal including the type of payment cash
+SellsJournal=Sells revija
+PurchasesJournal=Nakupi revija
+DescSellsJournal=Sells revija
+DescPurchasesJournal=Nakupi revija
+BankJournal=Bank revija
+DescBankJournal=Bank revija vključno z vsemi vrstami, razen gotovine plačila
+CashJournal=Cash revija
+DescCashJournal=Cash revija, vključno z načinom plačila gotovine
-CashPayment=Cash Payment
+CashPayment=Gotovina Plačilo
-SupplierInvoicePayment=Payment of invoice supplier
-CustomerInvoicePayment=Payment of invoice customer
+SupplierInvoicePayment=Plačilo dobavitelju računa
+CustomerInvoicePayment=Plačilo računa kupca
-ThirdPartyAccount=Thirdparty account
+ThirdPartyAccount=Thirdparty račun
-NewAccountingMvt=New movement
-NumMvts=Number of movement
-ListeMvts=List of the movement
-ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+NewAccountingMvt=Novo gibanje
+NumMvts=Število gibanja
+ListeMvts=Seznam gibanja
+ErrorDebitCredit=Debetne in Credit ne more imeti vrednosti hkrati
-ReportThirdParty=List thirdparty account
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=Seznam thirdparty račun
+DescThirdPartyReport=Posvetujejo tukaj seznam thirdparty kupcev in dobaviteljev in njihovih računovodskih računov
-ListAccounts=List of the accounting accounts
+ListAccounts=Seznam računovodskih računov
-Pcgversion=Version of the plan
-Pcgtype=Class of account
-Pcgsubtype=Under class of account
-Accountparent=Root of the account
-Active=Statement
+Pcgversion=Različica načrta
+Pcgtype=Razred račun
+Pcgsubtype=Pod razred račun
+Accountparent=Root računa
+Active=Izjava
-NewFiscalYear=New fiscal year
+NewFiscalYear=Novo poslovno leto
-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
-TotalVente=Total turnover HT
-TotalMarge=Total sales margin
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
+TotalVente=Skupni prihodek HT
+TotalMarge=Skupaj prodajna marža
+DescVentilDoneCustomer=Posvetujejo tukaj seznam vrstic računov strank in njihovo računovodsko račun
+DescVentilTodoCustomer=Prezračite svoje linije računa stranke z računovodsko račun
+ChangeAccount=Spremenite računovodsko račun linij, ki jih na račun izbranih:
Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
-DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilTodoSupplier=Prezračite svoje linije dobavitelja na računu z računovodsko račun
+DescVentilDoneSupplier=Posvetujejo tukaj seznam vrstic računov dobaviteljem in njihovo računovodsko račun
-ValidateHistory=Validate Automatically
+ValidateHistory=Potrditi Samodejno
-ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+ErrorAccountancyCodeIsAlreadyUse=Napaka, ne morete izbrisati to računovodsko račun, ker se uporablja
-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index 27fd5033c7c296537cbd0f354a9942a204cc1a69..b72bb07c1015409acf0dfef9b07d17a19211defa 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -437,8 +437,8 @@ Module52Name=Zaloge
Module52Desc=Upravljanje zalog proizvodov
Module53Name=Storitve
Module53Desc=Upravljanje storitev
-Module54Name=Pogodbe
-Module54Desc=Upravljanje pogodb in storitev
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=Črtne kode
Module55Desc=Upravljanje črtnih kod
Module56Name=Telefonija
@@ -475,8 +475,8 @@ Module320Name=Vir RSS
Module320Desc=Dodajanje vira RSS na prikazane Dolibarr strani
Module330Name=Zaznamki
Module330Desc=Upravljanje zaznamkov
-Module400Name=Projekti
-Module400Desc=Upravljanje projektov znotraj drugih modulov
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=Internetni koledar
Module410Desc=Integracija internetnega koledarja
Module500Name=Posebni stroški (davki, socialni prispevki, dividende)
@@ -484,7 +484,7 @@ Module500Desc=Upravljanje posebnih stroškov, kot so davki, socialni prispevki,
Module510Name=Plače
Module510Desc=Upravljanje plač in plačil zaposlenim
Module600Name=Obvestila
-Module600Desc=Pošiljanje obvestil o nekaterih Dolibarr dogodkih po e-mailu kontaktom pri partnerjih
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Donacije
Module700Desc=Upravljanje donacij
Module1200Name=Mantis
@@ -514,16 +514,16 @@ Module5000Name=Skupine podjetij
Module5000Desc=Omogoča upravljaje skupine podjetij
Module6000Name=Potek dela
Module6000Desc=Upravljanje poteka dela
-Module20000Name=Počitnice
-Module20000Desc=Določitev in sledenje dopustov zaposlenih
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
Module39000Name=Product batch
Module39000Desc=Batch number, eat-by and sell-by date management on products
Module50000Name=PayBox
Module50000Desc=Modul za omogočanje strani za spletno plačevanje s kreditno kartico - PayBox
Module50100Name=Prodajalne
Module50100Desc=Modul za prodajalne
-Module50200Name= Paypal
-Module50200Desc= Modul za omogočanje strani za spletno plačevanje s kreditno kartico - Paypal
+Module50200Name=Paypal
+Module50200Desc=Modul za omogočanje strani za spletno plačevanje s kreditno kartico - Paypal
Module50400Name=Računovodstvo (napredno)
Module50400Desc=Upravljanje računovodstva (dvostavno)
Module54000Name=Tiskanje IPP
@@ -606,15 +606,16 @@ Permission151=Branje tekočih naročil
Permission152=Nastavitve tekočih naročil
Permission153=Prenos prejema tekočih naročil
Permission154=Odobritev/zavrnitev prejema tekočih naročil
-Permission161=Branje pogodb
-Permission162=Kreiranje/spreminjanje pogodb
-Permission163=Aktiviranje pogodbene storitve
-Permission164=Onemogočenje pogodbene storitve
-Permission165=Brisanje pogodb
-Permission171=Branje potnih nalogov
-Permission172=Kreiranje/spreminjanje potnih nalogov
-Permission173=Brisanje potnih nalogov
-Permission178=Izvoz potnih nalogov
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Read trips and expenses (own and his subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
Permission180=Branje dobaviteljev
Permission181=Branje naročil pri dobaviteljih
Permission182=Kreiranje/spreminjanje naročil pri dobaviteljih
@@ -671,7 +672,7 @@ Permission300=Branje črtnih kod
Permission301=Kreiranje/spreminjanje črtnih kod
Permission302=Brisanje črtnih kod
Permission311=Branje storitev
-Permission312=Dodelitev storitve pogodbi
+Permission312=Assign service/subscription to contract
Permission331=Branje zaznamkov
Permission332=Kreiranje/spreminjanje zaznamkov
Permission333=Brisanje zaznamkov
@@ -701,8 +702,8 @@ Permission701=Branje donacij
Permission702=Kreiranje/spreminjanje donacij
Permission703=Delete donacij
Permission1001=Branje zalog
-Permission1002=Kreiranje/spreminjanje zalog
-Permission1003=Brisanje
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=Branje gibanja zalog
Permission1005=Kreiranje/spreminjanje gibanja zalog
Permission1101=Branje dobavnic
@@ -1038,7 +1039,6 @@ YesInSummer=Da poleti
OnlyFollowingModulesAreOpenedToExternalUsers=Opomba, samo naslednji moduli so odprti za zunanje uporabnike (odvisno od dovoljenje takih uporabnikov):
SuhosinSessionEncrypt=Shranjevanje seje kriptirano s Suhosin
ConditionIsCurrently=Trenutni pogoj je %s
-TestNotPossibleWithCurrentBrowsers=Avtomatska zaznava ni možna
YouUseBestDriver=Uporabljate gonilnik %s , ki je najboljši trenutno na voljo
YouDoNotUseBestDriver=Uporabljate gonilnik %s, vendar je priporočen gonilnik %s.
NbOfProductIsLowerThanNoPb=V bazi je samo %s proizvodov/storitev. Zato ni potrebna posebna optimizacija.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=Predlaga računovodsko kodo, sestavljeno iz "401" in k
ModuleCompanyCodePanicum=Predlaga prazno računovodsko kodo.
ModuleCompanyCodeDigitaria=Računovodska koda je odvisna od kode partnerja. Koda je sestavljena iz črke "C" prvih 5 znakov kode partnerja.
UseNotifications=Uporaba sporočil
-NotificationsDesc=Funkcija sporočil po E-pošti omogoča tiho pošiljanje avtomatskih e-mailov o nekaterih Dolibarr dogodkih partnerjem (kupcem ali dobavitelljem), ki so tako konfigurirani. Izbira aktivnega obveščanja in ciljnih kontaktov je možna za enega partnerja ob enem času.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
ModelModules=Predloge dokumentov
DocumentModelOdt=Ustvari dokumente iz predlog OpenDocuments (.ODT ali .ODS datoteke v programih OpenOffice, KOffice, TextEdit ,...)
WatermarkOnDraft=Vodni žig na osnutku dokumenta
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=Dodaj možen datum dobave
UseOptionLineIfNoQuantity=Vrstica proizvoda/storitve z vrednostjo 0 se smatra kot opcija
FreeLegalTextOnProposal=Poljubno besedilo na komercialni ponudbi
WatermarkOnDraftProposal=Vodni tisk na osnutkih komercialnih ponudb (brez, če je prazno)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=Nastavitve upravljanja z naročili
OrdersNumberingModules=Moduli za številčenje naročil
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Skrij obravnavana ali preklicana naročila na seznamu
ValidOrderAfterPropalClosed=Za potrditev naročila po zaključku ponudbe, naj ne bo možno preskočiti začasnega naročila
FreeLegalTextOnOrders=Poljubno besedilo na naročilih
WatermarkOnDraftOrders=Vodni tisk na osnutkih naročil (brez, če je prazno)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
##### Clicktodial #####
ClickToDialSetup=Nastavitve modula za klicanje s klikom
ClickToDialUrlDesc=Po kliku na piktogram se izvede klic na Url. Na url lahko uporabite ikono<br><b>__PHONETO__</b> ki predstavlja telefon klicanega<br><b>__PHONEFROM__</b> ki predstavlja telefon klicatelja (vaša številka)<br><b>__LOGIN__</b> ki predstavlja vašo prijavo na klicanje s klikom (določena z vašo uporabniško kodo)<br><b>__PASS__</b> ki predstavlja vaše geslo za klicanje s klikom (določena z vašo uporabniško kodo).
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=Moduli za številčenje intervenc
TemplatePDFInterventions=Modeli obrazcev intervencijskih kartic
WatermarkOnDraftInterventionCards=Vodni tisk na dokumentih intervencijskih kartic (brez, če je prazno)
##### Contracts #####
-ContractsSetup=Nastavitev modula za pogodbe
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=Moduli za številčenje pogodb
TemplatePDFContracts=Modeli obrazcev pogodb
FreeLegalTextOnContracts=Poljubno besedilo na pogodbah
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Datoteke tipa %s niso komprimirane v HTTP strežniku
CacheByServer=Predpomnilnik v strežniku
CacheByClient=Predpomnilnik v brskalniku
CompressionOfResources=Kompresija HTTP odgovorov
-TestNotPossibleWithCurrentBrowsers=Avtomatska zaznava ni možna
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=Nastavitve modula za proizvode
ServiceSetup=Storitve modul nastavitev
@@ -1382,9 +1384,10 @@ MailingSetup=Nastavitev E-mail modula
MailingEMailFrom=Naslov pošiljatelja (Od) za emaile, ki jih pošlje e-mailing modul
MailingEMailError=Naslov za vračilo (Napake-za) emailov z napakami
##### Notification #####
-NotificationSetup=Nastavitev obvestil po elektronski pošti
+NotificationSetup=EMail notification module setup
NotificationEMailFrom=Naslov pošiljatelja (od) za emaile, ki se pošljejo kot obvestila
-ListOfAvailableNotifications=Seznam obvestil, ki so na voljo (ta seznam je odvisen od aktiviranih modulov)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Popravi ciljni email
##### Sendings #####
SendingsSetup=Nastavitev modula za pošiljanje
SendingsReceiptModel=Obrazci odpremnic
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=Povezava s strežnikom '%s' na bazo podatkov '%s' uporabnika '%
OSCommerceTestKo1=Povezava s strežnikom '%s' je bila uspešna, vendar baza podatkov '%s' ni dosegljiva.
OSCommerceTestKo2=Povezava s strežnikom '%s' uporabnika '%s' ni uspela.
##### Stock #####
-StockSetup=Konfiguracija modula zaloge
-UserWarehouse=Uporabi uporabnikove prilagojene zaloge
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=Izbrisan meni
TreeMenu=Drevesni meniji
@@ -1478,11 +1482,14 @@ ClickToDialDesc=Ta modul omogoča dodajanje ikone za telefonsko številko Doliba
##### Point Of Sales (CashDesk) #####
CashDesk=Prodajalna
CashDeskSetup=Nastavitev modula za prodajalno
-CashDeskThirdPartyForSell=Generični partner, ki se uporabi za prodajo
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Račun, ki se uporabi za prejem gotovinskih plačil
CashDeskBankAccountForCheque= Račun, ki se uporabi za prejem plačil s čeki
CashDeskBankAccountForCB= Račun, ki se uporabi za prejem plačil s kreditnimi karticami
-CashDeskIdWareHouse=Skladišče, ki se uporabi za prodajo
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Nastavitev modula za zaznamke
BookmarkDesc=Ta modul omogoča upravljanje z zaznamki. Lahko tudi dodate bližnjice na katerokoli Dolibarr stran ali zunanjo web stran na vašem levem meniju.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Izbriši fiskalno leto
ConfirmDeleteFiscalYear=Ali zares želite izbrisati to fiskalni leto?
Opened=Odprt
Closed=Zaključeno
-
+AlwaysEditable=Lahko je vedno urejeno
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Tip plačila stranke, 1:Tip plačila dobavitelju, 2:Tip plačila stranke in dobavitelju
diff --git a/htdocs/langs/sl_SI/agenda.lang b/htdocs/langs/sl_SI/agenda.lang
index 29e1912e6364fecb03dab0fcd4be06a89f968fe5..81fa94bf320eb9ff562359730b4da3ee44a22d7c 100644
--- a/htdocs/langs/sl_SI/agenda.lang
+++ b/htdocs/langs/sl_SI/agenda.lang
@@ -6,8 +6,8 @@ Agenda=Urnik
Agendas=Urniki
Calendar=Koledar
Calendars=Koledarji
-LocalAgenda=Internal calendar
-ActionsOwnedBy=Event owned by
+LocalAgenda=Notranji koledar
+ActionsOwnedBy=Zasebni dogodek od
AffectedTo=Se nanaša na
DoneBy=Izdelal
Event=Aktivnost
@@ -23,7 +23,7 @@ MenuToDoActions=Vsi nedokončani dogodki
MenuDoneActions=Vsi prekinjeni dogodki
MenuToDoMyActions=Moji nedokončani dogodki
MenuDoneMyActions=Moji prekinjeni dogodki
-ListOfEvents=List of events (internal calendar)
+ListOfEvents=Seznam dogodkov(notranji koledar)
ActionsAskedBy=Dogodek vnesel
ActionsToDoBy=Dogoki, ki se nanašajo na
ActionsDoneBy=Dogodke izvedel
@@ -41,9 +41,10 @@ AutoActions= Avtomatska izpolnitev
AgendaAutoActionDesc= Tukaj definirajte dogodke, za katere želite, da Dolibarr avtomatsko kreira aktivnost v urniku. Če ni označeno ničesar (privzeto), bodo v urnik vključene samo ročno vnesene aktivnosti.
AgendaSetupOtherDesc= Ta stran omogoča izvoz Dolibarr dogodkov v zunanji koledar (thunderbird, google koledar, ...)
AgendaExtSitesDesc=Ta stran omogoča določitev zunanjih virov koledarjev za ogled njihovih dogodkov v Dolibarr urniku
-ActionsEvents= Dogodki, za katere bo Dolibarr avtomatsko kreiral aktivnost v urniku
-PropalValidatedInDolibarr= Potrjena ponudba %s
-InvoiceValidatedInDolibarr= Potrjen račun %s
+ActionsEvents=Dogodki, za katere bo Dolibarr avtomatsko kreiral aktivnost v urniku
+PropalValidatedInDolibarr=Potrjena ponudba %s
+InvoiceValidatedInDolibarr=Potrjen račun %s
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=Račun %s se vrača v status osnutka
InvoiceDeleteDolibarr=Račun %s izbrisan
OrderValidatedInDolibarr= Potrjeno naročilo %s
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Naročilo %s odobreno
OrderRefusedInDolibarr=Naročilo %s zavrnjeno
OrderBackToDraftInDolibarr=Naročilo %s se vrača v status osnutka
OrderCanceledInDolibarr=Naročilo %s odpovedano
-InterventionValidatedInDolibarr=Potrjena intervencija %s
ProposalSentByEMail=Komercialna ponudba %s poslana po elektronski pošti
OrderSentByEMail=Naročilo kupca %s poslano po elektronski pošti
InvoiceSentByEMail=Račun kupcu %s poslan po elektronski pošti
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=Naročilo dobavitelju %s poslano po elektronski pošti
SupplierInvoiceSentByEMail=Račun odbavitelja %s poslan po elektronski pošti
ShippingSentByEMail=Pošiljka %s poslana po EMailu
ShippingValidated= Odprema %s potrjena
-InterventionSentByEMail=Intervencija %s poslana po EMailu
-InterventionClassifiedBilled=Intervencija %s je označena kot "zaračunana"
NewCompanyToDolibarr= Kreiran partner
DateActionPlannedStart= Planiran začetni datum
DateActionPlannedEnd= Planiran končni datum
@@ -70,9 +68,9 @@ DateActionStart= Začetni datum
DateActionEnd= Končni datum
AgendaUrlOptions1=V filtriran izhod lahko dodate tudi naslednje parametre:
AgendaUrlOptions2=<b>login=%s</b> za omejitev izhoda na aktivnosti, ki se nanašajo, ali jih je naredil uporabnik <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> za omejitev izhoda na aktivnosti, ki jih je naredil uporabnik <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
AgendaUrlOptions4=<b>logint=%s</b> za omejitev izhoda na aktivnosti, ki se nanašajo na uporabnika <b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> za omejitev izhoda na aktivnosti uporabnika <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
AgendaShowBirthdayEvents=Prikaži rojstni dan kontakta
AgendaHideBirthdayEvents=Skrij rojstni dan kontakta
Busy=Zaseden
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=URL za dostop do .ical datoteke
ExtSiteNoLabel=Ni opisa
WorkingTimeRange=Delovni čas
WorkingDaysRange=Delovni dnevi
-AddEvent=Add event
-MyAvailability=My availability
+AddEvent=Ustvari dogodek
+MyAvailability=Moja dostopnost
diff --git a/htdocs/langs/sl_SI/bills.lang b/htdocs/langs/sl_SI/bills.lang
index a34dabe20c352c3dc3230c8ba9e49809ab9f3b1c..7a3cd7e1b2564724480199a302be9864788e5bfb 100644
--- a/htdocs/langs/sl_SI/bills.lang
+++ b/htdocs/langs/sl_SI/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Dobropis
InvoiceAvoirAsk=Dobropis za korekcijo računa
InvoiceAvoirDesc=<b>Dobropis</b> je negativni račun, ki se uporabi za rešitev problema, ko je znesek na računu drugačen od dejansko plačanega zneska (ker je kupec pomotoma plačal preveč, ali ne bo plačal v celoti, ker je na primer vrnil nekatere proizvode).
invoiceAvoirWithLines=Ustvari dobropis z vrsticami iz originalnega računa
-invoiceAvoirWithPaymentRestAmount=Ustvari dobropis s presežnimi zneski plačil iz originalnega računa
-invoiceAvoirLineWithPaymentRestAmount=Znesek dobropisa s presežnimi plačili
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
ReplaceInvoice=Zamenjava računa %s
ReplacementInvoice=Nadomestni račun
ReplacedByInvoice=Zamenjan z računom %s
@@ -87,7 +87,7 @@ ClassifyCanceled=Označeno kot 'Opuščeno'
ClassifyClosed=Označeno kot 'Zaključeno'
ClassifyUnBilled=Označi kot "Nezaračunano"
CreateBill=Kreiraj račun
-AddBill=Dodaj račun ali dobropis
+AddBill=Ustvariti računa ali dobropis
AddToDraftInvoices=Dodaj osnutku računa
DeleteBill=Izbriši račun
SearchACustomerInvoice=Iskanje računa za kupca
@@ -99,7 +99,7 @@ DoPaymentBack=Izvrši vračilo
ConvertToReduc=Pretvori v bodoči popust
EnterPaymentReceivedFromCustomer=Vnesi prejeto plačilo od kupca
EnterPaymentDueToCustomer=Vnesi rok plačila za kupca
-DisabledBecauseRemainderToPayIsZero=Onemogočeno, ker je vrednost za opomin enaka nič
+DisabledBecauseRemainderToPayIsZero=Onemogočeno, ker je neplačan opomin enako nič
Amount=Znesek
PriceBase=Osnova cene
BillStatus=Status računa
@@ -137,8 +137,6 @@ BillFrom=Od
BillTo=Račun za
ActionsOnBill=Aktivnosti na računu
NewBill=Nov račun
-Prélèvements=Trajniki
-Prélèvements=Trajniki
LastBills=Zadnjih %s računov
LastCustomersBills=Zadnjih %s računov za kupce
LastSuppliersBills=Zadnjih %s računov dobaviteljev
@@ -156,9 +154,9 @@ ConfirmCancelBill=Ali zares želite preklicati račun <b>%s</b> ?
ConfirmCancelBillQuestion=Zakaj želite označiti ta račun kot 'opuščen' ?
ConfirmClassifyPaidPartially=Ali zares želite spremeniti račun <b>%s</b> v status 'plačano' ?
ConfirmClassifyPaidPartiallyQuestion=Ta račun ni bil plačan v celoti. Zakaj želite kljub temu zaključiti ta račun ?
-ConfirmClassifyPaidPartiallyReasonAvoir=Na opominu za plačilo <b>(%s %s)</b> je odobren popust, ker je bilo plačilo izvršeno predčasno. DDV je reguliran z dobropisom.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Na opominu za plačilo <b>(%s %s)</b> je odobren popust, ker je bilo plačilo izvršeno predčasno. Strinjam se z izgubo DDV zaradi tega popusta.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Na opominu za plačilo <b>(%s %s)</b> je odobren popust, ker je bilo plačilo izvršeno predčasno. DDV na ta popust bo vrnjen brez dobropisa.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
ConfirmClassifyPaidPartiallyReasonBadCustomer=Slab kupec
ConfirmClassifyPaidPartiallyReasonProductReturned=Delno vračilo proizvodov
ConfirmClassifyPaidPartiallyReasonOther=Znesek opuščen zaradi drugih razlogov
@@ -191,9 +189,9 @@ AlreadyPaid=Že plačano
AlreadyPaidBack=Že vrnjeno plačilo
AlreadyPaidNoCreditNotesNoDeposits=Že plačano (brez dobropisa in avansa)
Abandoned=Opuščeno
-RemainderToPay=Opomin za plačilo
-RemainderToTake=Pripravljeni opomini
-RemainderToPayBack=Opomin za vrnitev plačila
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
Rest=Na čakanju
AmountExpected=Reklamiran znesek
ExcessReceived=Prejet presežek
@@ -219,19 +217,18 @@ NoInvoice=Ni računa
ClassifyBill=Klacificiraj račun
SupplierBillsToPay=Računi dobaviteljev za plačilo
CustomerBillsUnpaid=Neplačani računi kupcev
-DispenseMontantLettres=Računi izpisani na mehanografski način se pošiljajo po vrstnem redu s pismi
-DispenseMontantLettres=Računi izpisani na mehanografski način se pošiljajo po vrstnem redu s pismi
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=Nepovratno
SetConditions=Nastavitev plačilnih pogojev
SetMode=Nastavitev načina plačila
Billed=Zaračunano
-RepeatableInvoice=Vzorec računa
-RepeatableInvoices=Vzorci računov
-Repeatable=Vzorec
-Repeatables=Vzorci
-ChangeIntoRepeatableInvoice=Spremeni v vzorec
-CreateRepeatableInvoice=Kreiraj vzorec računa
-CreateFromRepeatableInvoice=Kreiraj iz vzorca računa
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
CustomersInvoicesAndInvoiceLines=Računi za kupce in vrstice v računih
CustomersInvoicesAndPayments=Računi za kupce in plačila
ExportDataset_invoice_1=Seznam računov za kupce in vrstic v računih
diff --git a/htdocs/langs/sl_SI/categories.lang b/htdocs/langs/sl_SI/categories.lang
index 6397a1a690576885f229027723ac0e2acc11211f..31a939fea21e5e110a1136fc86977bfc02b82b02 100644
--- a/htdocs/langs/sl_SI/categories.lang
+++ b/htdocs/langs/sl_SI/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Povezave med dobavitelji in kategorijami
CatCusLinks=Povezave med kupci/možnimi strankami in kategorijami
CatProdLinks=Povezave med proizvodi/storitvami in kategorijami
CatMemberLinks=Povezave med člani in kategorijami
-CatProdLinks=Povezave med proizvodi/storitvami in kategorijami
-CatCusLinks=Povezave med kupci/možnimi strankami in kategorijami
-CatSupLinks=Povezave med dobavitelji in kategorijami
DeleteFromCat=Odstrani iz kategorije
DeletePicture=Izbriši sliko
ConfirmDeletePicture=Potrdi izbris slike?
@@ -111,4 +108,5 @@ ExtraFieldsCategories=Koplementarni atributi
CategoriesSetup=Nastavitve kategorij
CategorieRecursiv=Avtomatsko poveži z nadrejeno kategorijo
CategorieRecursivHelp=Če je aktivirano, bo proizvod po dodajanju v podkategorijo povezan tudi z nadrejeno kategorijo
-AddProductServiceIntoCategory=Add the following product/service
+AddProductServiceIntoCategory=Dodaj sledeči produkt/storitev
+ShowCategory=Show category
diff --git a/htdocs/langs/sl_SI/compta.lang b/htdocs/langs/sl_SI/compta.lang
index d6b000bbeb925b0294ca3952d5315811e38e9764..b0cc63b9a962266b5e96655ad6ef3640563563d5 100644
--- a/htdocs/langs/sl_SI/compta.lang
+++ b/htdocs/langs/sl_SI/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Napačna računovodska koda kupca za %s
SuppliersProductsSellSalesTurnover=Generiran promet po prodaji dobavljenih proizvodov.
CheckReceipt=Kontrola priliva
CheckReceiptShort=Kontrola prilivov
+LastCheckReceiptShort=Last %s check receipts
NewCheckReceipt=Nov popust
NewCheckDeposit=Nova kontrola depozita
NewCheckDepositOn=Nova kontrola depozita na račun: %s
diff --git a/htdocs/langs/sl_SI/contracts.lang b/htdocs/langs/sl_SI/contracts.lang
index 8b0f31b8996c9068aa0b25cc92db791a7fbd5e31..102524da201ae87eeb9029255f43c12d4434b435 100644
--- a/htdocs/langs/sl_SI/contracts.lang
+++ b/htdocs/langs/sl_SI/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Področje pogodb
ListOfContracts=Seznam pogodb
-LastContracts=Zadnjih % pogodb
+LastModifiedContracts=Last %s modified contracts
AllContracts=Vse pogodbe
ContractCard=Kartica pogodbe
ContractStatus=Status pogodbe
@@ -27,7 +27,7 @@ MenuRunningServices=Aktivne storitve
MenuExpiredServices=Pretečene storitve
MenuClosedServices=Zaključene storitve
NewContract=Nova pogodba
-AddContract=Dodaj pogodbo
+AddContract=Ustvari pogodbo
SearchAContract=Išči pogodbo
DeleteAContract=Izbriši pogodbo
CloseAContract=Zaključi pogodbo
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Seznam aktivnih vrstic pogodbe
ListOfRunningServices=Seznam aktivnih storitev
NotActivatedServices=Neaktivne storitve (med potrjenimi pogodbami)
BoardNotActivatedServices=Storitve, ki jih je potrebno aktivirati (med potrjenimi pogodbami)
-LastContracts=Zadnjih % pogodb
+LastContracts=Last % contracts
LastActivatedServices=Zadnjih %s aktiviranih storitev
LastModifiedServices=Zadnjih %s spremenjenih storitev
EditServiceLine=Ureditev storitvene vrstice
diff --git a/htdocs/langs/sl_SI/cron.lang b/htdocs/langs/sl_SI/cron.lang
index 7272c4a935efcd625eee939220d6616b8168aef4..b307aa07f5e26c8a696dd315928297f7674f59f4 100644
--- a/htdocs/langs/sl_SI/cron.lang
+++ b/htdocs/langs/sl_SI/cron.lang
@@ -1,114 +1,86 @@
# Dolibarr language file - Source file is en_US - cron
-#
# About page
-#
About = O programu
-# CronAbout = About Cron
-# CronAboutPage = Cron about page
-
-#
+CronAbout = About Cron
+CronAboutPage = Cron about page
# Right
-#
-# Permission23101 = Read Scheduled task
-# Permission23102 = Create/update Scheduled task
-# Permission23103 = Delete Scheduled task
-# Permission23104 = Execute Scheduled task
-
-#
+Permission23101 = Read Scheduled task
+Permission23102 = Create/update Scheduled task
+Permission23103 = Delete Scheduled task
+Permission23104 = Execute Scheduled task
# Admin
-#
-# CronSetup= Scheduled job management setup
-# URLToLaunchCronJobs=URL to check and launch cron jobs if required
-# OrToLaunchASpecificJob=Or to check and launch a specific job
-# KeyForCronAccess=Security key for URL to launch cron jobs
-# FileToLaunchCronJobs=Command line to launch cron jobs
-# CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes
-# CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
-
-
-#
+CronSetup= Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch cron jobs if required
+OrToLaunchASpecificJob=Or to check and launch a specific job
+KeyForCronAccess=Security key for URL to launch cron jobs
+FileToLaunchCronJobs=Command line to launch cron jobs
+CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
# Menu
-#
-# CronJobs=Scheduled jobs
-# CronListActive= List of active jobs
-# CronListInactive= List of disabled jobs
-# CronListActive= List of active jobs
-
-
-#
+CronJobs=Scheduled jobs
+CronListActive=List of active/scheduled jobs
+CronListInactive=Seznam onemogočenih nalog
# Page list
-#
-# CronDateLastRun=Last run
-# CronLastOutput=Last run output
-# CronLastResult=Last result code
-# CronListOfCronJobs=List of scheduled jobs
-# CronCommand=Command
-# CronList=Jobs list
-# CronDelete= Delete cron jobs
-# CronConfirmDelete= Are you sure you want to delete this cron job ?
-# CronExecute=Launch job
-# CronConfirmExecute= Are you sure to execute this job now
-# CronInfo= Jobs allow to execute task that have been planned
-# CronWaitingJobs=Wainting jobs
-# CronTask=Job
+CronDateLastRun=Last run
+CronLastOutput=Last run output
+CronLastResult=Last result code
+CronListOfCronJobs=List of scheduled jobs
+CronCommand=Ukaz
+CronList=Seznam nalog
+CronDelete= Delete cron jobs
+CronConfirmDelete= Are you sure you want to delete this cron job ?
+CronExecute=Zaženi nalogo
+CronConfirmExecute= Si prepričan prekiniti to nalogo sedaj
+CronInfo= Jobs allow to execute task that have been planned
+CronWaitingJobs=Dela na čakanju
+CronTask=Naloga
CronNone= Nič
CronDtStart=Začetni datum
CronDtEnd=Končni datum
-# CronDtNextLaunch=Next execution
-# CronDtLastLaunch=Last execution
-# CronFrequency=Frequancy
-# CronClass=Classe
+CronDtNextLaunch=Next execution
+CronDtLastLaunch=Last execution
+CronFrequency=Frequancy
+CronClass=Classe
CronMethod=Metoda
CronModule=Modul
-# CronAction=Action
+CronAction=Akcija
CronStatus=Status
CronStatusActive=Omogočen
CronStatusInactive=Onemogočen
-# CronNoJobs=No jobs registered
+CronNoJobs=Nobene naloge niso registrirane
CronPriority=Prioriteta
CronLabel=Opis
-# CronNbRun=Nb. launch
-# CronEach=Every
-# JobFinished=Job launched and finished
-
-#
+CronNbRun=Nb. launch
+CronEach=Every
+JobFinished=Job launched and finished
#Page card
-#
-# CronAdd= Add jobs
-# CronHourStart= Start Hour and date of task
-# CronEvery= And execute task each
-# CronObject= Instance/Object to create
+CronAdd= Dodaj naloge
+CronHourStart= Start Hour and date of task
+CronEvery= And execute task each
+CronObject= Instance/Object to create
CronArgs=Parametri
-# CronSaveSucess=Save succesfully
+CronSaveSucess=Uspešno shranjeno
CronNote=Komentar
-# CronFieldMandatory=Fields %s is mandatory
-# CronErrEndDateStartDt=End date cannot be before start date
-# CronStatusActiveBtn=Enable
+CronFieldMandatory=Fields %s is mandatory
+CronErrEndDateStartDt=End date cannot be before start date
+CronStatusActiveBtn=Omogočeno
CronStatusInactiveBtn=Onemogoči
-# CronTaskInactive=This job is disabled
-# CronDtLastResult=Last result date
-# CronId=Id
-# CronClassFile=Classes (filename.class.php)
-# CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-# CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-# CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-# CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is <i>fecth</i>
-# CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-# CronCommandHelp=The system command line to execute.
-
-#
+CronTaskInactive=This job is disabled
+CronDtLastResult=Last result date
+CronId=Id
+CronClassFile=Classes (filename.class.php)
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
+CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronCommandHelp=The system command line to execute.
# Info
-#
-# CronInfoPage=Information
-
-
-#
+CronInfoPage=Informacija
# Common
-#
-# CronType=Task type
-# CronType_method=Call method of a Dolibarr Class
-# CronType_command=Shell command
-# CronMenu=Cron
-# CronCannotLoadClass=Cannot load class %s or object %s
-
-# UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+CronType=Tip naloge
+CronType_method=Call method of a Dolibarr Class
+CronType_command=Shell command
+CronMenu=Cron
+CronCannotLoadClass=Cannot load class %s or object %s
+UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
diff --git a/htdocs/langs/sl_SI/donations.lang b/htdocs/langs/sl_SI/donations.lang
index dc9f7f2ca266b7501892cdb8feb907c8f532bead..0af6246a82420394a574f604f30831810dde7ac4 100644
--- a/htdocs/langs/sl_SI/donations.lang
+++ b/htdocs/langs/sl_SI/donations.lang
@@ -4,7 +4,7 @@ Donations=Donacije
DonationRef=Referenca donacije
Donor=Donator
Donors=Donatorji
-AddDonation=Dodaj donacijo
+AddDonation=Ustvari donacijo
NewDonation=Nova donacija
ShowDonation=Prikaži donacijo
DonationPromise=Obljuba darila
@@ -30,4 +30,9 @@ SearchADonation=Iskanje donacij
DonationRecipient=Prejemnik donacije
ThankYou=Hvala
IConfirmDonationReception=Prejemnik potrjuje prejem donacije v naslednjem znesku
-MinimumAmount=Minimum amount is %s
+MinimumAmount=Najmanjši znesek je %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/sl_SI/externalsite.lang b/htdocs/langs/sl_SI/externalsite.lang
index f5ec7304a64f74e7f8da7b54de95ae354198515c..f949bf725939c221beee6d9a4d8bd2f267b78073 100644
--- a/htdocs/langs/sl_SI/externalsite.lang
+++ b/htdocs/langs/sl_SI/externalsite.lang
@@ -1,4 +1,5 @@
# Dolibarr language file - Source file is en_US - externalsite
ExternalSiteSetup=Setup se povezujejo na zunanji strani
ExternalSiteURL=Zunanja stran URL
-# ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExternalSiteModuleNotComplete=Modul za zunanjo stran ni bil konfiguriran pravilno
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/sl_SI/holiday.lang b/htdocs/langs/sl_SI/holiday.lang
index 9d422c390c5591ca9edac0f977e1f58ac38a084e..dc8de0063da45bdf56c7af2baf6cd9665ecf9665 100644
--- a/htdocs/langs/sl_SI/holiday.lang
+++ b/htdocs/langs/sl_SI/holiday.lang
@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
CantCreateCP=You don't have the right to make leave requests.
InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=Posodobi
CantUpdate=You cannot update this leave request.
NoDateDebut=Izbrati morate začetni datum.
NoDateFin=Izbrati morate končni datum.
-ErrorDureeCP=Vaš zahtevek za dopust ne vsebuje delovnih dni.
-TitleValidCP=Odobri zahtevan dopust
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
ConfirmValidCP=Are you sure you want to approve the leave request?
DateValidCP=Datum odobritve
TitleToValidCP=Send leave request
ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Zavrni zahtevek za dopust
+TitleRefuseCP=Refuse the leave request
ConfirmRefuseCP=Are you sure you want to refuse the leave request?
NoMotifRefuseCP=Izbrati morate razlog za zavrnitev zahtevka.
-TitleCancelCP=Preklic zahtevka za dopust
+TitleCancelCP=Cancel the leave request
ConfirmCancelCP=Are you sure you want to cancel the leave request?
DetailRefusCP=Razlog za zavrnitev
DateRefusCP=Datum zavrnitve
@@ -78,7 +77,7 @@ ActionByCP=Izvajalec
UserUpdateCP=Za uporabnika
PrevSoldeCP=Prejšnje stanje
NewSoldeCP=Novo stanje
-alreadyCPexist=Zahtevek za dopust za to obdobje je bil že vložen.
+alreadyCPexist=A leave request has already been done on this period.
UserName=Priimek
Employee=Zaposleni
FirstDayOfHoliday=First day of vacation
@@ -88,25 +87,25 @@ ManualUpdate=Ročna posodobitev
HolidaysCancelation=Leave request cancelation
## Configuration du Module ##
-ConfCP=Konfiguracija modula dopustov
+ConfCP=Configuration of leave request module
DescOptionCP=Opis opcij
ValueOptionCP=Vrednost
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
ConfirmConfigCP=Potrditev konfiguracije
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
UpdateConfCPOK=Uspešno posodobljeno.
ErrorUpdateConfCP=Pri posodabljanju je prišlo do napake, prosimo poskusite ponovno.
-AddCPforUsers=Prosimo dodajte stanje dopustov uporabnikov s <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">klikom tukaj</a>.
-DelayForSubmitCP=Zadnji rok za vložitev zahteve za dopust
-AlertapprobatortorDelayCP=Opozori, če zahtevek za dopust ni bil vložen pravočasno
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
Module27130Name= Management of leave requests
Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
TitleOptionEventCP=Settings of leave requets for events
ValidEventCP=Potrdi
UpdateEventCP=Posodobitev aktivnosti
diff --git a/htdocs/langs/sl_SI/interventions.lang b/htdocs/langs/sl_SI/interventions.lang
index 576fbbc791af53d8f82c4d7e99aee37fd2cc4025..59e000011236743ad0673607de73d14038ce2f29 100644
--- a/htdocs/langs/sl_SI/interventions.lang
+++ b/htdocs/langs/sl_SI/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Intervencija
Interventions=Intervencije
InterventionCard=Kartica intervencije
NewIntervention=Nova intervencija
-AddIntervention=Dodaj intervencijo
+AddIntervention=Create intervention
ListOfInterventions=Seznam intervencij
EditIntervention=Urejanje intervencije
ActionsOnFicheInter=Aktivnost na intervenciji
@@ -30,6 +30,15 @@ StatusInterInvoiced=Zaračunano
RelatedInterventions=Odvisne intervencije
ShowIntervention=Prikaži intervencijo
SendInterventionRef=Oddana intervencija %s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Referent za nadaljnjo obravnavo intervencije
TypeContact_fichinter_internal_INTERVENING=Serviser
diff --git a/htdocs/langs/sl_SI/mails.lang b/htdocs/langs/sl_SI/mails.lang
index 494e459df641555422ef6773189367e19aa0cdf0..fe6b027fac13cdad48d82fc68906a69d059b5754 100644
--- a/htdocs/langs/sl_SI/mails.lang
+++ b/htdocs/langs/sl_SI/mails.lang
@@ -43,10 +43,10 @@ MailingStatusSentCompletely=Poslano v celoti
MailingStatusError=Napaka
MailingStatusNotSent=Ni poslano
MailSuccessfulySent=E-pošta uspešno poslana (od %s za %s)
-MailingSuccessfullyValidated=EMailing successfully validated
-MailUnsubcribe=Unsubscribe
-Unsuscribe=Unsubscribe
-MailingStatusNotContact=Don't contact anymore
+MailingSuccessfullyValidated=E-pošiljanje uspešno potrjeno
+MailUnsubcribe=Odjava
+Unsuscribe=Odjava
+MailingStatusNotContact=Ne kontaktiraj več
ErrorMailRecipientIsEmpty=Prejemnik ni določen
WarningNoEMailsAdded=Nobenega novega e-sporočila ni za dodajanje na prejemnikov seznam.
ConfirmValidMailing=Ali zares želite potrditi to e-sporočilo ?
@@ -73,31 +73,31 @@ DateLastSend=Datum zadnjega pošiljanja
DateSending=Datum pošiljanja
SentTo=Poslano na <b>%s</b>
MailingStatusRead=Preberite
-CheckRead=Read Receipt
-YourMailUnsubcribeOK=The email <b>%s</b> is correctly unsubcribe from mailing list
-MailtoEMail=Hyper link to email
-ActivateCheckRead=Allow to use the "Unsubcribe" link
-ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature
-EMailSentToNRecipients=EMail sent to %s recipients.
-XTargetsAdded=<b>%s</b> recipients added into target list
-EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
-MailTopicSendRemindUnpaidInvoices=Reminder of invoice %s (%s)
-SendRemind=Send reminder by EMails
-RemindSent=%s reminder(s) sent
-AllRecipientSelectedForRemind=All thirdparties selected and if an email is set (note that one mail per invoice will be sent)
-NoRemindSent=No EMail reminder sent
-ResultOfMassSending=Result of mass EMail reminders sending
+CheckRead=Potrditev branja
+YourMailUnsubcribeOK=E-pošni naslov <b>%s</b> je uspešno odjavljen s seznama za pošiljanje
+MailtoEMail=Hiperovezava na email
+ActivateCheckRead=Dovoljena uporaba povezave za "Odjavo"
+ActivateCheckReadKey=Podatki za kriptiran URL za funkciji "Potrditev branja" in "Odjava"
+EMailSentToNRecipients=E-pošta poslana %s prejemnikom.
+XTargetsAdded=<b>%s</b> prejemnikov dodanih na ciljni seznam
+EachInvoiceWillBeAttachedToEmail=Ustvarjen bo dokument na osnovi privzete predloge in pripet k vsakemu elektronskemu sporočilu
+MailTopicSendRemindUnpaidInvoices=Opomin k računu %s (%s)
+SendRemind=Pošlji opomin po E-pošti
+RemindSent=%s poslanih opomin(ov)
+AllRecipientSelectedForRemind=Izbrani so vsi partnerji in če je nastavljen en e-naslov (opomba: poslano bo eno sporočilo za vsak račun)
+NoRemindSent=Noben opomin ni bil poslan po e-pošti
+ResultOfMassSending=Rezultat masovnega pošiljanja opominov po e-pošti
# Libelle des modules de liste de destinataires mailing
MailingModuleDescContactCompanies=Kontakti vseh partnerjev (kupci, možne stranke, dobavitelji, ...)
MailingModuleDescDolibarrUsers=Vsi uporabniki Dolibarr z e-naslovom
MailingModuleDescFundationMembers=Vsi člani ustanove z e-naslovom
MailingModuleDescEmailsFromFile=E-pošta iz tekstovne datoteke (e-naslov;ime;priimek;komentarji)
-MailingModuleDescEmailsFromUser=EMails from user input (email;lastname;firstname;other)
+MailingModuleDescEmailsFromUser=E-pošta iz uporabnikovega vnosa (e-naslov;priimek;ime;ostalo)
MailingModuleDescContactsCategories=Partnerji z e-naslovi (po kategorijah)
MailingModuleDescDolibarrContractsLinesExpired=Partnerji s pretečenimi pogodbami
MailingModuleDescContactsByCompanyCategory=Kontakt partnerja (po kategorijah partnerjev)
-MailingModuleDescContactsByCategory=Contacts/addresses of third parties by category
+MailingModuleDescContactsByCategory=Kontakti/naslovi partnerjev po kategorijah
MailingModuleDescMembersCategories=Člani fundacij (po kategorijah)
MailingModuleDescContactsByFunction=Kontakti partnerjev (po delovnem mestu/funkciji)
LineInFile=%s vrstica v datoteki
@@ -112,27 +112,30 @@ SearchAMailing=Iskanje e-pošte
SendMailing=Pošiljanje e-pošte
SendMail=Pošlji e-pošto
SentBy=Poslal
-MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
+MailingNeedCommand=Zaradi varnostnih razlogov je pošiljanje e-pošte boljše, če se izvrši iz ukazne vrstice. Če imate to potrebo, prosite vašega administratorja za zagon naslednjega ukaza za pošiljanje e-pošte vsem prejemnikom:
MailingNeedCommand2=Lahko jih seveda pošljete tudi »online«, če dodate parameter MAILING_LIMIT_SENDBYWEB z največjim številom e-sporočil, ki jih želite poslati v eni seji.
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to <b>%s</b> recipients by sending session.
+ConfirmSendingEmailing=Če ne morete, ali jo raje pošiljate preko www brskalnika, prosimo potrdite, da zares želite zdaj poslati pošto iz vašega brskalnika ?
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=Prekliči seznam
ToClearAllRecipientsClickHere=Kliknite tukaj za preklic seznama prejemnikov te e-pošte
ToAddRecipientsChooseHere=Dodajanje prejemnikov z izbiro s seznamov
NbOfEMailingsReceived=Število prejetih masovnih e-sporočil
-NbOfEMailingsSend=Mass emailings sent
+NbOfEMailingsSend=Masovno pošiljanje je izvršeno
IdRecord=ID zapis
DeliveryReceipt=Potrditev prejema
YouCanUseCommaSeparatorForSeveralRecipients=Lahko uporabite <b>vejico</b> kot ločilo pri naštevanju več prejemnikov.
-TagCheckMail=Track mail opening
-TagUnsubscribe=Unsubscribe link
-TagSignature=Signature sending user
-TagMailtoEmail=Recipient EMail
+TagCheckMail=Odpiranje sledenja pošte
+TagUnsubscribe=Povezava za odjavo
+TagSignature=Podpis pošiljatelja
+TagMailtoEmail=Prejemnik E-pošte
# Module Notifications
Notifications=Obvestila
NoNotificationsWillBeSent=Za ta dogodek in podjetje niso predvidena obvestila po e-pošti
ANotificationsWillBeSent=1 obvestilo bo poslano z e-pošto
SomeNotificationsWillBeSent=%s obvestil bo poslanih z e-pošto
-AddNewNotification=Aktiviraj nov zahtevek za e-poštno obvestilo
-ListOfActiveNotifications=Seznam vseh aktivnih zahtev za e-poštna obvestila
+AddNewNotification=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
ListOfNotificationsDone=Seznam vseh poslanih e-poštnih obvestil
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang
index 305881c37fa71e1e65c11425362a35c236699a7d..c2cdfde4b96b6f4cbc90406853de5493c6087684 100644
--- a/htdocs/langs/sl_SI/main.lang
+++ b/htdocs/langs/sl_SI/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Napaka pri iskanju uporabnika <b>%s</b> v
ErrorNoVATRateDefinedForSellerCountry=Napaka, za državo '%s' niso definirane davčna stopnje.
ErrorNoSocialContributionForSellerCountry=Napaka, za državo '%s' niso definirani socialni prispevki.
ErrorFailedToSaveFile=Napaka, datoteka ni bila shranjena.
-ErrorOnlyPngJpgSupported=Napaka, podprta sta samo slikovna formata .png in .jpg.
-ErrorImageFormatNotSupported=Vaš PHP ne podpira funkcije pretvarjanja slik tega formata.
SetDate=Nastavi datum
SelectDate=Izberi datum
SeeAlso=Glejte tudi %s
BackgroundColorByDefault=Privzeta barva ozadja
+FileNotUploaded=Datoteka ni bila naložena
+FileUploaded=Datoteka je bila uspešno naložena
FileWasNotUploaded=Izbrana je bila datoteka za prilogo, vendar še ni dodana. Kliknite na "Pripni datoteko".
NbOfEntries=Število vpisov
GoToWikiHelpPage=Preberite online pomoč (potreben je internetni dostop)
@@ -266,6 +266,7 @@ Afternoon=Popoldan
Quadri=Četrtletje
MonthOfDay=Dan v mesecu
HourShort=H
+MinuteShort=Mn
Rate=Stopnja
UseLocalTax=Vključi davek
Bytes=Byti
@@ -340,6 +341,7 @@ FullList=Celoten seznam
Statistics=Statistika
OtherStatistics=Druga statistika
Status=Status
+Favorite=Priljubljen
ShortInfo=Info.
Ref=Ref.
RefSupplier=Ref. dobavitelj
@@ -365,6 +367,7 @@ ActionsOnCompany=Aktivnosti v zvezi s tem partnerjem
ActionsOnMember=Dogodki okoli tega člana
NActions=%s aktivnosti
NActionsLate=%s zamujenih
+RequestAlreadyDone=Request already recorded
Filter=Filter
RemoveFilter=Odstrani filter
ChartGenerated=Grafikon je ustvarjen
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Nastavitev posebnih atributov
URLPhoto=Url za fotografijo/logotip
SetLinkToThirdParty=Povezava na drugo tretjo osebo
CreateDraft=Ustvarite osnutek
+SetToDraft=Nazaj na osnutek
ClickToEdit=Kliknite za urejanje
ObjectDeleted=Predmet %s črta
ByCountry=Po državah
@@ -672,13 +676,13 @@ HelpCopyToClipboard=Uporabi Ctrl+C za kopiranje na odložišče
SaveUploadedFileWithMask=Shrani datoteko na strežnik z imenom "<strong>%s</strong>" (otherwise "%s")
OriginFileName=Originalno ime datoteke
SetDemandReason=Nastavi vir
-SetBankAccount=Define Bank Account
-AccountCurrency=Account Currency
+SetBankAccount=Določi bančni račun
+AccountCurrency=Valuta računa
ViewPrivateNote=Glej opombe
XMoreLines=%s zasenčena(ih) vrstic
PublicUrl=Javni URL
-AddBox=Add box
-
+AddBox=Dodaj okvir
+SelectElementAndClickRefresh=Izberi element in klikni osveži
# Week day
Monday=Ponedeljek
Tuesday=Torek
diff --git a/htdocs/langs/sl_SI/margins.lang b/htdocs/langs/sl_SI/margins.lang
index 68c5cfa67a21aef888ae7f131767cce5a7811ff3..f4ca7d75e7adfd5fc39fed94150c071b5ea47f04 100644
--- a/htdocs/langs/sl_SI/margins.lang
+++ b/htdocs/langs/sl_SI/margins.lang
@@ -1,41 +1,44 @@
# Dolibarr language file - Source file is en_US - marges
-Margin=Margin
-Margins=Margins
-TotalMargin=Total Margin
-MarginOnProducts=Margin / Products
-MarginOnServices=Margin / Services
-MarginRate=Margin rate
-MarkRate=Mark rate
-DisplayMarginRates=Display margin rates
-DisplayMarkRates=Display mark rates
-InputPrice=Input price
-margin=Profit margins management
-margesSetup=Profit margins management setup
-MarginDetails=Margin details
-ProductMargins=Product margins
-CustomerMargins=Customer margins
-SalesRepresentativeMargins=Sales representative margins
+Margin=Marža
+Margins=Marže
+TotalMargin=Skupna marža
+MarginOnProducts=Marža / proizvod
+MarginOnServices=Marža / storitev
+MarginRate=Stopnja marže
+MarkRate=Ciljna stopnja
+DisplayMarginRates=Prikaži stopnje marž
+DisplayMarkRates=Prikaži ciljne stopnje
+InputPrice=Vhodna cena
+margin=Upravljanje profitnih marž
+margesSetup=Nastavitve uporavljanja profitnih marž
+MarginDetails=Podatki o marži
+ProductMargins=Marže proizvoda
+CustomerMargins=Marže kupcev
+SalesRepresentativeMargins=Marža prodajnega predstavnika
ProductService=Proizvod ali storitev
-AllProducts=All products and services
-ChooseProduct/Service=Choose product or service
+AllProducts=Vsi proizvodi in storitve
+ChooseProduct/Service=Izberi proizvod ali storitev
StartDate=Začetni datum
EndDate=Končni datum
Launch=Start
-ForceBuyingPriceIfNull=Force buying price if null
-ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0)
-MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
-UseDiscountAsProduct=As a product
-UseDiscountAsService=As a service
-UseDiscountOnTotal=On subtotal
-MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
-MARGIN_TYPE=Margin type
-MargeBrute=Raw margin
-MargeNette=Net margin
-MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - Cost price
-CostPrice=Cost price
-BuyingCost=Cost price
-UnitCharges=Unit charges
-Charges=Charges
-AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents
+ForceBuyingPriceIfNull=Uveljavi nabavno ceno, če je nič
+ForceBuyingPriceIfNullDetails=če je "ON", bo marža 0 (nabavna cena = prodajna cena), drugače ("OFF") bo marža enaka prodajni ceni (nabavna cena = 0)
+MARGIN_METHODE_FOR_DISCOUNT=Metoda marž pri globalnih popustih
+UseDiscountAsProduct=Kot proizvod
+UseDiscountAsService=Kot storitev
+UseDiscountOnTotal=V delni vsoti
+MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Določa, če se globalni popust smatra kot proizvod, storitev, ali samo delna vsota pri izračunu marže.
+MARGIN_TYPE=Tip marže
+MargeBrute=Bruto marža
+MargeNette=Neto marža
+MARGIN_TYPE_DETAILS=Bruto marža : prodajna cena - nabavna cena<br/>Neto marža : prodajna cena - stroškovna cena
+CostPrice=Stroškovna cena
+BuyingCost=Stroškovna cena
+UnitCharges=Stroški po enoti
+Charges=Stroški
+AgentContactType=Tip kontakta komercialnega agenta
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/sl_SI/orders.lang b/htdocs/langs/sl_SI/orders.lang
index 9d1de0771ea0979b25441b8fe66f56691fa2ee46..51ef2f75c91c2d6fd700ea7d9f40b9d2d7162ae1 100644
--- a/htdocs/langs/sl_SI/orders.lang
+++ b/htdocs/langs/sl_SI/orders.lang
@@ -53,7 +53,7 @@ ShippingExist=Pošiljka ne obstaja
DraftOrWaitingApproved=Osnutek ali odobritev, še ne naročen
DraftOrWaitingShipped=Osnutek ali potrditev, še ne odposlan
MenuOrdersToBill=Naročila za fakturiranje
-MenuOrdersToBill2=Naročila za fakturiranje
+MenuOrdersToBill2=Billable orders
SearchOrder=Iskanje naročila
SearchACustomerOrder=Iskanje naročila kupca
ShipProduct=Pošlji izdelek
@@ -65,7 +65,7 @@ ValidateOrder=Potrdi naročilo
UnvalidateOrder=Unvalidate red
DeleteOrder=Briši naročilo
CancelOrder=Prekliči naročilo
-AddOrder=Dodaj naročilo
+AddOrder=Ustvari naročilo
AddToMyOrders=Dodaj mojim naročilom
AddToOtherOrders=Dodaj ostalim naročilom
AddToDraftOrders=Dodaj osnutku naročila
@@ -154,7 +154,6 @@ OrderByPhone=Telefon
CreateInvoiceForThisCustomer=Zaračunaj naročila
NoOrdersToInvoice=Ni naročil, ki bi jih lahko zaračunali
CloseProcessedOrdersAutomatically=Označi vsa izbrana naročila kot "Procesirano"
-MenuOrdersToBill2=Naročila za fakturiranje
OrderCreation=Ustvarjanje naročila
Ordered=Naročeno
OrderCreated=Vaša naročila so bila ustvarjena
diff --git a/htdocs/langs/sl_SI/oscommerce.lang b/htdocs/langs/sl_SI/oscommerce.lang
deleted file mode 100644
index 27324e176a4dd86ca5020cdf69cfb02bba019e91..0000000000000000000000000000000000000000
--- a/htdocs/langs/sl_SI/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=Nakupovalni voziček
-OSCommerceSetup=Nastavitev modula Nakupovalni voziček
-OSCommerceSetupSaved=Shranjene nastavitve za Nakupovalni voziček
-OSCommerceServer=Gostiteljski strežnik/IP za Nakupovalni voziček
-OSCommerceDatabaseName=Ime baze podatkov za Nakupovalni voziček
-OSCommercePrefix=Predpone tabel za Nakupovalni voziček
-OSCommerceUser=Uporabniško ime za bazo podatkov za Nakupovalni voziček
diff --git a/htdocs/langs/sl_SI/other.lang b/htdocs/langs/sl_SI/other.lang
index c75f06f6a2b0259c18c9e227a6db5e9a39f12fc6..bfc24608cb5b4b6f45d95103fc91eff134e336e6 100644
--- a/htdocs/langs/sl_SI/other.lang
+++ b/htdocs/langs/sl_SI/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=Varnostna koda
Calendar=Koledar
-AddTrip=Dodaj potovanje
Tools=Orodja
ToolsDesc=To področje je dodeljeno za združen prikaz različnih orodij, ki niso na voljo v drugih menijih.<br><br>Ta orodja so dostopna na stranskem meniju.
Birthday=Rojstni dan
@@ -10,21 +9,21 @@ DateToBirth=Datum rojstva
BirthdayAlertOn= Vklopljeno opozorilo na rojstni dan
BirthdayAlertOff= Izklopljeno opozorilo na rojstni dan
Notify_FICHINTER_VALIDATE=Potrjena intervencija
-Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
+Notify_FICHINTER_SENTBYMAIL=Intervencija poslana po EMailu
Notify_BILL_VALIDATE=Potrjen račun
-Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_BILL_UNVALIDATE=Račun za kupca ni potrjen
Notify_ORDER_SUPPLIER_APPROVE=Odobreno naročilo pri dobavitelju
Notify_ORDER_SUPPLIER_REFUSE=Zavrnjeno naročilo pri dobavitelju
Notify_ORDER_VALIDATE=Potrjeno naročilo kupca
Notify_PROPAL_VALIDATE=Potrjena ponudba kupcu
-Notify_PROPAL_CLOSE_SIGNED=Customer propal closed signed
-Notify_PROPAL_CLOSE_REFUSED=Customer propal closed refused
+Notify_PROPAL_CLOSE_SIGNED=Ponudba kupcu zaključena s podpisom
+Notify_PROPAL_CLOSE_REFUSED=Ponudba kupcu zaključena z zavrnitvijo
Notify_WITHDRAW_TRANSMIT=Nakazilo prenosa
Notify_WITHDRAW_CREDIT=Nakazilo kredita
Notify_WITHDRAW_EMIT=Nakazilo izdatka
Notify_ORDER_SENTBYMAIL=Naročilo po e-pošti
Notify_COMPANY_CREATE=Ustvarjen partner
-Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
+Notify_COMPANY_SENTBYMAIL=Pošta poslana s kartice partnerja
Notify_PROPAL_SENTBYMAIL=Komercialna ponudba poslana po e-pošti
Notify_BILL_PAYED=Plačan račun kupca
Notify_BILL_CANCEL=Preklican račun kupca
@@ -34,20 +33,21 @@ Notify_ORDER_SUPPLIER_SENTBYMAIL=Naročilo pri dobavitelju poslano po pošti
Notify_BILL_SUPPLIER_VALIDATE=Potrjen račun dobavitelja
Notify_BILL_SUPPLIER_PAYED=Plačan račun dobavitelja
Notify_BILL_SUPPLIER_SENTBYMAIL=Račun dobavitelja poslan po pošti
-Notify_BILL_SUPPLIER_CANCELED=Supplier invoice cancelled
+Notify_BILL_SUPPLIER_CANCELED=Preklican račun dobavitelja
Notify_CONTRACT_VALIDATE=Potrjena pogodba
Notify_FICHEINTER_VALIDATE=Potrjena intervencija
Notify_SHIPPING_VALIDATE=Potrjena odprema
Notify_SHIPPING_SENTBYMAIL=Pošiljka poslana po pošti
Notify_MEMBER_VALIDATE=Potrjeno članstvo
-Notify_MEMBER_MODIFY=Member modified
+Notify_MEMBER_MODIFY=Spremenjen član
Notify_MEMBER_SUBSCRIPTION=Vpisano članstvo
Notify_MEMBER_RESILIATE=Odpoved članstva
Notify_MEMBER_DELETE=Izbris iz članstva
-Notify_PROJECT_CREATE=Project creation
-Notify_TASK_CREATE=Task created
-Notify_TASK_MODIFY=Task modified
-Notify_TASK_DELETE=Task deleted
+Notify_PROJECT_CREATE=Ustvarjanje projekta
+Notify_TASK_CREATE=Ustvarjena naloga
+Notify_TASK_MODIFY=Spremenjena naloga
+Notify_TASK_DELETE=Izbrisana naloga
+SeeModuleSetup=See module setup
NbOfAttachedFiles=Število pripetih datotek/dokumentov
TotalSizeOfAttachedFiles=Skupna velikost pripetih datotek/dokumentov
MaxSize=Največja velikost
@@ -57,14 +57,14 @@ Miscellaneous=Razno
NbOfActiveNotifications=Število sporočil
PredefinedMailTest=To je testni mail.\nDve vrstici sta ločeni z carriage return.
PredefinedMailTestHtml=To je <b>test</b> mail (beseda test mora biti v krepkem tisku).<br>Dve vrstici sta ločeni z carriage return.
-PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nV prilogi je račun __FACREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nŽelimo vas opozoriti, da račun __FACREF__ ni bil poravnan. Zato vam račun še enkrat pošiljamo v prilogi.\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__
+PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nV prilogi je ponudba __PROPREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__
+PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nV prilogi je potrditev naročila __ORDERREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nV prilogi je naše naročilo __ORDERREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nV prilogi je račun __FACREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__
+PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nV prilogi je pošiljka __SHIPPINGREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__
+PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nV prilogi je intervencija __FICHINTERREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__
PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
DemoDesc=Dolibarr je kompakten ERP/CRM sestavljen iz več funkcionalnih modulov. Demo z vsemi moduli nima pomena, ker se kot tak nikoli ne pojavi. Zato je na voljo več demo profilov.
ChooseYourDemoProfil=Izberite demo profil, ki ustreza vaši aktivnosti...
@@ -80,6 +80,16 @@ ModifiedBy=Spremenil %s
ValidatedBy=Potrdil %s
CanceledBy=Preklical %s
ClosedBy=Zaključil %s
+CreatedById=ID uporabnika, ki je ustvaril
+ModifiedById=ID uporabnika, ki je nazadnje spremenil
+ValidatedById=ID uporabnika, ki je potrdil
+CanceledById=ID uporabnika, ki je preklical
+ClosedById=ID uporabnika, ki je zaključil
+CreatedByLogin=Ime uporabika, ki je ustvaril
+ModifiedByLogin=Ime uporabnika, ki je nazadnje spremenil
+ValidatedByLogin=Ime uporabnika, ki je potrdil
+CanceledByLogin=Ime uporabnika, ki je preklical
+ClosedByLogin=Ime uporabnika, ki je zaključil
FileWasRemoved=Datoteka je bila izbrisana
DirWasRemoved=Mapa je bila odstranjena
FeatureNotYetAvailableShort=Na voljo v naslednji različici
@@ -133,7 +143,7 @@ SizeUnitcm=cm
SizeUnitmm=mm
SizeUnitinch=inč
SizeUnitfoot=čevelj
-SizeUnitpoint=point
+SizeUnitpoint=točka
BugTracker=Sledenje hrošču
SendNewPasswordDesc=S tem obrazcem zahtevate novo geslo. Poslano bo na vaš email naslov.<br>Sprememba bo učinkovala šele po kliku na potrditveni link v tem emailu.<br>Preverite vaš poštni program.
BackToLoginPage=Nazaj na stran za prijavo
@@ -147,12 +157,12 @@ StatsByNumberOfEntities=Statistika o številu povezanih entitet
NumberOfProposals=Število ponudb v zadnjih 12 mesecih
NumberOfCustomerOrders=Število naročil kupcev v zadnjih 12 mesecih
NumberOfCustomerInvoices=Število računov kupcem v zadnjih 12 mesecih
-NumberOfSupplierOrders=Number of supplier orders on last 12 month
+NumberOfSupplierOrders=Število naročil pri dobavitelju v zadnjih 12 mesecih
NumberOfSupplierInvoices=Število računov dobaviteljev v zadnjih 12 mesecih
NumberOfUnitsProposals=Število enot na ponudbah v zadnjih 12 mesecih
NumberOfUnitsCustomerOrders=Število enot na naročilih kupcev v zadnjih 12 mesecih
NumberOfUnitsCustomerInvoices=Število enot na računih za kupce v zadnjih 12 mesecih
-NumberOfUnitsSupplierOrders=Number of units on supplier orders on last 12 month
+NumberOfUnitsSupplierOrders=Število enot na naročilih pri dobavitelju v zadnjih 12 mesecih
NumberOfUnitsSupplierInvoices=Število enot na računih dobaviteljev v zadnjih 12 mesecih
EMailTextInterventionValidated=Potrjena intervencija %s
EMailTextInvoiceValidated=Potrjen račun %s
@@ -162,7 +172,7 @@ EMailTextOrderApproved=Odobreno naročilo %s
EMailTextOrderApprovedBy=Naročilo %s odobril %s
EMailTextOrderRefused=Zavrnjeno naročilo %s
EMailTextOrderRefusedBy=Naročilo %s zavrnil %s
-EMailTextExpeditionValidated=The shipping %s has been validated.
+EMailTextExpeditionValidated=Odprema %s je bila potrjena
ImportedWithSet=Nabor podatkov za uvoz
DolibarrNotification=Avtomatsko obvestilo
ResizeDesc=Vnesite novo širino <b>ALI</b> novo višino. Razmerje se bo med spreminjanjem velikosti ohranilo...
@@ -184,34 +194,35 @@ StartUpload=Zaženi prenos
CancelUpload=Prekliči prenos
FileIsTooBig=Datoteke so prevelike
PleaseBePatient=Prosim, bodite potrpežljivi...
-RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
-NewKeyIs=This is your new keys to login
-NewKeyWillBe=Your new key to login to software will be
-ClickHereToGoTo=Click here to go to %s
-YouMustClickToChange=You must however first click on the following link to validate this password change
-ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
+RequestToResetPasswordReceived=Prejet je bil zahtevek za spremembo vašega Dolibarr gesla
+NewKeyIs=To so vaši novi podatki za prijavo
+NewKeyWillBe=Vaši novi podatki za prijavo v program bodo
+ClickHereToGoTo=K.iknite tukaj za vstop v %s
+YouMustClickToChange=Vendar morate najprej klikniti na naslednji link za potrditev spremembe gesla
+ForgetIfNothing=Če niste zahtevali te spremembe, enostavno pozabite na ta email. Vaši prijavni podatki so varno shranjeni.
##### Calendar common #####
AddCalendarEntry=Dodaj vnos v koledar %s
-NewCompanyToDolibarr=Podjetje %s dodano v Dolibarr
-ContractValidatedInDolibarr=Pogodba %s potrjena v Dolibarrju
-ContractCanceledInDolibarr=Pogodba %s preklicana v Dolibarrju
-ContractClosedInDolibarr=Pogodba %s zaključena v Dolibarrju
-PropalClosedSignedInDolibarr=Ponudba %s podpisana v Dolibarrju
-PropalClosedRefusedInDolibarr=Ponudba %s zavrnjena v Dolibarrju
-PropalValidatedInDolibarr=Ponudba %s potrjena v Dolibarrju
-InvoiceValidatedInDolibarr=Račun %s potrjen v Dolibarrju
-InvoicePaidInDolibarr=Račun %s spremenjen v 'plačano' v Dolibarrju
-InvoiceCanceledInDolibarr=Račun %s preklican v Dolibarrju
-PaymentDoneInDolibarr=Plačilo %s izvršeno v Dolibarrju
-CustomerPaymentDoneInDolibarr=Plačilo kupca %s izvršeno v Dolibarrju
-SupplierPaymentDoneInDolibarr=Plačilo dobavitelju %s izvršeno v Dolibarrju
-MemberValidatedInDolibarr=Član %s potrjen v Dolibarrju
-MemberResiliatedInDolibarr=Član %s blokiran v Dolibarrju
-MemberDeletedInDolibarr=Član %s izbrisan iz Dolibarrja
-MemberSubscriptionAddedInDolibarr=Naročnina za člana %s dodana v Dolibarr
-ShipmentValidatedInDolibarr=Pošiljka %s potrjena v Dolibarr
-ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
##### Export #####
Export=Izvoz
ExportsArea=Področje izvoza
diff --git a/htdocs/langs/sl_SI/paybox.lang b/htdocs/langs/sl_SI/paybox.lang
index d3c604917b8de7a64af0ca8cdd513de5ad215ea7..00476aa7811f5ad2c71757a439b608b8997f22ce 100644
--- a/htdocs/langs/sl_SI/paybox.lang
+++ b/htdocs/langs/sl_SI/paybox.lang
@@ -35,3 +35,6 @@ MessageKO=Sporočilo na strani za preklic plačila
NewPayboxPaymentReceived=Novo Paybox plačilo prejeto
NewPayboxPaymentFailed=Zavrnjen poskus novega Paybox plačila
PAYBOX_PAYONLINE_SENDEMAIL=E-poštno opozorilo po plačilu (uspešno ali zavrnjeno)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/sl_SI/resource.lang b/htdocs/langs/sl_SI/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..d64075dfbf595897a63e3eebf19194d8f71030dd
--- /dev/null
+++ b/htdocs/langs/sl_SI/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
diff --git a/htdocs/langs/sl_SI/sendings.lang b/htdocs/langs/sl_SI/sendings.lang
index 2602c7c01ebec6cb9ae769df0ba30dcb96d51a7d..d36f18d27acd5d4303942fe47b319d54ff785981 100644
--- a/htdocs/langs/sl_SI/sendings.lang
+++ b/htdocs/langs/sl_SI/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=Za trenutek je oblikovanje nove pošiljke opravi
RelatedShippings=Povezane pošiljke
ShipmentLine=Vrstica na odpremnici
CarrierList=Seznam prevoznikov
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
# Sending methods
SendingMethodCATCH=Lasten prevzem kupca
diff --git a/htdocs/langs/sl_SI/stocks.lang b/htdocs/langs/sl_SI/stocks.lang
index d979328a2bcc178eddd91a392e3bdbd761b3b902..7a0c4fd1f164c2a0af5cab6682e4bc0cd580ee92 100644
--- a/htdocs/langs/sl_SI/stocks.lang
+++ b/htdocs/langs/sl_SI/stocks.lang
@@ -8,8 +8,8 @@ MenuNewWarehouse=Novo skladišče
WarehouseOpened=Skladišče odprto
WarehouseClosed=Skladišče zaprto
WarehouseSource=Izvorno skladišče
-WarehouseSourceNotDefined=No warehouse defined,
-AddOne=Add one
+WarehouseSourceNotDefined=Ni definirano skladišče,
+AddOne=dodajte ga
WarehouseTarget=Ciljno skladišče
ValidateSending=Potrdi pošiljko
CancelSending=Prekliči pošiljko
@@ -23,25 +23,25 @@ ErrorWarehouseLabelRequired=Obvezen je naziv skladišča
CorrectStock=Popravi zalogo
ListOfWarehouses=Spisek skladišč
ListOfStockMovements=Seznam gibanja zaloge
-StocksArea=Področje zalog
+StocksArea=Warehouses area
Location=Lokacija
LocationSummary=Kratko ime lokacije
-NumberOfDifferentProducts=Number of different products
+NumberOfDifferentProducts=Število različnih proizvodov
NumberOfProducts=Skupno število proizvodov
LastMovement=Zadnja sprememba
LastMovements=Zadnje spremembe
Units=Enote
Unit=Enota
StockCorrection=Popravek zaloge
-StockTransfer=Stock transfer
+StockTransfer=Prenos zaloge
StockMovement=Prenos
StockMovements=Prenosi zaloge
-LabelMovement=Movement label
+LabelMovement=Označitev premika
NumberOfUnit=Število enot
-UnitPurchaseValue=Unit purchase price
+UnitPurchaseValue=Nabavna cena enote
TotalStock=Skupaj na zalogi
StockTooLow=Zaloga je prenizka
-StockLowerThanLimit=Stock lower than alert limit
+StockLowerThanLimit=Zaloga je nižja od opozorilne vrednosti
EnhancedValue=Vrednost
PMPValue=Uravnotežena povprečna cena
PMPValueShort=UPC
@@ -57,13 +57,13 @@ DeStockOnShipment=Zmanjšanje dejanske zaloge po potrditvi odpreme (priporočeno
ReStockOnBill=Povečanje dejanske zaloge po potrditvi fakture/dobropisa (pozor, v tej verziji se zaloga spremeni samo v skladišču številka 1)
ReStockOnValidateOrder=Povečanje dejanske zaloge po potrditvi naročila (pozor, v tej verziji se zaloga spremeni samo v skladišču številka 1)
ReStockOnDispatchOrder=Povečanje dejanske zaloge po ročnem vnosu v skladišče, po prejemu naročila od dobavitelja
-ReStockOnDeleteInvoice=Increase real stocks on invoice deletion
+ReStockOnDeleteInvoice=Povečaj dejansko zalogo ob brisanju računa
OrderStatusNotReadyToDispatch=Naročilo še nima ali nima več statusa, ki omogoča odpremo proizvoda iz skladišča.
StockDiffPhysicTeoric=Razlog za razliko med knjižno in dejansko zalogo
NoPredefinedProductToDispatch=Za ta objekt ni preddefiniranih proizvodov. Zato ni potrebna odprema iz skladišča.
DispatchVerb=Odprema
-StockLimitShort=Limit for alert
-StockLimit=Stock limit for alert
+StockLimitShort=Omejitev za opozorilo
+StockLimit=Omejitev zaloge za opozorilo
PhysicalStock=Fizična zaloga
RealStock=Dejanska zaloga
VirtualStock=Virtualna zaloga
@@ -88,38 +88,38 @@ PersonalStock=Osebna zaloga %s
ThisWarehouseIsPersonalStock=To skladišče predstavlja osebno zalogo %s %s
SelectWarehouseForStockDecrease=Izberite skladišče uporabiti za zmanjšanje zalog
SelectWarehouseForStockIncrease=Izberite skladišče uporabiti za povečanje zalog
-NoStockAction=No stock action
-LastWaitingSupplierOrders=Orders waiting for receptions
-DesiredStock=Desired stock
-StockToBuy=To order
-Replenishment=Replenishment
-ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
-UseVirtualStock=Use virtual stock
-UsePhysicalStock=Use physical stock
-CurentSelectionMode=Curent selection mode
-CurentlyUsingVirtualStock=Virtual stock
-CurentlyUsingPhysicalStock=Physical stock
-RuleForStockReplenishment=Rule for stocks replenishment
-SelectProductWithNotNullQty=Select at least one product with a qty not null and a supplier
-AlertOnly= Alerts only
-WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
-WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
-ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders
-Replenishments=Replenishments
-NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
-NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
-MassMovement=Mass movement
-MassStockMovement=Mass stock movement
-SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
-RecordMovement=Record transfert
-ReceivingForSameOrder=Receivings for this order
-StockMovementRecorded=Stock movements recorded
-RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
+NoStockAction=Ni aktivnosti zaloge
+LastWaitingSupplierOrders=Naročila, ki čakajo na prevzem
+DesiredStock=Želena zaloga
+StockToBuy=Za naročiti
+Replenishment=Obnavljanje
+ReplenishmentOrders=Naročila za obnavljanje
+VirtualDiffersFromPhysical=Glede na opcije povečanja/zmanjšanja zaloge, se lahko fizična in virtualna zaloga (fizična + trenutna naročila) razlikujeta
+UseVirtualStockByDefault=Privzeto uporabljaj virtualno zalogo namesto fizične za funkcijo obnovitve zaloge
+UseVirtualStock=Uporabi virtualno zalogo
+UsePhysicalStock=Uporabi fizično zalogo
+CurentSelectionMode=Trenutno izbran način
+CurentlyUsingVirtualStock=Virtualna zaloga
+CurentlyUsingPhysicalStock=Fizična zaloga
+RuleForStockReplenishment=Pravilo za obnavljanje zalog
+SelectProductWithNotNullQty=Izberite najmanj en proizvod, katerega stanje ni enako nič in ima dobavitelja
+AlertOnly= Samo opozorila
+WarehouseForStockDecrease=Skladiščee <b>%s</b> bo uporabljeno za zmanjšanje zaloge
+WarehouseForStockIncrease=Skladišče <b>%s</b> bo uporabljeno za povečanje zaloge
+ForThisWarehouse=Za to skladišče
+ReplenishmentStatusDesc=Seznam vseh proizvodov, ki imajo nižje stanje zaloge od želenega (ali nižje od opozorilne vrednosti, če je kvadratek "samo opozorilo" odkljukan) in predlog za kreiranje naročila pri dobavitelju za dopolnitev razlike.
+ReplenishmentOrdersDesc=To je seznam vseh odprtih naročil pri dobavitelju
+Replenishments=Obnovitve
+NbOfProductBeforePeriod=Količina proizvoda %s na zalogi pred izbranim obdobjem (< %s)
+NbOfProductAfterPeriod=Količina proizvoda %s na zalogi po izbranem obdobju (> %s)
+MassMovement=Masovni premik
+MassStockMovement=Masovni premik zaloge
+SelectProductInAndOutWareHouse=Izberi proizvod, količino, izvorno skladišče in ciljno skladišče, nato klikni "%s". Ko je to narejeno za vse zahtevane premike, klikni na "%s".
+RecordMovement=Zapis prenešen
+ReceivingForSameOrder=Prejemnice za to naročilo
+StockMovementRecorded=Zapisan premik zaloge
+RuleForStockAvailability=Pravila za zahtevane zaloge
+StockMustBeEnoughForInvoice=Nivo zaloge mora biti dovolj visok za dodajanje proizvoda/storitve na račun
+StockMustBeEnoughForOrder=Nivo zaloge mora biti dovolj visok za dodajanje proizvoda/storitve na naročilo
+StockMustBeEnoughForShipment= Nivo zaloge mora biti dovolj visok za dodajanje proizvoda/storitve na odpremnico
diff --git a/htdocs/langs/sl_SI/users.lang b/htdocs/langs/sl_SI/users.lang
index d18cf255023cb040cad6a8492df21b126865eeb6..778e491156b4b0d1d755cec815ba0a4009492441 100644
--- a/htdocs/langs/sl_SI/users.lang
+++ b/htdocs/langs/sl_SI/users.lang
@@ -63,7 +63,6 @@ ShowGroup=Prikaži skupino
ShowUser=Prikaži uporabnika
NonAffectedUsers=Nevključeni uporabniki
UserModified=Uporabnik uspešno spremenjen
-GroupModified=Skupina %s je spremenjena
PhotoFile=Datoteka s fotografijo
UserWithDolibarrAccess=Uporabnik z dostopom do Dolibarrja
ListOfUsersInGroup=Seznam uporabnikov v tej skupini
@@ -103,7 +102,7 @@ UserDisabled=Uporabnik %s je onemogočen
UserEnabled=Uporabnik %s je aktiviran
UserDeleted=Uporabnik %s je odstranjen
NewGroupCreated=Skupina %s je kreirana
-GroupModified=Skupina %s je spremenjena
+GroupModified=Group %s modified
GroupDeleted=Skupina %s je odstranjena
ConfirmCreateContact=Ali zares želite kreirati Dolibarr dostop za ta kontakt ?
ConfirmCreateLogin=Ali zares želite kreirati Dolibarr dostop za tega člana ?
@@ -114,8 +113,10 @@ YourRole=Vaše vloge
YourQuotaOfUsersIsReached=Dosežena je vaša kvota aktivnih uporabnikov !
NbOfUsers=Število uporabnikov
DontDowngradeSuperAdmin=Samo superadmin lahko degradira samo superadmin
-HierarchicalResponsible=Hierarhična odgovornost
+HierarchicalResponsible=Nadzornik
HierarchicView=Hierarhični pogled
UseTypeFieldToChange=Uporabi polje "Vnos" za spremembo
OpenIDURL=Spletni naslov OpenID
LoginUsingOpenID=Uporabi OpenID za prijavo
+WeeklyHours=Tedenske ure
+ColorUser=Barve uporabnika
diff --git a/htdocs/langs/sl_SI/withdrawals.lang b/htdocs/langs/sl_SI/withdrawals.lang
index 16128d0b7ace3d7d51656e4816586b7eb705f46b..a8f6547afae05abf5f92a8451ea36b068e74fa83 100644
--- a/htdocs/langs/sl_SI/withdrawals.lang
+++ b/htdocs/langs/sl_SI/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=Potrdilo
LastWithdrawalReceipts=Zadnjih %s potrdil o nakazilih
WithdrawedBills=Nakazila po računih
WithdrawalsLines=Nakazane postavke
-RequestStandingOrderToTreat=Zahtevek po izvršitvi trajnikov
-RequestStandingOrderTreated=Zahtevek po izvršenih trajnikih
+RequestStandingOrderToTreat=Request for standing orders to process
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=Trajniki kupcev
CustomerStandingOrder=Trajnik kupca
NbOfInvoiceToWithdraw=Št. računov z zahtevkom za nakazilo
@@ -40,14 +41,13 @@ TransMetod=Metoda prenosa
Send=Pošlji
Lines=Vrstice
StandingOrderReject=Izdaja zavrnitve
-InvoiceRefused=Zaračunaj zavrnitev kupcu
WithdrawalRefused=Zavrnjena nakazila
WithdrawalRefusedConfirm=Ali zares želite vnesti zavrnitev nakazila za družbo
RefusedData=Datum zavrnitve
RefusedReason=Razlog za zavrnitev
RefusedInvoicing=Zaračunavanje zavrnitev
NoInvoiceRefused=Ne zaračunaj zavrnitve
-InvoiceRefused=Zaračunaj zavrnitev kupcu
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=Status
StatusUnknown=Neznano
StatusWaiting=Na čakanju
@@ -76,7 +76,7 @@ WithBankUsingRIB=Za bančne račune, ki uporabljajo RIB
WithBankUsingBANBIC=Za bančne račune, ki uporabljajo IBAN/BIC/SWIFT
BankToReceiveWithdraw=Informacija o vašem bančnem računu za prejem nakazil
CreditDate=Datum kredita
-WithdrawalFileNotCapable=Ni možno generirati datoteke za prejem nakazil za vašo državo
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
ShowWithdraw=Prikaži nakazilo
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Vendar, če ima račun najmanj eno neizvršeno nakazilo, ne bo označeno kot plačano, da bi bilo pred tem možno izvršiti nakazilo.
DoStandingOrdersBeforePayments=Ti zavihki omogočajo zahtevo za trajnik. Ko je končano, lahko vnesete plačilo in zaprete račun.
diff --git a/htdocs/langs/sq_AL/accountancy.lang b/htdocs/langs/sq_AL/accountancy.lang
index 8cab9d2b651d75b0721d76fda619e2034e4509b4..39c2732ec29852cf93d41614ed1812c2a4c1ce4f 100644
--- a/htdocs/langs/sq_AL/accountancy.lang
+++ b/htdocs/langs/sq_AL/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts
Validate=Validate
Addanaccount=Add an accounting account
AccountAccounting=Accounting account
-Ventilation=Ventilation
+Ventilation=Breakdown
ToDispatch=To dispatch
Dispatched=Dispatched
-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
TradeMargin=Trade margin
Reports=Reports
ByCustomerInvoice=By invoices customers
@@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger
Bookkeeping=General ledger
AccountBalanceByMonth=Account balance by month
-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
Line=Line
CAHTF=Total purchase supplier HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice
IntoAccount=In the accounting account
Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
+VentilationAuto=Automatic breakdown
Processing=Processing
EndProcessing=The end of processing
@@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account
ACCOUNTING_SEPARATORCSV=Separator CSV
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
@@ -140,14 +140,14 @@ Active=Statement
NewFiscalYear=New fiscal year
-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
TotalVente=Total turnover HT
TotalMarge=Total sales margin
DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
ChangeAccount=Change the accounting account for lines selected by the account:
Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
@@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically
ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index e3e30f01dd45fb2c05d3f595e65a403a20a57b5c..b5d84a0aca719247703edbf256ec07a363a655bc 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -437,8 +437,8 @@ Module52Name=Stocks
Module52Desc=Stock management (products)
Module53Name=Services
Module53Desc=Service management
-Module54Name=Contracts
-Module54Desc=Contract and service management
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=Barcodes
Module55Desc=Barcode management
Module56Name=Telephony
@@ -475,8 +475,8 @@ Module320Name=RSS Feed
Module320Desc=Add RSS feed inside Dolibarr screen pages
Module330Name=Bookmarks
Module330Desc=Bookmark management
-Module400Name=Projects
-Module400Desc=Project management inside other modules
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=Webcalendar
Module410Desc=Webcalendar integration
Module500Name=Special expenses (tax, social contributions, dividends)
@@ -484,7 +484,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di
Module510Name=Salaries
Module510Desc=Management of employees salaries and payments
Module600Name=Notifications
-Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Donations
Module700Desc=Donation management
Module1200Name=Mantis
@@ -514,16 +514,16 @@ Module5000Name=Multi-company
Module5000Desc=Allows you to manage multiple companies
Module6000Name=Workflow
Module6000Desc=Workflow management
-Module20000Name=Holidays
-Module20000Desc=Declare and follow employees holidays
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
Module39000Name=Product batch
Module39000Desc=Batch number, eat-by and sell-by date management on products
Module50000Name=PayBox
Module50000Desc=Module to offer an online payment page by credit card with PayBox
Module50100Name=Point of sales
Module50100Desc=Point of sales module
-Module50200Name= Paypal
-Module50200Desc= Module to offer an online payment page by credit card with Paypal
+Module50200Name=Paypal
+Module50200Desc=Module to offer an online payment page by credit card with Paypal
Module50400Name=Accounting (advanced)
Module50400Desc=Accounting management (double parties)
Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=Read standing orders
Permission152=Create/modify a standing orders request
Permission153=Transmission standing orders receipts
Permission154=Credit/refuse standing orders receipts
-Permission161=Read contracts
-Permission162=Create/modify contracts
-Permission163=Activate a service of a contract
-Permission164=Disable a service of a contract
-Permission165=Delete contracts
-Permission171=Read trips
-Permission172=Create/modify trips
-Permission173=Delete trips
-Permission178=Export trips
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Read trips and expenses (own and his subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
Permission180=Read suppliers
Permission181=Read supplier orders
Permission182=Create/modify supplier orders
@@ -671,7 +672,7 @@ Permission300=Read bar codes
Permission301=Create/modify bar codes
Permission302=Delete bar codes
Permission311=Read services
-Permission312=Assign service to contract
+Permission312=Assign service/subscription to contract
Permission331=Read bookmarks
Permission332=Create/modify bookmarks
Permission333=Delete bookmarks
@@ -701,8 +702,8 @@ Permission701=Read donations
Permission702=Create/modify donations
Permission703=Delete donations
Permission1001=Read stocks
-Permission1002=Create/modify stocks
-Permission1003=Delete stocks
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=Read stock movements
Permission1005=Create/modify stock movements
Permission1101=Read delivery orders
@@ -1038,7 +1039,6 @@ YesInSummer=Yes in summer
OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
SuhosinSessionEncrypt=Session storage encrypted by Suhosin
ConditionIsCurrently=Condition is currently %s
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
YouUseBestDriver=You use driver %s that is best driver available currently.
YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by
ModuleCompanyCodePanicum=Return an empty accountancy code.
ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
UseNotifications=Use notifications
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events, to third parties (customers or suppliers) that are configured to. Choice of active notification and targets contacts is made one third party at time.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
ModelModules=Documents templates
DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
WatermarkOnDraft=Watermark on draft document
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=Add delivery date ability
UseOptionLineIfNoQuantity=A line of product/service with a zero amount is considered as an option
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list
ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order
FreeLegalTextOnOrders=Free text on orders
WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
##### Clicktodial #####
ClickToDialSetup=Click To Dial module setup
ClickToDialUrlDesc=Url called when a click on phone picto is done. In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=Intervention numbering models
TemplatePDFInterventions=Intervention card documents models
WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
##### Contracts #####
-ContractsSetup=Contracts module setup
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=Contracts numbering modules
TemplatePDFContracts=Contracts documents models
FreeLegalTextOnContracts=Free text on contracts
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
CacheByServer=Cache by server
CacheByClient=Cache by browser
CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=Products module setup
ServiceSetup=Services module setup
@@ -1382,9 +1384,10 @@ MailingSetup=EMailing module setup
MailingEMailFrom=Sender EMail (From) for emails sent by emailing module
MailingEMailError=Return EMail (Errors-to) for emails with errors
##### Notification #####
-NotificationSetup=Notification bu email module setup
+NotificationSetup=EMail notification module setup
NotificationEMailFrom=Sender EMail (From) for emails sent for notifications
-ListOfAvailableNotifications=List of available notifications (This list depends on activated modules)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
##### Sendings #####
SendingsSetup=Sending module setup
SendingsReceiptModel=Sending receipt model
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe
OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
##### Stock #####
-StockSetup=Configuration module stock
-UserWarehouse=Use user personal stocks
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=Menu deleted
TreeMenu=Tree menus
@@ -1478,11 +1482,14 @@ ClickToDialDesc=This module allows to add an icon after phone numbers. A click o
##### Point Of Sales (CashDesk) #####
CashDesk=Point of sales
CashDeskSetup=Point of sales module setup
-CashDeskThirdPartyForSell=Generic third party to use for sells
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Default account to use to receive cash payments
CashDeskBankAccountForCheque= Default account to use to receive payments by cheque
CashDeskBankAccountForCB= Default account to use to receive payments by credit cards
-CashDeskIdWareHouse=Warehouse to use for sells
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Bookmark module setup
BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Delete fiscal year
ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
Opened=Opened
Closed=Closed
-
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
diff --git a/htdocs/langs/sq_AL/agenda.lang b/htdocs/langs/sq_AL/agenda.lang
index 9b3efc07dabbe9581725281613818cea48764551..1ed4e637d146d23c70eb1cad90469a4841a9678d 100644
--- a/htdocs/langs/sq_AL/agenda.lang
+++ b/htdocs/langs/sq_AL/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= Automatic filling
AgendaAutoActionDesc= Define here events for which you want Dolibarr to create automatically an event in agenda. If nothing is checked (by default), only manual actions will be included in agenda.
AgendaSetupOtherDesc= This page provides options to allow export of your Dolibarr events into an external calendar (thunderbird, google calendar, ...)
AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda.
-ActionsEvents= Events for which Dolibarr will create an action in agenda automatically
-PropalValidatedInDolibarr= Proposal %s validated
-InvoiceValidatedInDolibarr= Invoice %s validated
+ActionsEvents=Events for which Dolibarr will create an action in agenda automatically
+PropalValidatedInDolibarr=Proposal %s validated
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
InvoiceDeleteDolibarr=Invoice %s deleted
OrderValidatedInDolibarr= Order %s validated
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Order %s approved
OrderRefusedInDolibarr=Order %s refused
OrderBackToDraftInDolibarr=Order %s go back to draft status
OrderCanceledInDolibarr=Order %s canceled
-InterventionValidatedInDolibarr=Intervention %s validated
ProposalSentByEMail=Commercial proposal %s sent by EMail
OrderSentByEMail=Customer order %s sent by EMail
InvoiceSentByEMail=Customer invoice %s sent by EMail
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=Supplier order %s sent by EMail
SupplierInvoiceSentByEMail=Supplier invoice %s sent by EMail
ShippingSentByEMail=Shipping %s sent by EMail
ShippingValidated= Shipping %s validated
-InterventionSentByEMail=Intervention %s sent by EMail
-InterventionClassifiedBilled=Intervention %s classified as Billed
NewCompanyToDolibarr= Third party created
DateActionPlannedStart= Planned start date
DateActionPlannedEnd= Planned end date
@@ -70,9 +68,9 @@ DateActionStart= Start date
DateActionEnd= End date
AgendaUrlOptions1=You can also add following parameters to filter output:
AgendaUrlOptions2=<b>login=%s</b> to restrict output to actions created by, assigned to or done by user <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions created by user <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> to restrict output to actions done by user <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
AgendaShowBirthdayEvents=Show birthday's contacts
AgendaHideBirthdayEvents=Hide birthday's contacts
Busy=Busy
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=URL to access .ical file
ExtSiteNoLabel=No Description
WorkingTimeRange=Working time range
WorkingDaysRange=Working days range
-AddEvent=Add event
+AddEvent=Create event
MyAvailability=My availability
diff --git a/htdocs/langs/sq_AL/bills.lang b/htdocs/langs/sq_AL/bills.lang
index 1edd72130768502f868a057917ba530eeb280671..81b7515a8b8c3c3aa8a2d9e46e3fe9ccad263f59 100644
--- a/htdocs/langs/sq_AL/bills.lang
+++ b/htdocs/langs/sq_AL/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Credit note
InvoiceAvoirAsk=Credit note to correct invoice
InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example).
invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
-invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
ReplaceInvoice=Replace invoice %s
ReplacementInvoice=Replacement invoice
ReplacedByInvoice=Replaced by invoice %s
@@ -87,7 +87,7 @@ ClassifyCanceled=Classify 'Abandoned'
ClassifyClosed=Classify 'Closed'
ClassifyUnBilled=Classify 'Unbilled'
CreateBill=Create Invoice
-AddBill=Add invoice or credit note
+AddBill=Create invoice or credit note
AddToDraftInvoices=Add to draft invoice
DeleteBill=Delete invoice
SearchACustomerInvoice=Search for a customer invoice
@@ -99,7 +99,7 @@ DoPaymentBack=Do payment back
ConvertToReduc=Convert into future discount
EnterPaymentReceivedFromCustomer=Enter payment received from customer
EnterPaymentDueToCustomer=Make payment due to customer
-DisabledBecauseRemainderToPayIsZero=Disabled because remainder to pay is zero
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
Amount=Amount
PriceBase=Price base
BillStatus=Invoice status
@@ -137,8 +137,6 @@ BillFrom=From
BillTo=To
ActionsOnBill=Actions on invoice
NewBill=New invoice
-Prélèvements=Standing order
-Prélèvements=Standing order
LastBills=Last %s invoices
LastCustomersBills=Last %s customers invoices
LastSuppliersBills=Last %s suppliers invoices
@@ -156,9 +154,9 @@ ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b> ?
ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned' ?
ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid ?
ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice ?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
@@ -191,9 +189,9 @@ AlreadyPaid=Already paid
AlreadyPaidBack=Already paid back
AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposits)
Abandoned=Abandoned
-RemainderToPay=Remainder to pay
-RemainderToTake=Remainder to take
-RemainderToPayBack=Remainder to pay back
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
Rest=Pending
AmountExpected=Amount claimed
ExcessReceived=Excess received
@@ -219,19 +217,18 @@ NoInvoice=No invoice
ClassifyBill=Classify invoice
SupplierBillsToPay=Suppliers invoices to pay
CustomerBillsUnpaid=Unpaid customers invoices
-DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters
-DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=Non-recoverable
SetConditions=Set payment terms
SetMode=Set payment mode
Billed=Billed
-RepeatableInvoice=Pre-defined invoice
-RepeatableInvoices=Pre-defined invoices
-Repeatable=Pre-defined
-Repeatables=Pre-defined
-ChangeIntoRepeatableInvoice=Convert into pre-defined
-CreateRepeatableInvoice=Create pre-defined invoice
-CreateFromRepeatableInvoice=Create from pre-defined invoice
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines
CustomersInvoicesAndPayments=Customer invoices and payments
ExportDataset_invoice_1=Customer invoices list and invoice's lines
diff --git a/htdocs/langs/sq_AL/categories.lang b/htdocs/langs/sq_AL/categories.lang
index ed61bfc08a61b4e5bfdadecfe7f6a15298afc6e3..22914931db137a565a45daad16b9b04fbd08465b 100644
--- a/htdocs/langs/sq_AL/categories.lang
+++ b/htdocs/langs/sq_AL/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories
CatCusLinks=Links between customers/prospects and categories
CatProdLinks=Links between products/services and categories
CatMemberLinks=Links between members and categories
-CatProdLinks=Links between products/services and categories
-CatCusLinks=Links between customers/prospects and categories
-CatSupLinks=Links between suppliers and categories
DeleteFromCat=Remove from category
DeletePicture=Picture delete
ConfirmDeletePicture=Confirm picture deletion?
@@ -112,3 +109,4 @@ CategoriesSetup=Categories setup
CategorieRecursiv=Link with parent category automatically
CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category
diff --git a/htdocs/langs/sq_AL/compta.lang b/htdocs/langs/sq_AL/compta.lang
index 3929cfde0367b6f5d8dc7945385de4877d9e4759..9fe5eff520d881c617f38aa7d9db675ec18f118a 100644
--- a/htdocs/langs/sq_AL/compta.lang
+++ b/htdocs/langs/sq_AL/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s
SuppliersProductsSellSalesTurnover=The generated turnover by the sales of supplier's products.
CheckReceipt=Check deposit
CheckReceiptShort=Check deposit
+LastCheckReceiptShort=Last %s check receipts
NewCheckReceipt=New discount
NewCheckDeposit=New check deposit
NewCheckDepositOn=Create receipt for deposit on account: %s
diff --git a/htdocs/langs/sq_AL/contracts.lang b/htdocs/langs/sq_AL/contracts.lang
index e5ad112b222db93bedf8e6ded250a39d062215c6..511516dc755e4f3aba2d67e91238426896629cbd 100644
--- a/htdocs/langs/sq_AL/contracts.lang
+++ b/htdocs/langs/sq_AL/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Contracts area
ListOfContracts=List of contracts
-LastContracts=Last %s modified contracts
+LastModifiedContracts=Last %s modified contracts
AllContracts=All contracts
ContractCard=Contract card
ContractStatus=Contract status
@@ -27,7 +27,7 @@ MenuRunningServices=Running services
MenuExpiredServices=Expired services
MenuClosedServices=Closed services
NewContract=New contract
-AddContract=Add contract
+AddContract=Create contract
SearchAContract=Search a contract
DeleteAContract=Delete a contract
CloseAContract=Close a contract
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines
ListOfRunningServices=List of running services
NotActivatedServices=Inactive services (among validated contracts)
BoardNotActivatedServices=Services to activate among validated contracts
-LastContracts=Last %s modified contracts
+LastContracts=Last % contracts
LastActivatedServices=Last %s activated services
LastModifiedServices=Last %s modified services
EditServiceLine=Edit service line
diff --git a/htdocs/langs/sq_AL/cron.lang b/htdocs/langs/sq_AL/cron.lang
index 768cd012384454aef37c15bb651dcf719a11e334..195ad43c87c41ae0938fa27745ba14209fbac724 100644
--- a/htdocs/langs/sq_AL/cron.lang
+++ b/htdocs/langs/sq_AL/cron.lang
@@ -1,10 +1,8 @@
# Dolibarr language file - Source file is en_US - cron
-#
# About page
About = About
CronAbout = About Cron
CronAboutPage = Cron about page
-
# Right
Permission23101 = Read Scheduled task
Permission23102 = Create/update Scheduled task
@@ -20,9 +18,8 @@ CronExplainHowToRunUnix=On Unix environment you should use crontab to run Comman
CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
# Menu
CronJobs=Scheduled jobs
-CronListActive= List of active jobs
-CronListInactive= List of disabled jobs
-CronListActive= List of active jobs
+CronListActive=List of active/scheduled jobs
+CronListInactive=List of disabled jobs
# Page list
CronDateLastRun=Last run
CronLastOutput=Last run output
diff --git a/htdocs/langs/sq_AL/donations.lang b/htdocs/langs/sq_AL/donations.lang
index 66ddea95a5c694d8044c40b7da05319d0b77a530..f7aed91cf81caf0e83e390519642ea1f199670c6 100644
--- a/htdocs/langs/sq_AL/donations.lang
+++ b/htdocs/langs/sq_AL/donations.lang
@@ -4,7 +4,7 @@ Donations=Donations
DonationRef=Donation ref.
Donor=Donor
Donors=Donors
-AddDonation=Add a donation
+AddDonation=Create a donation
NewDonation=New donation
ShowDonation=Show donation
DonationPromise=Gift promise
@@ -31,3 +31,8 @@ DonationRecipient=Donation recipient
ThankYou=Thank You
IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
MinimumAmount=Minimum amount is %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/sq_AL/externalsite.lang b/htdocs/langs/sq_AL/externalsite.lang
index 62da68c045d199d9fd0a078061cc7739f33ae967..da4853df0df086e3040a294cec116c590f4c2e9e 100644
--- a/htdocs/langs/sq_AL/externalsite.lang
+++ b/htdocs/langs/sq_AL/externalsite.lang
@@ -2,3 +2,4 @@
ExternalSiteSetup=Setup link to external website
ExternalSiteURL=External Site URL
ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/sq_AL/holiday.lang b/htdocs/langs/sq_AL/holiday.lang
index c25abf6449ca2cc97d5dba6340d1530b5ea9c675..f5b87fefb0878c40cc75768a1d1c4bcf4cb80c72 100644
--- a/htdocs/langs/sq_AL/holiday.lang
+++ b/htdocs/langs/sq_AL/holiday.lang
@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
CantCreateCP=You don't have the right to make leave requests.
InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=Update
CantUpdate=You cannot update this leave request.
NoDateDebut=You must select a start date.
NoDateFin=You must select an end date.
-ErrorDureeCP=Your request for holidays does not contain working day.
-TitleValidCP=Approve the request holidays
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
ConfirmValidCP=Are you sure you want to approve the leave request?
DateValidCP=Date approved
TitleToValidCP=Send leave request
ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the request holidays
+TitleRefuseCP=Refuse the leave request
ConfirmRefuseCP=Are you sure you want to refuse the leave request?
NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
+TitleCancelCP=Cancel the leave request
ConfirmCancelCP=Are you sure you want to cancel the leave request?
DetailRefusCP=Reason for refusal
DateRefusCP=Date of refusal
@@ -78,7 +77,7 @@ ActionByCP=Performed by
UserUpdateCP=For the user
PrevSoldeCP=Previous Balance
NewSoldeCP=New Balance
-alreadyCPexist=A request for holidays has already been done on this period.
+alreadyCPexist=A leave request has already been done on this period.
UserName=Name
Employee=Employee
FirstDayOfHoliday=First day of vacation
@@ -88,25 +87,25 @@ ManualUpdate=Manual update
HolidaysCancelation=Leave request cancelation
## Configuration du Module ##
-ConfCP=Configuration of holidays module
+ConfCP=Configuration of leave request module
DescOptionCP=Description of the option
ValueOptionCP=Value
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
UpdateConfCPOK=Updated successfully.
ErrorUpdateConfCP=An error occurred during the update, please try again.
-AddCPforUsers=Please add the balance of holidays of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
Module27130Name= Management of leave requests
Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
TitleOptionEventCP=Settings of leave requets for events
ValidEventCP=Validate
UpdateEventCP=Update events
diff --git a/htdocs/langs/sq_AL/interventions.lang b/htdocs/langs/sq_AL/interventions.lang
index 17641a0ab3e499b2f66a4b4ddd80c46d478ff702..c79da05364e615bb2b234ce4211a373fc94e9168 100644
--- a/htdocs/langs/sq_AL/interventions.lang
+++ b/htdocs/langs/sq_AL/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Intervention
Interventions=Interventions
InterventionCard=Intervention card
NewIntervention=New intervention
-AddIntervention=Add intervention
+AddIntervention=Create intervention
ListOfInterventions=List of interventions
EditIntervention=Edit intervention
ActionsOnFicheInter=Actions on intervention
@@ -30,6 +30,15 @@ StatusInterInvoiced=Billed
RelatedInterventions=Related interventions
ShowIntervention=Show intervention
SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention
TypeContact_fichinter_internal_INTERVENING=Intervening
diff --git a/htdocs/langs/sq_AL/mails.lang b/htdocs/langs/sq_AL/mails.lang
index 98e6dc335eeced95e230de5b5ca5b8f78fc59681..7a2111988228ab02739bad001958aa455eb9013c 100644
--- a/htdocs/langs/sq_AL/mails.lang
+++ b/htdocs/langs/sq_AL/mails.lang
@@ -115,7 +115,7 @@ SentBy=Sent by
MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=Clear list
ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
ToAddRecipientsChooseHere=Add recipients by choosing from the lists
@@ -133,6 +133,9 @@ Notifications=Notifications
NoNotificationsWillBeSent=No email notifications are planned for this event and company
ANotificationsWillBeSent=1 notification will be sent by email
SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification request
-ListOfActiveNotifications=List all active email notification requests
+AddNewNotification=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
ListOfNotificationsDone=List all email notifications sent
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang
index 01b94adb1fafe121ef20af6b741182946eab0a8e..c8d1df78ea1025350097aef108dfb96305da663f 100644
--- a/htdocs/langs/sq_AL/main.lang
+++ b/htdocs/langs/sq_AL/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr
ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'.
ErrorFailedToSaveFile=Error, failed to save file.
-ErrorOnlyPngJpgSupported=Error, only .png and .jpg image format file are supported.
-ErrorImageFormatNotSupported=Your PHP does not support functions to convert images of this format.
SetDate=Set date
SelectDate=Select a date
SeeAlso=See also %s
BackgroundColorByDefault=Default background color
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
NbOfEntries=Nb of entries
GoToWikiHelpPage=Read online help (need Internet access)
@@ -266,6 +266,7 @@ Afternoon=Afternoon
Quadri=Quadri
MonthOfDay=Month of the day
HourShort=H
+MinuteShort=mn
Rate=Rate
UseLocalTax=Include tax
Bytes=Bytes
@@ -340,6 +341,7 @@ FullList=Full list
Statistics=Statistics
OtherStatistics=Other statistics
Status=Status
+Favorite=Favorite
ShortInfo=Info.
Ref=Ref.
RefSupplier=Ref. supplier
@@ -365,6 +367,7 @@ ActionsOnCompany=Events about this third party
ActionsOnMember=Events about this member
NActions=%s events
NActionsLate=%s late
+RequestAlreadyDone=Request already recorded
Filter=Filter
RemoveFilter=Remove filter
ChartGenerated=Chart generated
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Extra attributes setup
URLPhoto=URL of photo/logo
SetLinkToThirdParty=Link to another third party
CreateDraft=Create draft
+SetToDraft=Back to draft
ClickToEdit=Click to edit
ObjectDeleted=Object %s deleted
ByCountry=By country
@@ -678,7 +682,7 @@ ViewPrivateNote=View notes
XMoreLines=%s line(s) hidden
PublicUrl=Public URL
AddBox=Add box
-
+SelectElementAndClickRefresh=Select an element and click Refresh
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/langs/sq_AL/margins.lang b/htdocs/langs/sq_AL/margins.lang
index 3fca6d7a6440d0e09acfc61f524ed9b7c3326a78..606d5e5053a25855631a7d6ee61b6c392c1fe32c 100644
--- a/htdocs/langs/sq_AL/margins.lang
+++ b/htdocs/langs/sq_AL/margins.lang
@@ -38,4 +38,7 @@ BuyingCost=Cost price
UnitCharges=Unit charges
Charges=Charges
AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/sq_AL/orders.lang b/htdocs/langs/sq_AL/orders.lang
index 3d53001215463a6647c838394ec11668d45c4bcf..6ee9c19fa95f45044b7466cc0fdcbf21819ef13a 100644
--- a/htdocs/langs/sq_AL/orders.lang
+++ b/htdocs/langs/sq_AL/orders.lang
@@ -53,7 +53,7 @@ ShippingExist=A shipment exists
DraftOrWaitingApproved=Draft or approved not yet ordered
DraftOrWaitingShipped=Draft or validated not yet shipped
MenuOrdersToBill=Orders delivered
-MenuOrdersToBill2=Orders to bill
+MenuOrdersToBill2=Billable orders
SearchOrder=Search order
SearchACustomerOrder=Search a customer order
ShipProduct=Ship product
@@ -65,7 +65,7 @@ ValidateOrder=Validate order
UnvalidateOrder=Unvalidate order
DeleteOrder=Delete order
CancelOrder=Cancel order
-AddOrder=Add order
+AddOrder=Create order
AddToMyOrders=Add to my orders
AddToOtherOrders=Add to other orders
AddToDraftOrders=Add to draft order
@@ -154,7 +154,6 @@ OrderByPhone=Phone
CreateInvoiceForThisCustomer=Bill orders
NoOrdersToInvoice=No orders billable
CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-MenuOrdersToBill2=Orders to bill
OrderCreation=Order creation
Ordered=Ordered
OrderCreated=Your orders have been created
diff --git a/htdocs/langs/sq_AL/oscommerce.lang b/htdocs/langs/sq_AL/oscommerce.lang
deleted file mode 100644
index 3ff9108ead4e2ba3a94229a24177998c14e624fc..0000000000000000000000000000000000000000
--- a/htdocs/langs/sq_AL/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=OS Commerce module setup
-OSCommerceSetupSaved=OS Commerce setup saved
-OSCommerceServer=OS Commerce server host/ip
-OSCommerceDatabaseName=OS Commerce database name
-OSCommercePrefix=OS Commerce tables prefix
-OSCommerceUser=OS Commerce database login
diff --git a/htdocs/langs/sq_AL/other.lang b/htdocs/langs/sq_AL/other.lang
index b56ef2944951b7c0d44d285b1e7a02ad6077a579..889918881838dcbc59b7a031b8af656cec175167 100644
--- a/htdocs/langs/sq_AL/other.lang
+++ b/htdocs/langs/sq_AL/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=Security code
Calendar=Calendar
-AddTrip=Add trip
Tools=Tools
ToolsDesc=This area is dedicated to group miscellaneous tools not available into other menu entries.<br><br>Those tools can be reached from menu on the side.
Birthday=Birthday
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation
Notify_TASK_CREATE=Task created
Notify_TASK_MODIFY=Task modified
Notify_TASK_DELETE=Task deleted
+SeeModuleSetup=See module setup
NbOfAttachedFiles=Number of attached files/documents
TotalSizeOfAttachedFiles=Total size of attached files/documents
MaxSize=Maximum size
@@ -80,6 +80,16 @@ ModifiedBy=Modified by %s
ValidatedBy=Validated by %s
CanceledBy=Canceled by %s
ClosedBy=Closed by %s
+CreatedById=User id who created
+ModifiedById=User id who made last change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made last change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
FileWasRemoved=File %s was removed
DirWasRemoved=Directory %s was removed
FeatureNotYetAvailableShort=Available in a next version
@@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your
##### Calendar common #####
AddCalendarEntry=Add entry in calendar %s
-NewCompanyToDolibarr=Company %s added into Dolibarr
-ContractValidatedInDolibarr=Contract %s validated in Dolibarr
-ContractCanceledInDolibarr=Contract %s canceled in Dolibarr
-ContractClosedInDolibarr=Contract %s closed in Dolibarr
-PropalClosedSignedInDolibarr=Proposal %s signed in Dolibarr
-PropalClosedRefusedInDolibarr=Proposal %s refused in Dolibarr
-PropalValidatedInDolibarr=Proposal %s validated in Dolibarr
-InvoiceValidatedInDolibarr=Invoice %s validated in Dolibarr
-InvoicePaidInDolibarr=Invoice %s changed to paid in Dolibarr
-InvoiceCanceledInDolibarr=Invoice %s canceled in Dolibarr
-PaymentDoneInDolibarr=Payment %s done in Dolibarr
-CustomerPaymentDoneInDolibarr=Customer payment %s done in Dolibarr
-SupplierPaymentDoneInDolibarr=Supplier payment %s done in Dolibarr
-MemberValidatedInDolibarr=Member %s validated in Dolibarr
-MemberResiliatedInDolibarr=Member %s resiliated in Dolibarr
-MemberDeletedInDolibarr=Member %s deleted from Dolibarr
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added in Dolibarr
-ShipmentValidatedInDolibarr=Shipment %s validated in Dolibarr
-ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
##### Export #####
Export=Export
ExportsArea=Exports area
diff --git a/htdocs/langs/sq_AL/paybox.lang b/htdocs/langs/sq_AL/paybox.lang
index f937768240c3bb7b70a1bdf3e499c60b71d16ab9..aced32a49440a9ff7a1b1e0279522ff49cec7821 100644
--- a/htdocs/langs/sq_AL/paybox.lang
+++ b/htdocs/langs/sq_AL/paybox.lang
@@ -35,3 +35,6 @@ MessageKO=Message on canceled payment return page
NewPayboxPaymentReceived=New Paybox payment received
NewPayboxPaymentFailed=New Paybox payment tried but failed
PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/sq_AL/resource.lang b/htdocs/langs/sq_AL/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..d64075dfbf595897a63e3eebf19194d8f71030dd
--- /dev/null
+++ b/htdocs/langs/sq_AL/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
diff --git a/htdocs/langs/sq_AL/sendings.lang b/htdocs/langs/sq_AL/sendings.lang
index 2ae43f3976607147c1e8fc3a41898f572cee9868..f6111bac6841189e50c3c7fb9028962b56e3997e 100644
--- a/htdocs/langs/sq_AL/sendings.lang
+++ b/htdocs/langs/sq_AL/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is do
RelatedShippings=Related shippings
ShipmentLine=Shipment line
CarrierList=List of transporters
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
# Sending methods
SendingMethodCATCH=Catch by customer
diff --git a/htdocs/langs/sq_AL/stocks.lang b/htdocs/langs/sq_AL/stocks.lang
index 5d11b0fd7a0992284856369a2d4b919e56a34453..06c502504e9f19219ba028be8d02fbb55e5f0697 100644
--- a/htdocs/langs/sq_AL/stocks.lang
+++ b/htdocs/langs/sq_AL/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Warehouse label is required
CorrectStock=Correct stock
ListOfWarehouses=List of warehouses
ListOfStockMovements=List of stock movements
-StocksArea=Stocks area
+StocksArea=Warehouses area
Location=Location
LocationSummary=Short name location
NumberOfDifferentProducts=Number of different products
diff --git a/htdocs/langs/sq_AL/users.lang b/htdocs/langs/sq_AL/users.lang
index 0afaab6ad7f7ca7de787d1bad2656917763a3f45..baf209f9d1c7ff7527f6f0237519cac6f683a9e3 100644
--- a/htdocs/langs/sq_AL/users.lang
+++ b/htdocs/langs/sq_AL/users.lang
@@ -63,7 +63,6 @@ ShowGroup=Show group
ShowUser=Show user
NonAffectedUsers=Non assigned users
UserModified=User modified successfully
-GroupModified=Group modified successfully
PhotoFile=Photo file
UserWithDolibarrAccess=User with Dolibarr access
ListOfUsersInGroup=List of users in this group
@@ -103,7 +102,7 @@ UserDisabled=User %s disabled
UserEnabled=User %s activated
UserDeleted=User %s removed
NewGroupCreated=Group %s created
-GroupModified=Group modified successfully
+GroupModified=Group %s modified
GroupDeleted=Group %s removed
ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact ?
ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member ?
@@ -114,8 +113,10 @@ YourRole=Your roles
YourQuotaOfUsersIsReached=Your quota of active users is reached !
NbOfUsers=Nb of users
DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
-HierarchicalResponsible=Hierarchical responsible
+HierarchicalResponsible=Supervisor
HierarchicView=Hierarchical view
UseTypeFieldToChange=Use field Type to change
OpenIDURL=OpenID URL
LoginUsingOpenID=Use OpenID to login
+WeeklyHours=Weekly hours
+ColorUser=Color of the user
diff --git a/htdocs/langs/sq_AL/withdrawals.lang b/htdocs/langs/sq_AL/withdrawals.lang
index 58ac3e252ec59d67ff8d71c394b4c44265bc3add..e433730908416bbfa32c181a580b9e2e7e34717c 100644
--- a/htdocs/langs/sq_AL/withdrawals.lang
+++ b/htdocs/langs/sq_AL/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=Receipt
LastWithdrawalReceipts=Last %s withdrawal receipts
WithdrawedBills=Withdrawn invoices
WithdrawalsLines=Withdrawal lines
-RequestStandingOrderToTreat=Request for standing orders to treat
-RequestStandingOrderTreated=Request for standing orders treated
+RequestStandingOrderToTreat=Request for standing orders to process
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=Customer standing orders
CustomerStandingOrder=Customer standing order
NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
@@ -40,14 +41,13 @@ TransMetod=Transmission method
Send=Send
Lines=Lines
StandingOrderReject=Issue a rejection
-InvoiceRefused=Invoice refused
WithdrawalRefused=Withdrawal refused
WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society
RefusedData=Date of rejection
RefusedReason=Reason for rejection
RefusedInvoicing=Billing the rejection
NoInvoiceRefused=Do not charge the rejection
-InvoiceRefused=Invoice refused
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=Status
StatusUnknown=Unknown
StatusWaiting=Waiting
@@ -76,7 +76,7 @@ WithBankUsingRIB=For bank accounts using RIB
WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
BankToReceiveWithdraw=Bank account to receive withdraws
CreditDate=Credit on
-WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
ShowWithdraw=Show Withdraw
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang
index 83602dd0bab7acf9263a125dc11a3fe5f52e3818..7d53386ea9d9b9a31df3d946aa86698e7f53b203 100644
--- a/htdocs/langs/sv_SE/accountancy.lang
+++ b/htdocs/langs/sv_SE/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=Välj en kontoplan
Validate=Validera
Addanaccount=Lägg till ett redovisningskonto
AccountAccounting=Redovisningskonto
-Ventilation=Ventilation
+Ventilation=Breakdown
ToDispatch=Avsändandet
Dispatched=Levereras
-CustomersVentilation=Ventilationskunder
-SuppliersVentilation=Ventilations leverantörer
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
TradeMargin=Handelsmarginal
Reports=Rapporter
ByCustomerInvoice=Enligt faktura kunder
@@ -45,9 +45,9 @@ WriteBookKeeping=Record konton i huvudboken
Bookkeeping=Huvudbok
AccountBalanceByMonth=Saldo per månad
-AccountingVentilation=Redovisning ventilation
-AccountingVentilationSupplier=Redovisning ventilations leverantör
-AccountingVentilationCustomer=Redovisning ventilations kund
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
Line=Linje
CAHTF=Totala köpesleverantörs HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilerade linjer faktura
IntoAccount=I bokföringskonto
Ventilate=Ventilera
-VentilationAuto=Automatisk ventilation
+VentilationAuto=Automatic breakdown
Processing=Bearbetning
EndProcessing=I slutet av behandlingen
@@ -68,9 +68,9 @@ NotVentilatedinAccount=Inte ventilerad i redovisningskonto
ACCOUNTING_SEPARATORCSV=Separator CSV
-ACCOUNTING_LIMIT_LIST_VENTILATION=Antal element som skall ventil visas av sidan (max rekommenderad: 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Börja sorteringen av sidorna i ventilations "Måste ventilera" av de senaste delarna
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Börja sorteringen av sidorna i ventilation "Ventilerade" av de senaste delarna
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
AccountLength=Längd på redovisningen redovisning i Dolibarr
AccountLengthDesc=Funktion som gör det möjligt att låtsas en längd av bokföringskonto genom att ersätta mellanslag med noll siffra. Den här funktionen berör endast displayen, det ändrar inte redovisningskonton registrerade i Dolibarr. För export, är nödvändigt denna funktion för att vara kompatibel med viss programvara.
@@ -140,14 +140,14 @@ Active=Uttalande
NewFiscalYear=Nytt räkenskapsår
-DescVentilCustomer=Rådgör här den årliga redovisningen ventilation av dina fakturor kunder
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
TotalVente=Total omsättning HT
TotalMarge=Total försäljning marginal
DescVentilDoneCustomer=Konsul här listan med linjerna av fakturor kunder och deras bokföringskonto
DescVentilTodoCustomer=Ventilera dina rader av kundfaktura med en redovisningskonto
ChangeAccount=Ändra bokföringskonto för linjer som valts ut av kontot:
Vide=-
-DescVentilSupplier=Rådgör här den årliga redovisningen ventilation av dina fakturor leverantörer
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
DescVentilTodoSupplier=Ventilera dina rader av leverantörsfaktura med en redovisningskonto
DescVentilDoneSupplier=Konsul här listan med linjerna av fakturor leverantör och deras bokföringskonto
@@ -155,4 +155,4 @@ ValidateHistory=Validera Automatiskt
ErrorAccountancyCodeIsAlreadyUse=Fel, du kan inte ta bort denna redovisningskonto eftersom den används
-FicheVentilation=Ventilation kort
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index b67c53cc77eb6889dae550e6b2b3039c1b1eaa72..3043c9406a5dbf3f77e1d7d5da28f51a54c825e5 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - admin
Foundation=Stiftelse
Version=Version
-VersionProgram=Version program
+VersionProgram=Programversion
VersionLastInstall=Version ursprungliga installationen
VersionLastUpgrade=Version senaste uppgraderingen
VersionExperimental=Experimentell
@@ -437,8 +437,8 @@ Module52Name=Lager
Module52Desc=Lager hantering av produkter
Module53Name=Tjänster
Module53Desc=Service ledning
-Module54Name=Kontrakt
-Module54Desc=Kontraktets och service ledning
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=Streckkoder
Module55Desc=Barcode ledning
Module56Name=Telefoni
@@ -475,8 +475,8 @@ Module320Name=RSS-flöde
Module320Desc=Lägg till RSS feed inne Dolibarr skärm sidor
Module330Name=Bokmärken
Module330Desc=Bokmärk ledning
-Module400Name=Projekt
-Module400Desc=Projektets ledning innanför andra moduler
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=WebCalendar
Module410Desc=WebCalendar integration
Module500Name=Speciella utgifter (skatt, sociala avgifter, utdelningar)
@@ -606,11 +606,11 @@ Permission151=Läs stående order
Permission152=Skapa / ändra en stående order begäran
Permission153=Läs stående order kvitton
Permission154=Kredit / vägrar stående order kvitton
-Permission161=Läs kontrakt
-Permission162=Skapa / ändra avtal
-Permission163=Aktivera en tjänst av ett kontrakt
-Permission164=Inaktivera en tjänst av ett kontrakt
-Permission165=Radera kontrakt
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
Permission171=Läs resor och utgifter (eget och hans underordnade)
Permission172=Skapa / ändra resor och kostnader
Permission173=Ta bort resor och kostnader
@@ -672,7 +672,7 @@ Permission300=Läs streckkoder
Permission301=Skapa / modifiera streckkoder
Permission302=Ta bort streckkoder
Permission311=Läs tjänster
-Permission312=Tilldela tjänster att ingå avtal
+Permission312=Assign service/subscription to contract
Permission331=Läs bokmärken
Permission332=Skapa / ändra bokmärken
Permission333=Ta bort bokmärken
@@ -702,8 +702,8 @@ Permission701=Läs donationer
Permission702=Skapa / ändra donationer
Permission703=Ta bort donationer
Permission1001=Läs lager
-Permission1002=Skapa / ändra lager
-Permission1003=Ta bort lager
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=Läs lager rörelser
Permission1005=Skapa / ändra lager rörelser
Permission1101=Läs leveransorder
@@ -1039,7 +1039,6 @@ YesInSummer=Ja, under sommaren
OnlyFollowingModulesAreOpenedToExternalUsers=Obs, endast följande moduler öppnas för externa användare (oavsett är tillstånd från sådana användare):
SuhosinSessionEncrypt=Session lagring krypteras av Suhosin
ConditionIsCurrently=Condition är för närvarande% s
-TestNotPossibleWithCurrentBrowsers=Automatisk identifiering inte är möjlig
YouUseBestDriver=Du använder drivrutinen %s som är bäst drivrutin tillgänglig för tillfället.
YouDoNotUseBestDriver=Du använder enhet %s men förar %s rekommenderas.
NbOfProductIsLowerThanNoPb=Du har bara %s produkter / tjänster i databasen. Detta innebär inte behövs någon särskild optimering.
@@ -1139,6 +1138,7 @@ AddDeliveryAddressAbility=Lägg förmåga leveranstid
UseOptionLineIfNoQuantity=En rad av produkt / tjänst med en nolla belopp anses som ett alternativ
FreeLegalTextOnProposal=Fri text på affärsförslag
WatermarkOnDraftProposal=Vattenstämpel på utkast till affärsförslag (ingen om tom)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=Beställ ledning setup
OrdersNumberingModules=Beställningar numrering moduler
@@ -1160,7 +1160,7 @@ FicheinterNumberingModules=Intervention numrering moduler
TemplatePDFInterventions=Intervention kort dokument modeller
WatermarkOnDraftInterventionCards=Vattenstämpel på åtgärdskort dokument (ingen om tom)
##### Contracts #####
-ContractsSetup=Kontrakt modul konfiguration
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=Kontrakt numrering moduler
TemplatePDFContracts=Contract documents modeller
FreeLegalTextOnContracts=Fritext om avtal
@@ -1324,7 +1324,7 @@ FilesOfTypeNotCompressed=Filer av typen %s är inte komprimerade av HTTP-server
CacheByServer=Cache med server
CacheByClient=Cache med browser
CompressionOfResources=Komprimering av HTTP-svar
-TestNotPossibleWithCurrentBrowsers=Automatisk identifiering inte är möjlig
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=Produkter modul setup
ServiceSetup=Tjänster modul konfiguration
@@ -1415,8 +1415,9 @@ OSCommerceTestOk=Anslutning till servern "%s" på databas %s "med
OSCommerceTestKo1=Anslutning till servern "%s" lyckas, men databas %s "kunde inte nås.
OSCommerceTestKo2=Anslutning till servern "%s" med användare "%s" misslyckades.
##### Stock #####
-StockSetup=Inställningsmodul lager
-UserWarehouse=Använd användarens personliga lager
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=Meny utgår
TreeMenu=Tree menyer
@@ -1481,11 +1482,14 @@ ClickToDialDesc=Denna modul gör det möjligt att lägga till en ikon efter tele
##### Point Of Sales (CashDesk) #####
CashDesk=Point of sales
CashDeskSetup=Point of sales modul setup
-CashDeskThirdPartyForSell=Generic tredje part att använda för säljer
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Konto som ska användas för att ta emot kontant betalning
CashDeskBankAccountForCheque= Konto som ska användas för att ta emot betalningar med check
CashDeskBankAccountForCB= Konto som ska användas för att ta emot kontant betalning med kreditkort
-CashDeskIdWareHouse=Lager som ska användas för säljer
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Bokmärk modul setup
BookmarkDesc=Den här modulen kan du hantera bokmärken. Du kan också lägga genvägar till alla Dolibarr sidor eller externale webbplatser på din vänstra menyn.
@@ -1539,6 +1543,13 @@ ConfirmDeleteFiscalYear=Är du säker på att du vill ta bort detta verksamhets
Opened=Öppnad
Closed=Stängt
AlwaysEditable=Kan alltid redigeras
-
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
Format=Format
TypePaymentDesc=0: Kundbetalning typ, 1: Leverantörsbetalnings typ, 2: Både kunder och leverantörer betalnings typ
diff --git a/htdocs/langs/sv_SE/agenda.lang b/htdocs/langs/sv_SE/agenda.lang
index 0051929cd9d47b5d12284b065fa79878abd2638b..d05899c511964b946114f0e8de76438f274adb23 100644
--- a/htdocs/langs/sv_SE/agenda.lang
+++ b/htdocs/langs/sv_SE/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= Automatisk fyllning av dagordning
AgendaAutoActionDesc= Här definierar du händelser som du vill Dolibarr att automatiskt skapa en talan i dagordningen. Om ingenting är markerad (som standard), kommer endast manuella, skall ingå i dagordningen.
AgendaSetupOtherDesc= Denna sida tillåter dig att ändra andra parametrar i dagordningen modul.
AgendaExtSitesDesc=Den här sidan gör det möjligt att deklarera externa kalendrar för att se sina evenemang i Dolibarr agenda.
-ActionsEvents= Händelser som Dolibarr kommer att skapa en talan i agenda automatiskt
-PropalValidatedInDolibarr= Förslag %s validerade
-InvoiceValidatedInDolibarr= Faktura %s validerade
+ActionsEvents=Händelser som Dolibarr kommer att skapa en talan i agenda automatiskt
+PropalValidatedInDolibarr=Förslag %s validerade
+InvoiceValidatedInDolibarr=Faktura %s validerade
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=Faktura %s gå tillbaka till förslaget status
InvoiceDeleteDolibarr=Faktura %s raderas
OrderValidatedInDolibarr= Beställ %s validerade
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Ordningens %s godkänd
OrderRefusedInDolibarr=Order %s vägrade
OrderBackToDraftInDolibarr=Beställ %s gå tillbaka till förslaget status
OrderCanceledInDolibarr=Beställ %s avbryts
-InterventionValidatedInDolibarr=Intervention %s validerade
ProposalSentByEMail=Kommersiella förslag %s via e-post
OrderSentByEMail=Kundorderprojekt %s via e-post
InvoiceSentByEMail=Kundfaktura %s via e-post
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=Leverantör beställa %s via e-post
SupplierInvoiceSentByEMail=Leverantörsfaktura %s via e-post
ShippingSentByEMail=Frakt %s via e-post
ShippingValidated= Frakt %s validerade
-InterventionSentByEMail=Intervention %s via e-post
-InterventionClassifiedBilled=Intervention %s sekretessbelagda som fakturerad
NewCompanyToDolibarr= Tredje part har skapats
DateActionPlannedStart= Planerat startdatum
DateActionPlannedEnd= Planerat slutdatum
diff --git a/htdocs/langs/sv_SE/bills.lang b/htdocs/langs/sv_SE/bills.lang
index b90a2d0faa20f20320a125e93cbf9aeaacdfa2d9..af80a05d97f4ba7f83afd738e2d00175108f21c8 100644
--- a/htdocs/langs/sv_SE/bills.lang
+++ b/htdocs/langs/sv_SE/bills.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - bills
Bill=Faktura
Bills=Fakturor
-BillsCustomers=Kundens fakturor
+BillsCustomers=Kundfakturor
BillsCustomer=Kundens faktura
BillsSuppliers=Leverantörens fakturor
BillsCustomersUnpaid=Obetalda kundens fakturor
@@ -137,8 +137,6 @@ BillFrom=Från
BillTo=Bill till
ActionsOnBill=Åtgärder mot faktura
NewBill=Ny faktura
-Prélèvements=Stående order
-Prélèvements=Stående order
LastBills=Senaste %s fakturor
LastCustomersBills=Senaste %s kunder fakturor
LastSuppliersBills=Senaste %s leverantörer fakturor
@@ -219,8 +217,7 @@ NoInvoice=Ingen faktura
ClassifyBill=Klassificera faktura
SupplierBillsToPay=Leverantörer fakturor att betala
CustomerBillsUnpaid=Obetalda kunder fakturor
-DispenseMontantLettres=Det lagförslag som utarbetats av mekanisk undantas från beslutet i skrivelser
-DispenseMontantLettres=Det lagförslag som utarbetats av mekanisk undantas från beslutet i skrivelser
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=Icke återvinningsbara
SetConditions=Ställ betalningsvillkor
SetMode=Ställ betalningssätt
diff --git a/htdocs/langs/sv_SE/categories.lang b/htdocs/langs/sv_SE/categories.lang
index 42ef6bd5d47c15726740a4cb843bcf5c5a830399..527dcf7d7a4863935dcabeac55806a5df2f15a40 100644
--- a/htdocs/langs/sv_SE/categories.lang
+++ b/htdocs/langs/sv_SE/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Länkar mellan leverantörer och kategorier
CatCusLinks=Länkar mellan kunder / möjliga kunder och kategorier
CatProdLinks=Länkar mellan produkter / tjänster och kategorier
CatMemberLinks=Länkar mellan medlemmar och kategorier
-CatProdLinks=Länkar mellan produkter / tjänster och kategorier
-CatCusLinks=Länkar mellan kunder / möjliga kunder och kategorier
-CatSupLinks=Länkar mellan leverantörer och kategorier
DeleteFromCat=Ta bort från kategori
DeletePicture=Ta bort bild
ConfirmDeletePicture=Bekräfta ta bort bild?
@@ -112,3 +109,4 @@ CategoriesSetup=Kategorier, inställningar
CategorieRecursiv=Länka automatiskt med förälderkategori
CategorieRecursivHelp=Om aktiverad kommer produkten även länkas till förälderkategori när den läggs i en underkategori
AddProductServiceIntoCategory=Lägg till följande produkt / tjänst
+ShowCategory=Show category
diff --git a/htdocs/langs/sv_SE/compta.lang b/htdocs/langs/sv_SE/compta.lang
index 7f4af42e889fd00ff9c1a4136ad6946a13ce18e2..681b9e10d30b78b6a63e4dad9d9d9004bc5c901a 100644
--- a/htdocs/langs/sv_SE/compta.lang
+++ b/htdocs/langs/sv_SE/compta.lang
@@ -1,6 +1,6 @@
# Dolibarr language file - Source file is en_US - compta
Accountancy=Bokföring
-AccountancyCard=Bokföring kort
+AccountancyCard=Bokföringskort
Treasury=Treasury
MenuFinancial=Finansiella
TaxModuleSetupToModifyRules=Go to <a href="%s">Taxes module setup</a> to modify rules for calculation
@@ -100,14 +100,15 @@ AccountNumberShort=Kontonummer
AccountNumber=Kontonummer
NewAccount=Nytt konto
SalesTurnover=Omsättningen
-SalesTurnoverMinimum=Minimum sales turnover
-ByThirdParties=Bu tredje part
+SalesTurnoverMinimum=Minsta omsättning
+ByThirdParties=Av tredje part
ByUserAuthorOfInvoice=Mot faktura författare
AccountancyExport=Bokföring export
ErrorWrongAccountancyCodeForCompany=Bad kund bokföring kod för %s
SuppliersProductsSellSalesTurnover=Den omsättning som försäljningen av leverantörens produkter.
CheckReceipt=Kontrollera insättning
CheckReceiptShort=Kontrollera insättning
+LastCheckReceiptShort=Last %s check receipts
NewCheckReceipt=Ny rabatt
NewCheckDeposit=Nya kontrollera insättning
NewCheckDepositOn=Skapa kvitto för insättning på konto: %s
diff --git a/htdocs/langs/sv_SE/contracts.lang b/htdocs/langs/sv_SE/contracts.lang
index 9329c9a9701d6c9e7a01fc6a0721c9797ca01976..f011f836ba8ed4297b13297145c9f032c57dbe93 100644
--- a/htdocs/langs/sv_SE/contracts.lang
+++ b/htdocs/langs/sv_SE/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Kontrakt område
ListOfContracts=Förteckning över avtal
-LastContracts=Senast %s ändrat avtal
+LastModifiedContracts=Last %s modified contracts
AllContracts=Alla kontrakt
ContractCard=Kontrakt kort
ContractStatus=Kontrakt status
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Förteckning över löpande kontrakt linjer
ListOfRunningServices=Förteckning över löpande tjänster
NotActivatedServices=Inaktiva tjänster (bland validerade kontrakt)
BoardNotActivatedServices=Tjänster att aktivera bland validerade kontrakt
-LastContracts=Senast %s ändrat avtal
+LastContracts=Last % contracts
LastActivatedServices=Senaste %s aktiverade tjänster
LastModifiedServices=Senast %s uppdaterade tjänster
EditServiceLine=Redigera servicelinjen
diff --git a/htdocs/langs/sv_SE/cron.lang b/htdocs/langs/sv_SE/cron.lang
index 0857c69559756cdb4efbe506c82e91ae688ef75e..75eaafb3990026a10f7bf7b5970d9ee343bf27b0 100644
--- a/htdocs/langs/sv_SE/cron.lang
+++ b/htdocs/langs/sv_SE/cron.lang
@@ -18,9 +18,8 @@ CronExplainHowToRunUnix=På Unix-miljö bör du använda crontab för att köra
CronExplainHowToRunWin=På Microsoft (tm) Windows environement kan du använda schemalagd aktivitet verktyg för att köra kommandoraden varje minuter
# Menu
CronJobs=Schemalagda jobb
-CronListActive= Lista över aktiva jobb
-CronListInactive= Lista över handikappade jobb
-CronListActive= Lista över aktiva jobb
+CronListActive=List of active/scheduled jobs
+CronListInactive=Lista över handikappade jobb
# Page list
CronDateLastRun=Senaste körning
CronLastOutput=Sista loppet utgång
diff --git a/htdocs/langs/sv_SE/donations.lang b/htdocs/langs/sv_SE/donations.lang
index de829e62d03a3d0f6f01990c47ef8397f671a762..2e0f351d082745deeda9b407523835d14028a7c8 100644
--- a/htdocs/langs/sv_SE/donations.lang
+++ b/htdocs/langs/sv_SE/donations.lang
@@ -31,3 +31,8 @@ DonationRecipient=Donation mottagaren
ThankYou=Tack
IConfirmDonationReception=Mottagaren förklarar mottagning, som en donation, av följande belopp
MinimumAmount=Minsta belopp är% s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/sv_SE/ecm.lang b/htdocs/langs/sv_SE/ecm.lang
index 7010cddbf8da63104cf838bda150811782c2053e..0fd6be84a25a0441c4c93d858086d04253a19f20 100644
--- a/htdocs/langs/sv_SE/ecm.lang
+++ b/htdocs/langs/sv_SE/ecm.lang
@@ -1,11 +1,11 @@
# Dolibarr language file - Source file is en_US - ecm
MenuECM=Dokument
DocsMine=Mina dokument
-DocsGenerated=Skapad dokument
+DocsGenerated=Skapade dokument
DocsElements=Elements dokument
-DocsThirdParties=Handlingar tredje part
-DocsContracts=Dokument kontrakt
-DocsProposals=Dokument förslag
+DocsThirdParties=Tredjepartshandlingar
+DocsContracts=Kontraktsdokument
+DocsProposals=Förslagsdokument
DocsOrders=Dokument order
DocsInvoices=Dokument fakturor
ECMNbOfDocs=Nb av dokument i katalogen
diff --git a/htdocs/langs/sv_SE/exports.lang b/htdocs/langs/sv_SE/exports.lang
index 2d3c1384542b6d59e4e915f8f69acac262cfdc31..e511fc6c590c6800fa275289392553f7ecb7f491 100644
--- a/htdocs/langs/sv_SE/exports.lang
+++ b/htdocs/langs/sv_SE/exports.lang
@@ -115,10 +115,10 @@ Excel95FormatDesc=<b>Excel</b> file format (.xls)<br>This is native Excel 95 for
Excel2007FormatDesc=<b>Excel</b> file format (.xlsx)<br>This is native Excel 2007 format (SpreadsheetML).
TsvFormatDesc=<b>Tab Separated Value</b> file format (.tsv)<br>This is a text file format where fields are separated by a tabulator [tab].
ExportFieldAutomaticallyAdded=Field <b>%s</b> was automatically added. It will avoid you to have similar lines to be treated as duplicate records (with this field added, all lines will own their own id and will differ).
-CsvOptions=Csv Options
-Separator=Separator
+CsvOptions=Csv alternativ
+Separator=Avdelare
Enclosure=Enclosure
-SuppliersProducts=Suppliers Products
+SuppliersProducts=Levedrantörsprodukter
BankCode=Bankkod
DeskCode=Reception kod
BankAccountNumber=Kontonummer
diff --git a/htdocs/langs/sv_SE/externalsite.lang b/htdocs/langs/sv_SE/externalsite.lang
index 9c74706c846789eef2f4b51e62b804034896ed8f..c912ae72dd013073badffc2668915ace22c397f6 100644
--- a/htdocs/langs/sv_SE/externalsite.lang
+++ b/htdocs/langs/sv_SE/externalsite.lang
@@ -2,3 +2,4 @@
ExternalSiteSetup=Setup länk till extern webbplats
ExternalSiteURL=Extern webbplats URL
ExternalSiteModuleNotComplete=Modul ExternalSite var inte korrekt konfigurerad.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/sv_SE/holiday.lang b/htdocs/langs/sv_SE/holiday.lang
index b28cbbb5fbbd8b30eb8d0aee9d42c0eb649b5937..2c04b219b9573cc31422fe9beb4842a34302d6ad 100644
--- a/htdocs/langs/sv_SE/holiday.lang
+++ b/htdocs/langs/sv_SE/holiday.lang
@@ -48,7 +48,6 @@ ConfirmDeleteCP=Bekräfta raderingen av denna ledighet förfrågan?
ErrorCantDeleteCP=Fel att du inte har rätt att ta bort denna ledighet begäran.
CantCreateCP=Du har inte rätt att göra ledighet förfrågningar.
InvalidValidatorCP=Du måste välja en approbator till din ledighet förfrågan.
-UpdateButtonCP=Uppdatera
CantUpdate=Du kan inte uppdatera denna ledighet begäran.
NoDateDebut=Du måste välja ett startdatum.
NoDateFin=Du måste välja ett slutdatum.
diff --git a/htdocs/langs/sv_SE/interventions.lang b/htdocs/langs/sv_SE/interventions.lang
index d99110f8bfb0c9bdb9d7cf004d925620a1f7f255..b97e7592c6a1d43ffab3863c8924421f2a631a5f 100644
--- a/htdocs/langs/sv_SE/interventions.lang
+++ b/htdocs/langs/sv_SE/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Intervention
Interventions=Insatser
InterventionCard=Intervention kort
NewIntervention=Nya insatser
-AddIntervention=Lägg till intervention
+AddIntervention=Create intervention
ListOfInterventions=Förteckning över åtgärder
EditIntervention=Redigera ingripande
ActionsOnFicheInter=Åtgärder för ingripande
@@ -30,6 +30,15 @@ StatusInterInvoiced=Fakturerade
RelatedInterventions=Insatserna
ShowIntervention=Visar ingripande
SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Representanten uppföljning ingripande
TypeContact_fichinter_internal_INTERVENING=Ingripa
diff --git a/htdocs/langs/sv_SE/mails.lang b/htdocs/langs/sv_SE/mails.lang
index 7e607f657424e1922eb14857261fb043a2863774..5837916e0aa3a75008244bd6e17002b317fe184a 100644
--- a/htdocs/langs/sv_SE/mails.lang
+++ b/htdocs/langs/sv_SE/mails.lang
@@ -115,7 +115,7 @@ SentBy=Skickat av
MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
MailingNeedCommand2=Du kan dock skicka dem online genom att lägga till parametern MAILING_LIMIT_SENDBYWEB med värde av maximalt antal e-postmeddelanden du vill skicka genom sessionen. För detta, gå hem - Setup - Annat.
ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=Rensa lista
ToClearAllRecipientsClickHere=Klicka här för att rensa listor över mottagare av detta e-post
ToAddRecipientsChooseHere=Lägg till mottagare genom att välja från listorna
@@ -133,6 +133,9 @@ Notifications=Anmälningar
NoNotificationsWillBeSent=Inga e-postmeddelanden planeras för detta evenemang och företag
ANotificationsWillBeSent=En anmälan kommer att skickas via e-post
SomeNotificationsWillBeSent=%s anmälningar kommer att skickas via e-post
-AddNewNotification=Aktivera en ny e-post meddelande begära
-ListOfActiveNotifications=Lista alla aktiva e ansökningsmeddelanden
+AddNewNotification=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
ListOfNotificationsDone=Lista alla e-postmeddelanden skickas
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
index 968cc1fc3d869ca200bc66dd03b6e87cad1d3e6e..a14984c379e2e327cff984a92899912faf7c9117 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -38,7 +38,7 @@ ErrorUnknown=Okänt fel
ErrorSQL=SQL-fel
ErrorLogoFileNotFound=Logo fil '%s' hittades inte
ErrorGoToGlobalSetup=Gå till 'bolaget / stiftelsen' setup för att åtgärda detta
-ErrorGoToModuleSetup=Gå till modul setup att åtgärda detta
+ErrorGoToModuleSetup=Gå till modul inställningarna för att åtgärda detta
ErrorFailedToSendMail=Det gick inte att skicka e-post (avsändare = %s, mottagare = %s)
ErrorAttachedFilesDisabled=Bifoga fil har inaktiverats på denna server
ErrorFileNotUploaded=Filen har inte laddats upp. Kontrollera att storleken inte överskrider högsta tillåtna, att det finns plats på disken och att det inte redan finns en fil med samma namn i den här katalogen.
@@ -77,7 +77,7 @@ IsNotDefined=odefinierad
DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr autentiseringsläge är inställd för att <b>%s</b> i konfigurationsfilen <b>conf.php.</b> <br> Det innebär att lösenords databasen är extern till Dolibarr, så förändringar av detta fält kan vara utan effekt.
Administrator=Administratör
Undefined=Odefinierad
-PasswordForgotten=Har du glömt lösenordet?
+PasswordForgotten=Glömt lösenordet?
SeeAbove=Se ovan
HomeArea=Hem område
LastConnexion=Senaste anslutningen
@@ -367,6 +367,7 @@ ActionsOnCompany=Åtgärder om denna tredje part
ActionsOnMember=Händelser om denna medlem
NActions=%s åtgärder
NActionsLate=%s sent
+RequestAlreadyDone=Request already recorded
Filter=Filter
RemoveFilter=Ta bort filtret
ChartGenerated=Diagram genererat
diff --git a/htdocs/langs/sv_SE/margins.lang b/htdocs/langs/sv_SE/margins.lang
index a5639a012acedf24cd6e4d0db7bbf866b6987a87..2579ca249f1a351edf5cc21f253a059c1b431abe 100644
--- a/htdocs/langs/sv_SE/margins.lang
+++ b/htdocs/langs/sv_SE/margins.lang
@@ -38,4 +38,7 @@ BuyingCost=Kostnadspris
UnitCharges=Unit charges
Charges=Charges
AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/sv_SE/orders.lang b/htdocs/langs/sv_SE/orders.lang
index 892578e5a6c3acff7adaccbdfc6ce70722c34af0..43df2e39b0b1dd2e9a97957ac146621272176d47 100644
--- a/htdocs/langs/sv_SE/orders.lang
+++ b/htdocs/langs/sv_SE/orders.lang
@@ -53,7 +53,7 @@ ShippingExist=En sändning föreligger
DraftOrWaitingApproved=Förslag eller godkänts ännu ej beställas
DraftOrWaitingShipped=Förslag eller godkännas ännu inte sändas
MenuOrdersToBill=Order till faktura
-MenuOrdersToBill2=Order till faktura
+MenuOrdersToBill2=Billable orders
SearchOrder=Sök ordning
SearchACustomerOrder=Sök en kundorder
ShipProduct=Ship produkt
@@ -154,7 +154,6 @@ OrderByPhone=Telefonen
CreateInvoiceForThisCustomer=Faktura order
NoOrdersToInvoice=Inga order fakturerbar
CloseProcessedOrdersAutomatically=Klassificera "bearbetade" alla valda order.
-MenuOrdersToBill2=Order till faktura
OrderCreation=Order skapning
Ordered=Beställt
OrderCreated=Din order har skapats
diff --git a/htdocs/langs/sv_SE/oscommerce.lang b/htdocs/langs/sv_SE/oscommerce.lang
deleted file mode 100644
index 1e2ef91e7f224e40bfe25fb072541fd859e2a0cb..0000000000000000000000000000000000000000
--- a/htdocs/langs/sv_SE/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=OS Commerce modul setup
-OSCommerceSetupSaved=OS Commerce setup sparas
-OSCommerceServer=OS Commerce Server värd / ip
-OSCommerceDatabaseName=OS Commerce databasnamn
-OSCommercePrefix=OS Commerce tabeller prefix
-OSCommerceUser=OS Commerce databas login
diff --git a/htdocs/langs/sv_SE/other.lang b/htdocs/langs/sv_SE/other.lang
index 5b39504e9352f4233a0eec8a6699809f4687ddc8..ab030a8c9acd5a03fdc2c47869af271c0ae749f7 100644
--- a/htdocs/langs/sv_SE/other.lang
+++ b/htdocs/langs/sv_SE/other.lang
@@ -203,25 +203,26 @@ ForgetIfNothing=Om du inte har begärt denna förändring, bara glömma detta ma
##### Calendar common #####
AddCalendarEntry=Lägg till post i kalendern %s
-NewCompanyToDolibarr=Företag %s la till Dolibarr
-ContractValidatedInDolibarr=Kontrakt %s validerats i Dolibarr
-ContractCanceledInDolibarr=Kontrakt %s annulleras i Dolibarr
-ContractClosedInDolibarr=Kontrakt %s stängdes Dolibarr
-PropalClosedSignedInDolibarr=Förslag %s undertecknades i Dolibarr
-PropalClosedRefusedInDolibarr=Förslag %s avslås Dolibarr
-PropalValidatedInDolibarr=Förslag %s validerats i Dolibarr
-InvoiceValidatedInDolibarr=Faktura %s validerats i Dolibarr
-InvoicePaidInDolibarr=Faktura %s ändras till betalas i Dolibarr
-InvoiceCanceledInDolibarr=Faktura %s annulleras i Dolibarr
-PaymentDoneInDolibarr=Betalning %s gjort i Dolibarr
-CustomerPaymentDoneInDolibarr=Kundbetalning %s gjort i Dolibarr
-SupplierPaymentDoneInDolibarr=Leverantör betalning %s gjort i Dolibarr
-MemberValidatedInDolibarr=Medlem %s validerats i Dolibarr
-MemberResiliatedInDolibarr=Medlem %s resiliated i Dolibarr
-MemberDeletedInDolibarr=Medlem %s bort från Dolibarr
-MemberSubscriptionAddedInDolibarr=Teckning av medlem %s till i Dolibarr
-ShipmentValidatedInDolibarr=Transport %s validerats i Dolibarr
-ShipmentDeletedInDolibarr=Leverans %s har raderats från Dolibarr
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
##### Export #####
Export=Exportera
ExportsArea=Export område
diff --git a/htdocs/langs/sv_SE/paybox.lang b/htdocs/langs/sv_SE/paybox.lang
index 8677724f600c2e1d75b393b9bcbad86e810eabce..af4eacf98285de08681872153635be3d7e5dfbca 100644
--- a/htdocs/langs/sv_SE/paybox.lang
+++ b/htdocs/langs/sv_SE/paybox.lang
@@ -32,6 +32,9 @@ VendorName=Namn på leverantör
CSSUrlForPaymentForm=CSS-formatmall URL för inbetalningskort
MessageOK=Meddelande på validerade betalning återvänder sida
MessageKO=Meddelande om avbokning betalning återvänder sida
-# NewPayboxPaymentReceived=New Paybox payment received
-# NewPayboxPaymentFailed=New Paybox payment tried but failed
-# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+NewPayboxPaymentReceived=New Paybox payment received
+NewPayboxPaymentFailed=New Paybox payment tried but failed
+PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/sv_SE/resource.lang b/htdocs/langs/sv_SE/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..d64075dfbf595897a63e3eebf19194d8f71030dd
--- /dev/null
+++ b/htdocs/langs/sv_SE/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
diff --git a/htdocs/langs/sv_SE/sendings.lang b/htdocs/langs/sv_SE/sendings.lang
index fdb12324479f2b0d65b978c5353a8c0b321f609d..79bd2f814a7c9875fe44664743b2a55fc2692ee8 100644
--- a/htdocs/langs/sv_SE/sendings.lang
+++ b/htdocs/langs/sv_SE/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=För närvarande är skapandet av en ny leverans
RelatedShippings=Relaterade sändningar
ShipmentLine=Transport linje
CarrierList=Lista över transportörer
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
# Sending methods
SendingMethodCATCH=Fångst av kunden
diff --git a/htdocs/langs/sv_SE/stocks.lang b/htdocs/langs/sv_SE/stocks.lang
index 92b0bda1f1bfeb60a78b71255917741bdf6e4ce0..33a5ae1a7906ccc74906116859b28ba3e258d45c 100644
--- a/htdocs/langs/sv_SE/stocks.lang
+++ b/htdocs/langs/sv_SE/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Lagrets etikett krävs
CorrectStock=Rätt lager
ListOfWarehouses=Lista över lager
ListOfStockMovements=Lista över lagerförändringar
-StocksArea=Lagerområde
+StocksArea=Warehouses area
Location=Plats
LocationSummary=Kortnamn plats
NumberOfDifferentProducts=Antal olika produkter
diff --git a/htdocs/langs/sv_SE/users.lang b/htdocs/langs/sv_SE/users.lang
index bab31f4892162773c6959c86b30347e27bd815c7..0220079b20ddfb66db5cd8095a4a231f09ddfefd 100644
--- a/htdocs/langs/sv_SE/users.lang
+++ b/htdocs/langs/sv_SE/users.lang
@@ -63,7 +63,6 @@ ShowGroup=Visa grupp
ShowUser=Visa användare
NonAffectedUsers=Icke drabbade användare
UserModified=Användare ändrades korrekt
-GroupModified=Grupp ändrades korrekt
PhotoFile=Bildfilen
UserWithDolibarrAccess=Användaren med Dolibarr tillgång
ListOfUsersInGroup=Lista över användare i denna grupp
@@ -103,7 +102,7 @@ UserDisabled=Användare %s funktionshindrade
UserEnabled=Användare %s aktiverad
UserDeleted=Användare %s bort
NewGroupCreated=Grupp %s skapade
-GroupModified=Grupp ändrades korrekt
+GroupModified=Group %s modified
GroupDeleted=Grupp %s bort
ConfirmCreateContact=Är du säker på att du vill skapa en Dolibarr konto för denna kontakt?
ConfirmCreateLogin=Är du säker på att du vill skapa en Dolibarr konto för denna medlem?
diff --git a/htdocs/langs/sv_SE/withdrawals.lang b/htdocs/langs/sv_SE/withdrawals.lang
index 9a9b38c0b5c170b11a504a27a02743f31ee83316..29af1f4babb025906ec50cb4fbfcc20b0b2edc9e 100644
--- a/htdocs/langs/sv_SE/withdrawals.lang
+++ b/htdocs/langs/sv_SE/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=Kvitto
LastWithdrawalReceipts=Senaste %s tillbakadragande kvitton
WithdrawedBills=Indragna fakturor
WithdrawalsLines=Återkallelse linjer
-RequestStandingOrderToTreat=Begäran om stående order att behandla
-RequestStandingOrderTreated=Begäran om stående behandlas order
+RequestStandingOrderToTreat=Request for standing orders to process
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=Kunden stående order
CustomerStandingOrder=Kunden stående order
NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
@@ -40,14 +41,13 @@ TransMetod=Metod Transmission
Send=Skicka
Lines=Linjer
StandingOrderReject=Utfärda ett förkasta
-InvoiceRefused=Ladda avvisande till kund
WithdrawalRefused=Uttag Refuseds
WithdrawalRefusedConfirm=Är du säker på att du vill ange ett tillbakadragande avslag för samhället
RefusedData=Datum för avslag
RefusedReason=Orsak till avslag
RefusedInvoicing=Fakturering avslaget
NoInvoiceRefused=Ladda inte avslaget
-InvoiceRefused=Ladda avvisande till kund
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=Status
StatusUnknown=Okänd
StatusWaiting=Väntar
@@ -76,7 +76,7 @@ WithBankUsingRIB=För bankkonton med hjälp av RIB
WithBankUsingBANBIC=För bankkonton som använder IBAN / BIC / SWIFT
BankToReceiveWithdraw=Bankkonto för att ta emot drar
CreditDate=Krediter på
-WithdrawalFileNotCapable=Det går inte att skapa filen uttag kvitto för ditt land
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
ShowWithdraw=Visa Dra
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Om faktura har minst ett uttag betalning som ännu inte behandlats, kommer det inte anges som betalas för att hantera uttag innan.
DoStandingOrdersBeforePayments=Detta flikar gör att du kan begära en stående order. När det kommer att vara färdig, kan du skriva betalningen för att stänga fakturan.
diff --git a/htdocs/langs/th_TH/accountancy.lang b/htdocs/langs/th_TH/accountancy.lang
index 8cab9d2b651d75b0721d76fda619e2034e4509b4..39c2732ec29852cf93d41614ed1812c2a4c1ce4f 100644
--- a/htdocs/langs/th_TH/accountancy.lang
+++ b/htdocs/langs/th_TH/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts
Validate=Validate
Addanaccount=Add an accounting account
AccountAccounting=Accounting account
-Ventilation=Ventilation
+Ventilation=Breakdown
ToDispatch=To dispatch
Dispatched=Dispatched
-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
TradeMargin=Trade margin
Reports=Reports
ByCustomerInvoice=By invoices customers
@@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger
Bookkeeping=General ledger
AccountBalanceByMonth=Account balance by month
-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
Line=Line
CAHTF=Total purchase supplier HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice
IntoAccount=In the accounting account
Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
+VentilationAuto=Automatic breakdown
Processing=Processing
EndProcessing=The end of processing
@@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account
ACCOUNTING_SEPARATORCSV=Separator CSV
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
@@ -140,14 +140,14 @@ Active=Statement
NewFiscalYear=New fiscal year
-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
TotalVente=Total turnover HT
TotalMarge=Total sales margin
DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
ChangeAccount=Change the accounting account for lines selected by the account:
Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
@@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically
ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index c3d3acf451cda31a77a4581e53e483ad6aae7973..36d25ed38ed03f79d6d41707d9e5b6aa0e20d9ef 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -437,8 +437,8 @@ Module52Name=Stocks
Module52Desc=Stock management (products)
Module53Name=Services
Module53Desc=Service management
-Module54Name=Contracts
-Module54Desc=Contract and service management
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=Barcodes
Module55Desc=Barcode management
Module56Name=Telephony
@@ -475,8 +475,8 @@ Module320Name=RSS Feed
Module320Desc=Add RSS feed inside Dolibarr screen pages
Module330Name=Bookmarks
Module330Desc=Bookmark management
-Module400Name=Projects
-Module400Desc=Project management inside other modules
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=Webcalendar
Module410Desc=Webcalendar integration
Module500Name=Special expenses (tax, social contributions, dividends)
@@ -484,7 +484,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di
Module510Name=Salaries
Module510Desc=Management of employees salaries and payments
Module600Name=Notifications
-Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Donations
Module700Desc=Donation management
Module1200Name=Mantis
@@ -514,16 +514,16 @@ Module5000Name=Multi-company
Module5000Desc=Allows you to manage multiple companies
Module6000Name=Workflow
Module6000Desc=Workflow management
-Module20000Name=Holidays
-Module20000Desc=Declare and follow employees holidays
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
Module39000Name=Product batch
Module39000Desc=Batch number, eat-by and sell-by date management on products
Module50000Name=PayBox
Module50000Desc=Module to offer an online payment page by credit card with PayBox
Module50100Name=Point of sales
Module50100Desc=Point of sales module
-Module50200Name= Paypal
-Module50200Desc= Module to offer an online payment page by credit card with Paypal
+Module50200Name=Paypal
+Module50200Desc=Module to offer an online payment page by credit card with Paypal
Module50400Name=Accounting (advanced)
Module50400Desc=Accounting management (double parties)
Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=Read standing orders
Permission152=Create/modify a standing orders request
Permission153=Transmission standing orders receipts
Permission154=Credit/refuse standing orders receipts
-Permission161=Read contracts
-Permission162=Create/modify contracts
-Permission163=Activate a service of a contract
-Permission164=Disable a service of a contract
-Permission165=Delete contracts
-Permission171=Read trips
-Permission172=Create/modify trips
-Permission173=Delete trips
-Permission178=Export trips
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Read trips and expenses (own and his subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
Permission180=Read suppliers
Permission181=Read supplier orders
Permission182=Create/modify supplier orders
@@ -671,7 +672,7 @@ Permission300=Read bar codes
Permission301=Create/modify bar codes
Permission302=Delete bar codes
Permission311=Read services
-Permission312=Assign service to contract
+Permission312=Assign service/subscription to contract
Permission331=Read bookmarks
Permission332=Create/modify bookmarks
Permission333=Delete bookmarks
@@ -701,8 +702,8 @@ Permission701=Read donations
Permission702=Create/modify donations
Permission703=Delete donations
Permission1001=Read stocks
-Permission1002=Create/modify stocks
-Permission1003=Delete stocks
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=Read stock movements
Permission1005=Create/modify stock movements
Permission1101=Read delivery orders
@@ -1038,7 +1039,6 @@ YesInSummer=Yes in summer
OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
SuhosinSessionEncrypt=Session storage encrypted by Suhosin
ConditionIsCurrently=Condition is currently %s
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
YouUseBestDriver=You use driver %s that is best driver available currently.
YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by
ModuleCompanyCodePanicum=Return an empty accountancy code.
ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
UseNotifications=Use notifications
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events, to third parties (customers or suppliers) that are configured to. Choice of active notification and targets contacts is made one third party at time.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
ModelModules=Documents templates
DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
WatermarkOnDraft=Watermark on draft document
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=Add delivery date ability
UseOptionLineIfNoQuantity=A line of product/service with a zero amount is considered as an option
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list
ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order
FreeLegalTextOnOrders=Free text on orders
WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
##### Clicktodial #####
ClickToDialSetup=Click To Dial module setup
ClickToDialUrlDesc=Url called when a click on phone picto is done. In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=Intervention numbering models
TemplatePDFInterventions=Intervention card documents models
WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
##### Contracts #####
-ContractsSetup=Contracts module setup
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=Contracts numbering modules
TemplatePDFContracts=Contracts documents models
FreeLegalTextOnContracts=Free text on contracts
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
CacheByServer=Cache by server
CacheByClient=Cache by browser
CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=Products module setup
ServiceSetup=Services module setup
@@ -1382,9 +1384,10 @@ MailingSetup=EMailing module setup
MailingEMailFrom=Sender EMail (From) for emails sent by emailing module
MailingEMailError=Return EMail (Errors-to) for emails with errors
##### Notification #####
-NotificationSetup=Notification bu email module setup
+NotificationSetup=EMail notification module setup
NotificationEMailFrom=Sender EMail (From) for emails sent for notifications
-ListOfAvailableNotifications=List of available notifications (This list depends on activated modules)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
##### Sendings #####
SendingsSetup=Sending module setup
SendingsReceiptModel=Sending receipt model
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe
OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
##### Stock #####
-StockSetup=Configuration module stock
-UserWarehouse=Use user personal stocks
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=Menu deleted
TreeMenu=Tree menus
@@ -1478,11 +1482,14 @@ ClickToDialDesc=This module allows to add an icon after phone numbers. A click o
##### Point Of Sales (CashDesk) #####
CashDesk=Point of sales
CashDeskSetup=Point of sales module setup
-CashDeskThirdPartyForSell=Generic third party to use for sells
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Default account to use to receive cash payments
CashDeskBankAccountForCheque= Default account to use to receive payments by cheque
CashDeskBankAccountForCB= Default account to use to receive payments by credit cards
-CashDeskIdWareHouse=Warehouse to use for sells
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Bookmark module setup
BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Delete fiscal year
ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
Opened=Opened
Closed=Closed
-
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
diff --git a/htdocs/langs/th_TH/agenda.lang b/htdocs/langs/th_TH/agenda.lang
index 9b3efc07dabbe9581725281613818cea48764551..1ed4e637d146d23c70eb1cad90469a4841a9678d 100644
--- a/htdocs/langs/th_TH/agenda.lang
+++ b/htdocs/langs/th_TH/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= Automatic filling
AgendaAutoActionDesc= Define here events for which you want Dolibarr to create automatically an event in agenda. If nothing is checked (by default), only manual actions will be included in agenda.
AgendaSetupOtherDesc= This page provides options to allow export of your Dolibarr events into an external calendar (thunderbird, google calendar, ...)
AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda.
-ActionsEvents= Events for which Dolibarr will create an action in agenda automatically
-PropalValidatedInDolibarr= Proposal %s validated
-InvoiceValidatedInDolibarr= Invoice %s validated
+ActionsEvents=Events for which Dolibarr will create an action in agenda automatically
+PropalValidatedInDolibarr=Proposal %s validated
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
InvoiceDeleteDolibarr=Invoice %s deleted
OrderValidatedInDolibarr= Order %s validated
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Order %s approved
OrderRefusedInDolibarr=Order %s refused
OrderBackToDraftInDolibarr=Order %s go back to draft status
OrderCanceledInDolibarr=Order %s canceled
-InterventionValidatedInDolibarr=Intervention %s validated
ProposalSentByEMail=Commercial proposal %s sent by EMail
OrderSentByEMail=Customer order %s sent by EMail
InvoiceSentByEMail=Customer invoice %s sent by EMail
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=Supplier order %s sent by EMail
SupplierInvoiceSentByEMail=Supplier invoice %s sent by EMail
ShippingSentByEMail=Shipping %s sent by EMail
ShippingValidated= Shipping %s validated
-InterventionSentByEMail=Intervention %s sent by EMail
-InterventionClassifiedBilled=Intervention %s classified as Billed
NewCompanyToDolibarr= Third party created
DateActionPlannedStart= Planned start date
DateActionPlannedEnd= Planned end date
@@ -70,9 +68,9 @@ DateActionStart= Start date
DateActionEnd= End date
AgendaUrlOptions1=You can also add following parameters to filter output:
AgendaUrlOptions2=<b>login=%s</b> to restrict output to actions created by, assigned to or done by user <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions created by user <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> to restrict output to actions done by user <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
AgendaShowBirthdayEvents=Show birthday's contacts
AgendaHideBirthdayEvents=Hide birthday's contacts
Busy=Busy
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=URL to access .ical file
ExtSiteNoLabel=No Description
WorkingTimeRange=Working time range
WorkingDaysRange=Working days range
-AddEvent=Add event
+AddEvent=Create event
MyAvailability=My availability
diff --git a/htdocs/langs/th_TH/bills.lang b/htdocs/langs/th_TH/bills.lang
index 1edd72130768502f868a057917ba530eeb280671..81b7515a8b8c3c3aa8a2d9e46e3fe9ccad263f59 100644
--- a/htdocs/langs/th_TH/bills.lang
+++ b/htdocs/langs/th_TH/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Credit note
InvoiceAvoirAsk=Credit note to correct invoice
InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example).
invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
-invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
ReplaceInvoice=Replace invoice %s
ReplacementInvoice=Replacement invoice
ReplacedByInvoice=Replaced by invoice %s
@@ -87,7 +87,7 @@ ClassifyCanceled=Classify 'Abandoned'
ClassifyClosed=Classify 'Closed'
ClassifyUnBilled=Classify 'Unbilled'
CreateBill=Create Invoice
-AddBill=Add invoice or credit note
+AddBill=Create invoice or credit note
AddToDraftInvoices=Add to draft invoice
DeleteBill=Delete invoice
SearchACustomerInvoice=Search for a customer invoice
@@ -99,7 +99,7 @@ DoPaymentBack=Do payment back
ConvertToReduc=Convert into future discount
EnterPaymentReceivedFromCustomer=Enter payment received from customer
EnterPaymentDueToCustomer=Make payment due to customer
-DisabledBecauseRemainderToPayIsZero=Disabled because remainder to pay is zero
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
Amount=Amount
PriceBase=Price base
BillStatus=Invoice status
@@ -137,8 +137,6 @@ BillFrom=From
BillTo=To
ActionsOnBill=Actions on invoice
NewBill=New invoice
-Prélèvements=Standing order
-Prélèvements=Standing order
LastBills=Last %s invoices
LastCustomersBills=Last %s customers invoices
LastSuppliersBills=Last %s suppliers invoices
@@ -156,9 +154,9 @@ ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b> ?
ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned' ?
ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid ?
ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice ?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
@@ -191,9 +189,9 @@ AlreadyPaid=Already paid
AlreadyPaidBack=Already paid back
AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposits)
Abandoned=Abandoned
-RemainderToPay=Remainder to pay
-RemainderToTake=Remainder to take
-RemainderToPayBack=Remainder to pay back
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
Rest=Pending
AmountExpected=Amount claimed
ExcessReceived=Excess received
@@ -219,19 +217,18 @@ NoInvoice=No invoice
ClassifyBill=Classify invoice
SupplierBillsToPay=Suppliers invoices to pay
CustomerBillsUnpaid=Unpaid customers invoices
-DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters
-DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=Non-recoverable
SetConditions=Set payment terms
SetMode=Set payment mode
Billed=Billed
-RepeatableInvoice=Pre-defined invoice
-RepeatableInvoices=Pre-defined invoices
-Repeatable=Pre-defined
-Repeatables=Pre-defined
-ChangeIntoRepeatableInvoice=Convert into pre-defined
-CreateRepeatableInvoice=Create pre-defined invoice
-CreateFromRepeatableInvoice=Create from pre-defined invoice
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines
CustomersInvoicesAndPayments=Customer invoices and payments
ExportDataset_invoice_1=Customer invoices list and invoice's lines
diff --git a/htdocs/langs/th_TH/categories.lang b/htdocs/langs/th_TH/categories.lang
index ed61bfc08a61b4e5bfdadecfe7f6a15298afc6e3..22914931db137a565a45daad16b9b04fbd08465b 100644
--- a/htdocs/langs/th_TH/categories.lang
+++ b/htdocs/langs/th_TH/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories
CatCusLinks=Links between customers/prospects and categories
CatProdLinks=Links between products/services and categories
CatMemberLinks=Links between members and categories
-CatProdLinks=Links between products/services and categories
-CatCusLinks=Links between customers/prospects and categories
-CatSupLinks=Links between suppliers and categories
DeleteFromCat=Remove from category
DeletePicture=Picture delete
ConfirmDeletePicture=Confirm picture deletion?
@@ -112,3 +109,4 @@ CategoriesSetup=Categories setup
CategorieRecursiv=Link with parent category automatically
CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category
diff --git a/htdocs/langs/th_TH/compta.lang b/htdocs/langs/th_TH/compta.lang
index 3929cfde0367b6f5d8dc7945385de4877d9e4759..9fe5eff520d881c617f38aa7d9db675ec18f118a 100644
--- a/htdocs/langs/th_TH/compta.lang
+++ b/htdocs/langs/th_TH/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s
SuppliersProductsSellSalesTurnover=The generated turnover by the sales of supplier's products.
CheckReceipt=Check deposit
CheckReceiptShort=Check deposit
+LastCheckReceiptShort=Last %s check receipts
NewCheckReceipt=New discount
NewCheckDeposit=New check deposit
NewCheckDepositOn=Create receipt for deposit on account: %s
diff --git a/htdocs/langs/th_TH/contracts.lang b/htdocs/langs/th_TH/contracts.lang
index e5ad112b222db93bedf8e6ded250a39d062215c6..511516dc755e4f3aba2d67e91238426896629cbd 100644
--- a/htdocs/langs/th_TH/contracts.lang
+++ b/htdocs/langs/th_TH/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Contracts area
ListOfContracts=List of contracts
-LastContracts=Last %s modified contracts
+LastModifiedContracts=Last %s modified contracts
AllContracts=All contracts
ContractCard=Contract card
ContractStatus=Contract status
@@ -27,7 +27,7 @@ MenuRunningServices=Running services
MenuExpiredServices=Expired services
MenuClosedServices=Closed services
NewContract=New contract
-AddContract=Add contract
+AddContract=Create contract
SearchAContract=Search a contract
DeleteAContract=Delete a contract
CloseAContract=Close a contract
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines
ListOfRunningServices=List of running services
NotActivatedServices=Inactive services (among validated contracts)
BoardNotActivatedServices=Services to activate among validated contracts
-LastContracts=Last %s modified contracts
+LastContracts=Last % contracts
LastActivatedServices=Last %s activated services
LastModifiedServices=Last %s modified services
EditServiceLine=Edit service line
diff --git a/htdocs/langs/th_TH/cron.lang b/htdocs/langs/th_TH/cron.lang
index 768cd012384454aef37c15bb651dcf719a11e334..195ad43c87c41ae0938fa27745ba14209fbac724 100644
--- a/htdocs/langs/th_TH/cron.lang
+++ b/htdocs/langs/th_TH/cron.lang
@@ -1,10 +1,8 @@
# Dolibarr language file - Source file is en_US - cron
-#
# About page
About = About
CronAbout = About Cron
CronAboutPage = Cron about page
-
# Right
Permission23101 = Read Scheduled task
Permission23102 = Create/update Scheduled task
@@ -20,9 +18,8 @@ CronExplainHowToRunUnix=On Unix environment you should use crontab to run Comman
CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
# Menu
CronJobs=Scheduled jobs
-CronListActive= List of active jobs
-CronListInactive= List of disabled jobs
-CronListActive= List of active jobs
+CronListActive=List of active/scheduled jobs
+CronListInactive=List of disabled jobs
# Page list
CronDateLastRun=Last run
CronLastOutput=Last run output
diff --git a/htdocs/langs/th_TH/donations.lang b/htdocs/langs/th_TH/donations.lang
index 66ddea95a5c694d8044c40b7da05319d0b77a530..f7aed91cf81caf0e83e390519642ea1f199670c6 100644
--- a/htdocs/langs/th_TH/donations.lang
+++ b/htdocs/langs/th_TH/donations.lang
@@ -4,7 +4,7 @@ Donations=Donations
DonationRef=Donation ref.
Donor=Donor
Donors=Donors
-AddDonation=Add a donation
+AddDonation=Create a donation
NewDonation=New donation
ShowDonation=Show donation
DonationPromise=Gift promise
@@ -31,3 +31,8 @@ DonationRecipient=Donation recipient
ThankYou=Thank You
IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
MinimumAmount=Minimum amount is %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/th_TH/externalsite.lang b/htdocs/langs/th_TH/externalsite.lang
index 62da68c045d199d9fd0a078061cc7739f33ae967..da4853df0df086e3040a294cec116c590f4c2e9e 100644
--- a/htdocs/langs/th_TH/externalsite.lang
+++ b/htdocs/langs/th_TH/externalsite.lang
@@ -2,3 +2,4 @@
ExternalSiteSetup=Setup link to external website
ExternalSiteURL=External Site URL
ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/th_TH/holiday.lang b/htdocs/langs/th_TH/holiday.lang
index c25abf6449ca2cc97d5dba6340d1530b5ea9c675..f5b87fefb0878c40cc75768a1d1c4bcf4cb80c72 100644
--- a/htdocs/langs/th_TH/holiday.lang
+++ b/htdocs/langs/th_TH/holiday.lang
@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
CantCreateCP=You don't have the right to make leave requests.
InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=Update
CantUpdate=You cannot update this leave request.
NoDateDebut=You must select a start date.
NoDateFin=You must select an end date.
-ErrorDureeCP=Your request for holidays does not contain working day.
-TitleValidCP=Approve the request holidays
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
ConfirmValidCP=Are you sure you want to approve the leave request?
DateValidCP=Date approved
TitleToValidCP=Send leave request
ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the request holidays
+TitleRefuseCP=Refuse the leave request
ConfirmRefuseCP=Are you sure you want to refuse the leave request?
NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
+TitleCancelCP=Cancel the leave request
ConfirmCancelCP=Are you sure you want to cancel the leave request?
DetailRefusCP=Reason for refusal
DateRefusCP=Date of refusal
@@ -78,7 +77,7 @@ ActionByCP=Performed by
UserUpdateCP=For the user
PrevSoldeCP=Previous Balance
NewSoldeCP=New Balance
-alreadyCPexist=A request for holidays has already been done on this period.
+alreadyCPexist=A leave request has already been done on this period.
UserName=Name
Employee=Employee
FirstDayOfHoliday=First day of vacation
@@ -88,25 +87,25 @@ ManualUpdate=Manual update
HolidaysCancelation=Leave request cancelation
## Configuration du Module ##
-ConfCP=Configuration of holidays module
+ConfCP=Configuration of leave request module
DescOptionCP=Description of the option
ValueOptionCP=Value
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
UpdateConfCPOK=Updated successfully.
ErrorUpdateConfCP=An error occurred during the update, please try again.
-AddCPforUsers=Please add the balance of holidays of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
Module27130Name= Management of leave requests
Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
TitleOptionEventCP=Settings of leave requets for events
ValidEventCP=Validate
UpdateEventCP=Update events
diff --git a/htdocs/langs/th_TH/interventions.lang b/htdocs/langs/th_TH/interventions.lang
index 17641a0ab3e499b2f66a4b4ddd80c46d478ff702..c79da05364e615bb2b234ce4211a373fc94e9168 100644
--- a/htdocs/langs/th_TH/interventions.lang
+++ b/htdocs/langs/th_TH/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Intervention
Interventions=Interventions
InterventionCard=Intervention card
NewIntervention=New intervention
-AddIntervention=Add intervention
+AddIntervention=Create intervention
ListOfInterventions=List of interventions
EditIntervention=Edit intervention
ActionsOnFicheInter=Actions on intervention
@@ -30,6 +30,15 @@ StatusInterInvoiced=Billed
RelatedInterventions=Related interventions
ShowIntervention=Show intervention
SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention
TypeContact_fichinter_internal_INTERVENING=Intervening
diff --git a/htdocs/langs/th_TH/mails.lang b/htdocs/langs/th_TH/mails.lang
index 98e6dc335eeced95e230de5b5ca5b8f78fc59681..7a2111988228ab02739bad001958aa455eb9013c 100644
--- a/htdocs/langs/th_TH/mails.lang
+++ b/htdocs/langs/th_TH/mails.lang
@@ -115,7 +115,7 @@ SentBy=Sent by
MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=Clear list
ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
ToAddRecipientsChooseHere=Add recipients by choosing from the lists
@@ -133,6 +133,9 @@ Notifications=Notifications
NoNotificationsWillBeSent=No email notifications are planned for this event and company
ANotificationsWillBeSent=1 notification will be sent by email
SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification request
-ListOfActiveNotifications=List all active email notification requests
+AddNewNotification=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
ListOfNotificationsDone=List all email notifications sent
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/th_TH/main.lang b/htdocs/langs/th_TH/main.lang
index be165e49fd86634c5c7dc342ec90dadf67c10f2b..6258c9fe83a6d4860e8b80718d89364d353ee777 100644
--- a/htdocs/langs/th_TH/main.lang
+++ b/htdocs/langs/th_TH/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr
ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'.
ErrorFailedToSaveFile=Error, failed to save file.
-ErrorOnlyPngJpgSupported=Error, only .png and .jpg image format file are supported.
-ErrorImageFormatNotSupported=Your PHP does not support functions to convert images of this format.
SetDate=Set date
SelectDate=Select a date
SeeAlso=See also %s
BackgroundColorByDefault=Default background color
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
NbOfEntries=Nb of entries
GoToWikiHelpPage=Read online help (need Internet access)
@@ -266,6 +266,7 @@ Afternoon=Afternoon
Quadri=Quadri
MonthOfDay=Month of the day
HourShort=H
+MinuteShort=mn
Rate=Rate
UseLocalTax=Include tax
Bytes=Bytes
@@ -340,6 +341,7 @@ FullList=Full list
Statistics=Statistics
OtherStatistics=Other statistics
Status=Status
+Favorite=Favorite
ShortInfo=Info.
Ref=Ref.
RefSupplier=Ref. supplier
@@ -365,6 +367,7 @@ ActionsOnCompany=Events about this third party
ActionsOnMember=Events about this member
NActions=%s events
NActionsLate=%s late
+RequestAlreadyDone=Request already recorded
Filter=Filter
RemoveFilter=Remove filter
ChartGenerated=Chart generated
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Extra attributes setup
URLPhoto=URL of photo/logo
SetLinkToThirdParty=Link to another third party
CreateDraft=Create draft
+SetToDraft=Back to draft
ClickToEdit=Click to edit
ObjectDeleted=Object %s deleted
ByCountry=By country
@@ -678,7 +682,7 @@ ViewPrivateNote=View notes
XMoreLines=%s line(s) hidden
PublicUrl=Public URL
AddBox=Add box
-
+SelectElementAndClickRefresh=Select an element and click Refresh
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/langs/th_TH/margins.lang b/htdocs/langs/th_TH/margins.lang
index 3fca6d7a6440d0e09acfc61f524ed9b7c3326a78..606d5e5053a25855631a7d6ee61b6c392c1fe32c 100644
--- a/htdocs/langs/th_TH/margins.lang
+++ b/htdocs/langs/th_TH/margins.lang
@@ -38,4 +38,7 @@ BuyingCost=Cost price
UnitCharges=Unit charges
Charges=Charges
AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/th_TH/orders.lang b/htdocs/langs/th_TH/orders.lang
index 3d53001215463a6647c838394ec11668d45c4bcf..6ee9c19fa95f45044b7466cc0fdcbf21819ef13a 100644
--- a/htdocs/langs/th_TH/orders.lang
+++ b/htdocs/langs/th_TH/orders.lang
@@ -53,7 +53,7 @@ ShippingExist=A shipment exists
DraftOrWaitingApproved=Draft or approved not yet ordered
DraftOrWaitingShipped=Draft or validated not yet shipped
MenuOrdersToBill=Orders delivered
-MenuOrdersToBill2=Orders to bill
+MenuOrdersToBill2=Billable orders
SearchOrder=Search order
SearchACustomerOrder=Search a customer order
ShipProduct=Ship product
@@ -65,7 +65,7 @@ ValidateOrder=Validate order
UnvalidateOrder=Unvalidate order
DeleteOrder=Delete order
CancelOrder=Cancel order
-AddOrder=Add order
+AddOrder=Create order
AddToMyOrders=Add to my orders
AddToOtherOrders=Add to other orders
AddToDraftOrders=Add to draft order
@@ -154,7 +154,6 @@ OrderByPhone=Phone
CreateInvoiceForThisCustomer=Bill orders
NoOrdersToInvoice=No orders billable
CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-MenuOrdersToBill2=Orders to bill
OrderCreation=Order creation
Ordered=Ordered
OrderCreated=Your orders have been created
diff --git a/htdocs/langs/th_TH/oscommerce.lang b/htdocs/langs/th_TH/oscommerce.lang
deleted file mode 100644
index 3ff9108ead4e2ba3a94229a24177998c14e624fc..0000000000000000000000000000000000000000
--- a/htdocs/langs/th_TH/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=OS Commerce module setup
-OSCommerceSetupSaved=OS Commerce setup saved
-OSCommerceServer=OS Commerce server host/ip
-OSCommerceDatabaseName=OS Commerce database name
-OSCommercePrefix=OS Commerce tables prefix
-OSCommerceUser=OS Commerce database login
diff --git a/htdocs/langs/th_TH/other.lang b/htdocs/langs/th_TH/other.lang
index b56ef2944951b7c0d44d285b1e7a02ad6077a579..889918881838dcbc59b7a031b8af656cec175167 100644
--- a/htdocs/langs/th_TH/other.lang
+++ b/htdocs/langs/th_TH/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=Security code
Calendar=Calendar
-AddTrip=Add trip
Tools=Tools
ToolsDesc=This area is dedicated to group miscellaneous tools not available into other menu entries.<br><br>Those tools can be reached from menu on the side.
Birthday=Birthday
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation
Notify_TASK_CREATE=Task created
Notify_TASK_MODIFY=Task modified
Notify_TASK_DELETE=Task deleted
+SeeModuleSetup=See module setup
NbOfAttachedFiles=Number of attached files/documents
TotalSizeOfAttachedFiles=Total size of attached files/documents
MaxSize=Maximum size
@@ -80,6 +80,16 @@ ModifiedBy=Modified by %s
ValidatedBy=Validated by %s
CanceledBy=Canceled by %s
ClosedBy=Closed by %s
+CreatedById=User id who created
+ModifiedById=User id who made last change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made last change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
FileWasRemoved=File %s was removed
DirWasRemoved=Directory %s was removed
FeatureNotYetAvailableShort=Available in a next version
@@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your
##### Calendar common #####
AddCalendarEntry=Add entry in calendar %s
-NewCompanyToDolibarr=Company %s added into Dolibarr
-ContractValidatedInDolibarr=Contract %s validated in Dolibarr
-ContractCanceledInDolibarr=Contract %s canceled in Dolibarr
-ContractClosedInDolibarr=Contract %s closed in Dolibarr
-PropalClosedSignedInDolibarr=Proposal %s signed in Dolibarr
-PropalClosedRefusedInDolibarr=Proposal %s refused in Dolibarr
-PropalValidatedInDolibarr=Proposal %s validated in Dolibarr
-InvoiceValidatedInDolibarr=Invoice %s validated in Dolibarr
-InvoicePaidInDolibarr=Invoice %s changed to paid in Dolibarr
-InvoiceCanceledInDolibarr=Invoice %s canceled in Dolibarr
-PaymentDoneInDolibarr=Payment %s done in Dolibarr
-CustomerPaymentDoneInDolibarr=Customer payment %s done in Dolibarr
-SupplierPaymentDoneInDolibarr=Supplier payment %s done in Dolibarr
-MemberValidatedInDolibarr=Member %s validated in Dolibarr
-MemberResiliatedInDolibarr=Member %s resiliated in Dolibarr
-MemberDeletedInDolibarr=Member %s deleted from Dolibarr
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added in Dolibarr
-ShipmentValidatedInDolibarr=Shipment %s validated in Dolibarr
-ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
##### Export #####
Export=Export
ExportsArea=Exports area
diff --git a/htdocs/langs/th_TH/paybox.lang b/htdocs/langs/th_TH/paybox.lang
index f937768240c3bb7b70a1bdf3e499c60b71d16ab9..aced32a49440a9ff7a1b1e0279522ff49cec7821 100644
--- a/htdocs/langs/th_TH/paybox.lang
+++ b/htdocs/langs/th_TH/paybox.lang
@@ -35,3 +35,6 @@ MessageKO=Message on canceled payment return page
NewPayboxPaymentReceived=New Paybox payment received
NewPayboxPaymentFailed=New Paybox payment tried but failed
PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/th_TH/resource.lang b/htdocs/langs/th_TH/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..d64075dfbf595897a63e3eebf19194d8f71030dd
--- /dev/null
+++ b/htdocs/langs/th_TH/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
diff --git a/htdocs/langs/th_TH/sendings.lang b/htdocs/langs/th_TH/sendings.lang
index 2ae43f3976607147c1e8fc3a41898f572cee9868..f6111bac6841189e50c3c7fb9028962b56e3997e 100644
--- a/htdocs/langs/th_TH/sendings.lang
+++ b/htdocs/langs/th_TH/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is do
RelatedShippings=Related shippings
ShipmentLine=Shipment line
CarrierList=List of transporters
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
# Sending methods
SendingMethodCATCH=Catch by customer
diff --git a/htdocs/langs/th_TH/stocks.lang b/htdocs/langs/th_TH/stocks.lang
index 5d11b0fd7a0992284856369a2d4b919e56a34453..06c502504e9f19219ba028be8d02fbb55e5f0697 100644
--- a/htdocs/langs/th_TH/stocks.lang
+++ b/htdocs/langs/th_TH/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Warehouse label is required
CorrectStock=Correct stock
ListOfWarehouses=List of warehouses
ListOfStockMovements=List of stock movements
-StocksArea=Stocks area
+StocksArea=Warehouses area
Location=Location
LocationSummary=Short name location
NumberOfDifferentProducts=Number of different products
diff --git a/htdocs/langs/th_TH/users.lang b/htdocs/langs/th_TH/users.lang
index 0afaab6ad7f7ca7de787d1bad2656917763a3f45..baf209f9d1c7ff7527f6f0237519cac6f683a9e3 100644
--- a/htdocs/langs/th_TH/users.lang
+++ b/htdocs/langs/th_TH/users.lang
@@ -63,7 +63,6 @@ ShowGroup=Show group
ShowUser=Show user
NonAffectedUsers=Non assigned users
UserModified=User modified successfully
-GroupModified=Group modified successfully
PhotoFile=Photo file
UserWithDolibarrAccess=User with Dolibarr access
ListOfUsersInGroup=List of users in this group
@@ -103,7 +102,7 @@ UserDisabled=User %s disabled
UserEnabled=User %s activated
UserDeleted=User %s removed
NewGroupCreated=Group %s created
-GroupModified=Group modified successfully
+GroupModified=Group %s modified
GroupDeleted=Group %s removed
ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact ?
ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member ?
@@ -114,8 +113,10 @@ YourRole=Your roles
YourQuotaOfUsersIsReached=Your quota of active users is reached !
NbOfUsers=Nb of users
DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
-HierarchicalResponsible=Hierarchical responsible
+HierarchicalResponsible=Supervisor
HierarchicView=Hierarchical view
UseTypeFieldToChange=Use field Type to change
OpenIDURL=OpenID URL
LoginUsingOpenID=Use OpenID to login
+WeeklyHours=Weekly hours
+ColorUser=Color of the user
diff --git a/htdocs/langs/th_TH/withdrawals.lang b/htdocs/langs/th_TH/withdrawals.lang
index 58ac3e252ec59d67ff8d71c394b4c44265bc3add..e433730908416bbfa32c181a580b9e2e7e34717c 100644
--- a/htdocs/langs/th_TH/withdrawals.lang
+++ b/htdocs/langs/th_TH/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=Receipt
LastWithdrawalReceipts=Last %s withdrawal receipts
WithdrawedBills=Withdrawn invoices
WithdrawalsLines=Withdrawal lines
-RequestStandingOrderToTreat=Request for standing orders to treat
-RequestStandingOrderTreated=Request for standing orders treated
+RequestStandingOrderToTreat=Request for standing orders to process
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=Customer standing orders
CustomerStandingOrder=Customer standing order
NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
@@ -40,14 +41,13 @@ TransMetod=Transmission method
Send=Send
Lines=Lines
StandingOrderReject=Issue a rejection
-InvoiceRefused=Invoice refused
WithdrawalRefused=Withdrawal refused
WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society
RefusedData=Date of rejection
RefusedReason=Reason for rejection
RefusedInvoicing=Billing the rejection
NoInvoiceRefused=Do not charge the rejection
-InvoiceRefused=Invoice refused
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=Status
StatusUnknown=Unknown
StatusWaiting=Waiting
@@ -76,7 +76,7 @@ WithBankUsingRIB=For bank accounts using RIB
WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
BankToReceiveWithdraw=Bank account to receive withdraws
CreditDate=Credit on
-WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
ShowWithdraw=Show Withdraw
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
diff --git a/htdocs/langs/tr_TR/accountancy.lang b/htdocs/langs/tr_TR/accountancy.lang
index c6d4a63456064fb95a8ddb987b4b4092791f6abe..f481824e4639d69214087ef5f0f5ea52cc107c09 100644
--- a/htdocs/langs/tr_TR/accountancy.lang
+++ b/htdocs/langs/tr_TR/accountancy.lang
@@ -17,8 +17,8 @@ Modelcsv=Dışaaktarım modeli
Selectmodelcsv=Bir dışaaktarım modeli seç
Modelcsv_normal=Klasik dışaaktarım
Modelcsv_CEGID=CEGID Uzmanına yönelik dışaaktarım
-BackToChartofaccounts=Hesap planı geliri
-Back=Gelir
+BackToChartofaccounts=Hesap planı cirosu
+Back=Ciro
Definechartofaccounts=Hesap planı tanımla
Selectchartofaccounts=Hesap planı seç
@@ -29,9 +29,9 @@ Ventilation=Analiz
ToDispatch=Gönderilecek
Dispatched=Gönderilmiş
-CustomersVentilation=Müşteri analizi
-SuppliersVentilation=Tedarikçi analizi
-TradeMargin=Ticaret marjı
+CustomersVentilation=Müşterilerin analizi
+SuppliersVentilation=Tedarikçilerin analizi
+TradeMargin=Ticaret oranı
Reports=Raporlar
ByCustomerInvoice=Müşteri faturalarına göre
ByMonth=Aya göre
@@ -46,7 +46,7 @@ Bookkeeping=Büyük Defter
AccountBalanceByMonth=Aylık hesap bakiyesi
AccountingVentilation=Analiz muhasebesi
-AccountingVentilationSupplier=Teadrikçi hesabı analizi
+AccountingVentilationSupplier=Tedarikçi hesabı analizi
AccountingVentilationCustomer=Müşteri hesabı analizi
Line=Satır
@@ -68,9 +68,9 @@ NotVentilatedinAccount=Muhasebe hesabında analiz edilmedi.
ACCOUNTING_SEPARATORCSV=CSV Ayırıcı
-ACCOUNTING_LIMIT_LIST_VENTILATION=Bir sayfada gösterilecek analiz edilen öğe sayısı (önerilen ençok:50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO="Analizlenecek" analiz sayfalarının sıralamasını son öğelerden başlat
-ACCOUNTING_LIST_SORT_VENTILATION_DONE="Analizlenen" analiz sayfalarının sıralamasını son öğelerden başlat
+ACCOUNTING_LIMIT_LIST_VENTILATION=Analiz syfasında gösterilecek öğe sayısı (önerilen ençok:50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Analiz sayfalarında "Analiz edileceklerin" sıralandırılmasını en son öğelerden göre başlatın
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Analiz sayfalarında "Analiz edilmişlerin" sıralandırılmasını en son öğelerden göre başlatın
AccountLength=Dolibarr'da gösterilen muhasebe hesapları uzunluğu
AccountLengthDesc=Boşlukların sıfır figürü ile değiştirilmesiyle muhasebe hesap uzunluğunun uydurulmasını sağlayan işlevdir. Bu işlev yalnızca görüntüyü değiştirir, Dolibarr'da kayıtlı muhasebe hesaplarını değiştirmez. Dışaaktarma için bu fonksiyonun belirli yazılımla uyumlu olması gerekir.
@@ -111,7 +111,7 @@ PurchasesJournal=Satınalma günlüğü
DescSellsJournal=Satış günlüğü
DescPurchasesJournal=Satınalma günlüğü
BankJournal=Banka günlüğü
-DescBankJournal=Nakitten dışında her türlü ödemeyi içeren banka günlüğü
+DescBankJournal=Nakit dışında her türlü ödemeyi içeren banka günlüğü
CashJournal=Kasa günlüğü
DescCashJournal=Nakit ödeme türünü içeren kasa günlüğü
@@ -140,14 +140,14 @@ Active=Hesap özeti
NewFiscalYear=Yeni mali yıl
-DescVentilCustomer=Burada müşteri faturalarınızın yıllık hesap analizine bakın
+DescVentilCustomer=Müşteri faturalarınızın yıllık hesap analizi için buraya danışın
TotalVente=Toplam ciro HT
TotalMarge=Toplam satışlar oranı
DescVentilDoneCustomer=Burada müşteri faturaları satırlarına ve onların muhasebe hesaplarının listesine bakın.
DescVentilTodoCustomer=Bir muhasebe hesabıyla müşteri faturanızın kalemlerini analiz edin
ChangeAccount=Muhasebe hesabını, hesap tarafından seçilen satırlar için değiştirin:
Vide=-
-DescVentilSupplier=Burada tedarikçi faturalarınızın yıllık hesap analizine bakın
+DescVentilSupplier=Tedarikçi faturalarınızın yıllık hesap analizi için buraya danışın
DescVentilTodoSupplier=Bir muhasebe hesabıyla tedarikçi faturanızın kalemlerini analiz edin
DescVentilDoneSupplier=Burada tedarikçi faturaları ve muhasebe hesapları satırları listesine başvurun
@@ -155,4 +155,4 @@ ValidateHistory=Otomatikman doğrula
ErrorAccountancyCodeIsAlreadyUse=Hata, kullanıldığı için bu muhasebe hesabını silemezsiniz
-FicheVentilation=Havalandırma kartı
+FicheVentilation=Analiz kartı
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index 60121a579e14aefa738dff86368bed7e24859652..90cb97657857ea078f11654b7a5c5320cb16879e 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -37,8 +37,8 @@ GUISetup=Görünüm
SetupArea=Ayarlar alanı
FormToTestFileUploadForm=Dosya yükleme deneme formu (ayarlara göre)
IfModuleEnabled=Not: yalnızca <b>%s</b> modülü etkinse evet etkilidir.
-RemoveLock=<b>%s</b> dosyasını, güncelleme aracının kullanımına izin vermek için belirmişse kaldırın.
-RestoreLock=<b>%s</b> dosyasını, güncelleme aracının her hangi bir kullanımını engellemek için, yalnızca okuma izniyle değiştirin.
+RemoveLock=Bu dosyayı <b>%s</b> eğer güncelleme aracının kullanımına izin vermek için belirmişse kaldırın.
+RestoreLock=Bu dosyayı <b>%s</b> eğer güncelleme aracının her hangi bir kullanımını engellemek için, yalnızca okuma izniyle değiştirin.
SecuritySetup=Güvenlik ayarları
ErrorModuleRequirePHPVersion=Hata, bu modül %s veya daha yüksek PHP sürümü gerektirir.
ErrorModuleRequireDolibarrVersion=Hata, bu modül %s veya daha yüksek Dolibarr sürümü gerektirir.
@@ -48,7 +48,7 @@ Dictionary=Sözlükler
Chartofaccounts=Hesap planı
Fiscalyear=Mali yıllar
ErrorReservedTypeSystemSystemAuto='system' ve 'systemauto' değerleri tür için ayrılmıştır. 'kullanıcı'yı kendi kayıtlarınıza eklemek için değer olarak kullanabilirsiniz
-ErrorCodeCantContainZero=Kod 0 değeri içeremez
+ErrorCodeCantContainZero=Kod 0 değerini içeremez
DisableJavascript=Javascript ve Ajax fonksiyonlarını engelle (Görme engelli kişiler ve metin tarayıcılar için önerilir)
ConfirmAjax=Açılır Ajax onay pencereleri kullanın
UseSearchToSelectCompanyTooltip=Ayrıca çok fazla sayıda üçüncü partiniz varsa (>100 000), Kurulum->Diğer den COMPANY_DONOTSEARCH_ANYWHERE değişmezini 1 e ayarlayarak hızı arttırabilirsiniz. Sonra arama dizenin başlamasıyla sınırlı olacaktır.
@@ -58,7 +58,7 @@ UseSearchToSelectContactTooltip=Ayrıca çok fazla sayıda üçüncü partiniz v
UseSearchToSelectContact=Kişi seçimi için oto tamamlamalı alan kullanın (liste kutusu kullanmak yerine).
SearchFilter=Arama süzgeçi seçenekleri
NumberOfKeyToSearch=Aramayı başlatacak karakter sayısı: %s
-ViewFullDateActions=Üçüncü sayfada tam gün eylemlerini göster
+ViewFullDateActions=Üçüncü sayfada tam gün etkinliklerini göster
NotAvailableWhenAjaxDisabled=Ajax devre dışı olduğunda kullanılamaz
JavascriptDisabled=JavaScript devre dışı
UsePopupCalendar=Tarih girişi için açılır pencere kullan
@@ -324,7 +324,7 @@ DisableLinkToHelpCenter=Giriş sayfasında "<b>Yardım ya da destek gerekli</b>"
DisableLinkToHelp=Sol menüde "<b>%s Çevrimiçi yardım</b>" bağlantısını gizle
AddCRIfTooLong=Otomatik kaydırma yoktur, yani belge üzerinde çok uzun olmasından dolayı satır sayfa sınırı dışına çıkmışsa metin alanında kendiniz satırbaşı yapmalısınız.
ModuleDisabled=Modül devre dışı
-ModuleDisabledSoNoEvent=Modül engellenmiş olduğundan olay asla oluşturulmaz
+ModuleDisabledSoNoEvent=Modül engellenmiş olduğundan etkinlik asla oluşturulmaz
ConfirmPurge=Bu temizleme işlemini çalıştırmak istediğinizden emin misiniz?<br>Bu işlem tüm veri dosyalarınızı bir daha geri alınamayacak şekilde tamamen silecektir (ECM dosyaları, ekli dosyalar…).
MinLength=Enaz uzunluk
LanguageFilesCachedIntoShmopSharedMemory=.lang dosyaları paylaşılan hafızaya yüklendi.
@@ -356,7 +356,7 @@ HideRefOnPDF=Oluşturulan PDF te ürün ref. ini gizle
HideDetailsOnPDF=Oluşturulan PDF te ürün satır ayrıntılarını gizle
Library=Kütüphane
UrlGenerationParameters=URL güvenliği için parametreler
-SecurityTokenIsUnique=Her URL için eşsiz bir güvenlik anahtarı kullan
+SecurityTokenIsUnique=Her URL için benzersiz bir güvenlik anahtarı kullan
EnterRefToBuildUrl=Nesen %s için hata referansı
GetSecuredUrl=Hesaplanan URL al
ButtonHideUnauthorized=Yetkisiz işlemler için düğmeleri engelli göstermek yerine gizleHide buttons for unauthorized actions instead of showing disabled buttons
@@ -369,7 +369,7 @@ TextLong=Uzun metin
Int=Tam sayı
Float=Kayan
DateAndTime=Tarih ve saat
-Unique=Eşsiz
+Unique=Benzersiz
Boolean=Matıksal (Onay kutusu)
ExtrafieldPhone = Telefon
ExtrafieldPrice = Fiyat
@@ -412,7 +412,7 @@ Module1Desc=Firma ve kişi yönetimi (müşteriler, adaylar…)
Module2Name=Ticaret
Module2Desc=Ticaret yönetimi
Module10Name=Muhasebe
-Module10Desc=Basit muhasebe yönetimi (fatura ve ödeme yapma)
+Module10Desc=Veritabanı içeriğine bağlı basit muhasebe raporları (günlükler, ciro). Gönderilmez.
Module20Name=Teklifler
Module20Desc=Teklif yönetimi
Module22Name=Toplu E-postalar
@@ -437,8 +437,8 @@ Module52Name=Stoklar
Module52Desc=Stok yönetimi (ürünler)
Module53Name=Hizmetler
Module53Desc=Hizmet yönetimi
-Module54Name=Sözleşmeler
-Module54Desc=Sözleşme ve hizmet yönetimi
+Module54Name=Sözleşmeler/Abonelikler
+Module54Desc=Sözleşmelerin yönetimi (hizmetler ya da yinelenen abonelikler)
Module55Name=Barkodlar
Module55Desc=Barkod yönetimi
Module56Name=Telefon
@@ -475,8 +475,8 @@ Module320Name=RSS Besleme
Module320Desc=Dolibarr ekran sayfaları içine RSS ekle
Module330Name=Yerimleri
Module330Desc=Yerimi yönetimi
-Module400Name=Projeler
-Module400Desc=Diğer modüller içerisinden proje yönetimi
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=Web Takvimi
Module410Desc=WebT akvimi entegrasyonu
Module500Name=Özel giderler (vergi, sosyal katkı payları, temettüler)
@@ -498,7 +498,7 @@ Module2000Desc=Gelişmiş editör kullanarak bazı metin alanlarının düzenlen
Module2300Name=Kron
Module2300Desc=Planlı görev yönetimi
Module2400Name=Gündem
-Module2400Desc=Eylemler/görevler ve gündem yönetimi
+Module2400Desc=Etkinlikler/görevler ve gündem yönetimi
Module2500Name=Elektronik İçerik Yönetimi
Module2500Desc=Belgeleri saklayın ve yönetin
Module2600Name=Web Hizmetleri
@@ -606,11 +606,11 @@ Permission151=Ödeme talimatlarını oku
Permission152=Ödeme talimatı isteği oluştur/değiştir
Permission153=Ödeme talimatı fişleri aktarımı
Permission154=Ödeme talimatı fişleri alacaklandır/reddet
-Permission161=Sözleşme oku
-Permission162=Sözleşme oluştur/değiştir
-Permission163=Bir sözleşme hizmetini etkinleştir
-Permission164=Bir sözleşme hizmetini engelle
-Permission165=Sözleşme sil
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
Permission171=Seyahat ve giderleri okuyun (kendi ve astlarının)
Permission172=Gezi ve gider oluştur/değiştir
Permission173=Gezi ve gider sil
@@ -672,7 +672,7 @@ Permission300=Bar kod oku
Permission301=Bar kod oluştur/değiştir
Permission302=Bar kod sil
Permission311=Hizmet oku
-Permission312=Sözleşmeye hizmet ata
+Permission312=Assign service/subscription to contract
Permission331=Yerimi oku
Permission332=Yerimi oluştur/değiştir
Permission333=Yerimi sil
@@ -702,8 +702,8 @@ Permission701=Bağış oluştur/değiştir
Permission702=Bağış sil
Permission703=Bağış sil
Permission1001=Stok oku
-Permission1002=Stok oluştur/değiştir
-Permission1003=Stok sil
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=Stok hareketlerini oku
Permission1005=Stok hareketleri oluştur/değiştir
Permission1101=Teslimat emirlerini oku
@@ -734,12 +734,12 @@ Permission23001 = Planlı görev oku
Permission23002 = Planlı görev oluştur/güncelle
Permission23003 = Planlı görev sil
Permission23004 = Planlı görev yürüt
-Permission2401=Onun hesabına bağlı eylemleri (olayları veya görevleri) oku
-Permission2402=Onun hesabına bağlı eylemler (olaylar veya görevler) oluştur/değiştir
-Permission2403=Onun hesabına bağlı eylemleri (olayları veya görevleri)sil
-Permission2411=Başkalarının eylemlerini (olaylarını veya görevlerini) oku
-Permission2412=Başkalarının eylemlerini (olaylarını veya görevlerini) oluştur/değiştir
-Permission2413=Başkalarının eylemlerini (olaylarını veya görevlerini) sil
+Permission2401=Onun hesabına bağlı eylemleri (etkinlikleri veya görevleri) oku
+Permission2402=Onun hesabına bağlı eylemler (etkinlikler veya görevler) oluştur/değiştir
+Permission2403=Onun hesabına bağlı eylemleri (etkinlikleri veya görevleri) sil
+Permission2411=Başkalarının eylemlerini (etkinliklerini veya görevlerini) oku
+Permission2412=Başkalarının eylemlerini (etkinliklerini veya görevlerini) oluştur/değiştir
+Permission2413=Başkalarının eylemlerini (etkinliklerini veya görevlerini) sil
Permission2501=Belge oku/indir
Permission2502=Belge indir
Permission2503=Belge gönder ya da sil
@@ -911,7 +911,7 @@ DelayBeforeWarning=Uyarıdan öncesi süre
DelaysBeforeWarning=Uyarı öncesi süreler
DelaysOfToleranceBeforeWarning=Uyarı öncesi süre toleransları
DelaysOfToleranceDesc=Bu ekran, ekranda %s resmi ile bir uyarı bildirilmeden önce tolere edilebilecek süreleri tanımlamanızı sağlar.
-Delays_MAIN_DELAY_ACTIONS_TODO=Henüz gerçekleşmemiş planlı eylemler için uyarı yapılmadan önceki süre toleransı (gün olarak).
+Delays_MAIN_DELAY_ACTIONS_TODO=Henüz gerçekleşmemiş planlı etkinlikler için uyarı yapılmadan önceki süre toleransı (gün olarak).
Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Henüz işleme konulmamış siparişler öncesi uyarı yapılmadan önceki süre toleransı (gün olarak).
Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Henüz işleme konulmamış müşteri siparişleri öncesi uyarı yapılmadan önceki süre toleransı (gün olarak).
Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Henüz kapatılmamış teklifler öncesi uyarı yapılmadan önceki süre toleransı (gün olarak).
@@ -923,13 +923,13 @@ Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Ödenmemiş müşteri faturaları uyar
Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Bekleyen banka uzlaşmaları uyarısı öncesi süre toleransı (gün olarak)
Delays_MAIN_DELAY_MEMBERS=Gecikmiş üyelik ücreti uyarısı öncesi süre toleransı (gün olarak)
Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Çek ödemesi uyarısı öncesi süre tolerans (gün olarak)
-SetupDescription1=Dolibarr’ı kullanmaya başlamadan önce kurulumunun yapılması gereken bütün parametreler ayarlar alanındadır.
-SetupDescription2=2 en önemli ayarlama adımları sol ayarlar menüsündeki ilk 2 adımdır, bu demektir ki Firma/dernek ayarla sayfası ve Modül kurulum sayfası:
+SetupDescription1=Kullanmaya başlamadan önce Dolibarr'ı kurmanızı sağlayacak bütün parametreler ayarlar alanındadır.
+SetupDescription2=En önemli 2 ayarlama adımı sol ayarlar menüsündeki ilk 2 adımdır, bu demektir ki Firma/dernek ayarlar sayfası ve Modül kurulumu sayfası:
SetupDescription3=<a href="%s">Ayarlar->Firma/dernek</a> menüsündeki parametreler gereklidir, çünkü giriş bilgileri Dolibarr ekranlarında ve Dolibarr’ın davranışlarını değiştirmek üzere kullanılır (örneğin ülkenizle ilgili özellikler).
SetupDescription4=<b>Ayarlar->Modüller<b> menüsündeki parametreler gereklidir, çünkü Dolibarr sabit bir ERP/CRM olmayıp bir çok modülden oluşan, daha çoğuna ya da daha azına bağımlıdır. Ancak istediğiniz modülleri etkinleştirdikten sonra özellikleri menülerde görebilirsiniz.
SetupDescription5=Diğer menü girişleri ile isteğe bağlı parametreleri yönetebilirsiniz.
-EventsSetup=Eylem günlükleri kurulumu
-LogEvents=Güvenlik denetimi eylemleri
+EventsSetup=Etkinlik günlükleri kurulumu
+LogEvents=Güvenlik denetimi etkinlikleri
Audit=Denetim
InfoDolibarr=Dolibarr bilgileri
InfoBrowser=Tarayıcı bilgileri
@@ -940,10 +940,10 @@ InfoPHP=PHP bilgileri
InfoPerf=Bilgi performansları
BrowserName=Tarayıcı adı
BrowserOS=Tarayıcı OS
-ListEvents=Denetim eylemleri
-ListOfSecurityEvents=Dolibarr güvenlik eylemleri listesi
-SecurityEventsPurged=Güvenlik eylemleri temizlendi
-LogEventDesc=Burada Dolibarr güvenlik eylemleri için günlük etkinleştirebilirsiniz. Yöneticiler sonra <b>Sistem araçları->Denetim</b> menüsünden içeriği görebilir. Uyarı, bu özellik veritabanında büyük miktarda veri tüketebilir.
+ListEvents=Denetim etkinlikler
+ListOfSecurityEvents=Dolibarr güvenlik etkinlikleri listesi
+SecurityEventsPurged=Güvenlik etkinlikleri temizlendi
+LogEventDesc=Burada Dolibarr güvenlik etkinlikleri için günlük etkinleştirebilirsiniz. Yöneticiler sonra <b>Sistem araçları->Denetim</b> menüsünden içeriği görebilir. Uyarı, bu özellik veritabanında büyük miktarda veri tüketebilir.
AreaForAdminOnly=Bu özellikler yalnız <b>yönetici kullanıcılar</b> tarafından kullanılabilir.
SystemInfoDesc=Sistem bilgileri sadece okuma modunda ve yöneticiler için görüntülenen çeşitli teknik bilgilerdir.
SystemAreaForAdminOnly=Bu alan yalnız yönetici kullanıcılar için kullanılabilir. Hiçbir Dolibarr izini bu sınırı azaltamaz.
@@ -954,7 +954,7 @@ ToActivateModule=Modülleri etkinleştirmek için, ayarlar alanına gidin (Giri
SessionTimeOut=Oturum için zaman aşımı
SessionExplanation=Bu sayı oturumun bu gecikmeden önce asla sona ermeyeceğini garanti eder. Ama PHP oturum yönetimi, oturumun her zaman bu gecikmeden sonra sona ereceğini garanti etmez: Bu önbellek temizleme oturumu çalışıyor ise meydana gelir.<br>Not: hiçbir belirli sistem ile iç PHP süreci her <b>%s</b> erişiminde oturumu temizlemeyecektir ancak erişim diğer oturumlar tarafından yapılan yapılırsa temizlenir.
TriggersAvailable=Mevcut tetikleyiciler
-TriggersDesc=Tetikleyiciler <b>htdocs/core/triggers</b> dizinine kopyalandığında Dolibarr’ın iş akışının davranışlarını değiştirecek dosyalardır. Dolibarr eylemlerinde etkinleştirilen (yeni firma oluşturma, fatura doğrulaması,…) yeni eylemleri gerçekleştirir.
+TriggersDesc=Tetikleyiciler <b>htdocs/core/triggers</b> dizinine kopyalandığında Dolibarr’ın iş akışının davranışlarını değiştirecek dosyalardır. Dolibarr etkinliklerinde etkinleştirilen (yeni firma oluşturma, fatura doğrulaması,…) yeni eylemleri gerçekleştirir.
TriggerDisabledByName=Bu dosyadaki tetikleyiciler adlarındaki <b>-NORUN</b> soneki tarafından devre dışı bırakılır.
TriggerDisabledAsModuleDisabled=Bu dosyadaki tetikleyiciler <b>%s</b> modülü devre dışı bırakıldığında devre dışı kalır.
TriggerAlwaysActive=Bu dosyadaki tetikleyiciler, etkin Dolibarr modülleri ne olursa olsun her zaman etkindir.
@@ -974,8 +974,8 @@ MAIN_ROUNDING_RULE_TOT= Yuvarlama aralığı Boyutu (nadir ülkelerde 10 tabanı
UnitPriceOfProduct=Bir ürünün net birim fiyatı
TotalPriceAfterRounding=Yuvarlama sonrası toplam fiyat (net/KDV/vergi dahil)
ParameterActiveForNextInputOnly=Yalnız sonraki giriş için etkili Parametre
-NoEventOrNoAuditSetup=Hiçbir güvenlik eylemi henüz kaydedilmedi. Eğer “kurulum - güvenlik – denetim” sayfasında denetim etkinleştirilmemiş ise bu normal olabilir.
-NoEventFoundWithCriteria=Bu arama kriteri için herhangi bir güvenlik eylemi bulunamadı.
+NoEventOrNoAuditSetup=Hiçbir güvenlik etkinliği henüz kaydedilmedi. Eğer “kurulum - güvenlik – denetim” sayfasında denetim etkinleştirilmemiş ise bu normal olabilir.
+NoEventFoundWithCriteria=Bu arama kriteri için herhangi bir güvenlik etkinliği bulunamadı.
SeeLocalSendMailSetup=Yerel postagönder kurulumunuza bakın
BackupDesc=Tam bir Dolibarr yedeklemesi için şunları yapmalısınız:
BackupDesc2=* Gönderilen ve oluşturulan dosyaları içeren (<b>%s</b>) belge dizinin içeriğini kaydedin(örneğin bir zip dosyası yapabilirsiniz).
@@ -998,7 +998,7 @@ SimpleNumRefModelDesc=Referans sayısını %syymm-nnnn biçimi ile girin; yy yı
ShowProfIdInAddress=Belgelerde uzmanlık kimliğini adresleri ile birlikte göster
ShowVATIntaInAddress=Belgelerde adresli KDV Intra numaralarını gizle
TranslationUncomplete=Kısmi çeviri
-SomeTranslationAreUncomplete=Bazı diller kısmi olarak çevrilebilir ya da hatalar içeriyor olabilir. Eğer bazılarını belirlerseniz, dil dosyalarını buraya kayıt ederek düzeltebilirsiniz <a href="http://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Bazı diller kısmi olarak çevrilmiş ya da hatalar içeriyor olabilir. Bazılarını belirlerseniz, dil dosyalarını buraya kayıt ederek düzeltebilirsiniz <a href="http://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
MenuUseLayout=Dikey menüyü gizlenebilir yap (javascript seçeneği devre dışı olmamalıdır)
MAIN_DISABLE_METEO=Meteo görünümünü engelle
TestLoginToAPI=API giriş testi
@@ -1039,7 +1039,6 @@ YesInSummer=Yazın evet
OnlyFollowingModulesAreOpenedToExternalUsers=Not, yalnızca aşağıdaki modüller dış kullanıcılara açıktır (bu tür kullanıcıların izinleri ne olursa olsun):
SuhosinSessionEncrypt=Oturum depolaması Suhosin tarafından şifrelendi
ConditionIsCurrently=Koşul şu anda %s durumunda
-TestNotPossibleWithCurrentBrowsers=\t\nOtomatik algılama olası değil
YouUseBestDriver=Kullandığınız sürücü %s şu anda en iyi sürücüdür.
YouDoNotUseBestDriver=Kullandığınız %s sürücüsüdür, %s sürücüsü önerilir.
NbOfProductIsLowerThanNoPb=Veritabanında yalnızca %s ürün/hizmet var. Bu, herhangi bir optimizasyon gerektirmez.
@@ -1139,6 +1138,7 @@ AddDeliveryAddressAbility=Teslim tarihi özelliği ekle
UseOptionLineIfNoQuantity=Sıfır tutarında olan ürün/hizmet satırını bir seçenek olarak kabul et
FreeLegalTextOnProposal=Teklifler üzerinde serbest metin
WatermarkOnDraftProposal=Taslak tekliflerde filigran (boşsa yoktur)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=Sipariş yönetimi kurulumu
OrdersNumberingModules=Sipariş numaralandırma modülü
@@ -1160,7 +1160,7 @@ FicheinterNumberingModules=Müdahale numaralandırma modülü
TemplatePDFInterventions=Müdahale kartı belgesi modelleri
WatermarkOnDraftInterventionCards=Taslak müdahale kartı belgelerinde filigran (boşsa yoktur)
##### Contracts #####
-ContractsSetup=Sözleşme modülü kurulumu
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=Sözleşme numaralandırma modülleri
TemplatePDFContracts=Sözleşme belge modelleri
FreeLegalTextOnContracts=Sözleşmeler üzerinde serbest metin
@@ -1324,7 +1324,7 @@ FilesOfTypeNotCompressed=%s türündeki dosyalar HTTP sunucusu tarafından sık
CacheByServer=Sunucu önbelleği
CacheByClient=Tarayıcı önbelleği
CompressionOfResources=HTTP yanıtlarının sıkıştırılması
-TestNotPossibleWithCurrentBrowsers=\t\nOtomatik algılama olası değil
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=Ürünler modülü kurulumu
ServiceSetup=Hizmetler modülü kurulumu
@@ -1373,7 +1373,7 @@ GenbarcodeLocation=Bar kod oluşturma komut satırı aracı (phpbarcode motoru t
BarcodeInternalEngine=İç motor
BarCodeNumberManager=Barkod sayılarını otomatik olarak tanımlayacak yönetici
##### Prelevements #####
-WithdrawalsSetup=Çekme modülü kurulumu
+WithdrawalsSetup=Para çekme modülü kurulumu
##### ExternalRSS #####
ExternalRSSSetup=Dışardan RSS alma kurulumu
NewRSS=Yeni RSS beslemesi
@@ -1415,8 +1415,9 @@ OSCommerceTestOk='%s' Sunucusuna '%s' veritabanında kullanıcı '% s' ile bağl
OSCommerceTestKo1='%s' Sunucusuna bağlantı başarılı ancak veritabanı '% s' e ulaşılamadı.
OSCommerceTestKo2=’%s’ Sunucusuna ‘%s’ kullanıcısı ile bağlantı başarısız oldu.
##### Stock #####
-StockSetup=Yapılandırma modülü stoğu
-UserWarehouse=Kullanıcı personel stoğu kullan
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=Menü silindi
TreeMenu=Ağaç menüler
@@ -1469,9 +1470,9 @@ AccountancyCode=Muhasebe Kodu
AccountancyCodeSell=Satış hesap. kodu
AccountancyCodeBuy=Alış hesap. kodu
##### Agenda #####
-AgendaSetup=Eylem ve gündem modülü kurulumu
+AgendaSetup=Etkinlik ve gündem modülü kurulumu
PasswordTogetVCalExport=Verme bağlantısı yetki anahtarı
-PastDelayVCalExport=Daha büyük eylemi dışaaktarma
+PastDelayVCalExport=Bundan daha büyük etkinliği dışaaktarma
AGENDA_USE_EVENT_TYPE=Etkinlik türlerini kullan (Ayarlar -> Sözlük -> Gündem etkinlik türleri) menüsünden yönetilir
AGENDA_DEFAULT_FILTER_TYPE=Gündem görünümü arama süzgeçinde, etkinlikler için otomatik olarak bu etkinlik türünü ayarlar
AGENDA_DEFAULT_FILTER_STATUS=Gündem görünümü arama süzgeçinde, etkinlikler için otomatik olarak bu durum türünü ayarlar
@@ -1481,11 +1482,14 @@ ClickToDialDesc=Bu modül, telefon numaraları ardına bir simge eklemenizi sağ
##### Point Of Sales (CashDesk) #####
CashDesk=Satış Noktası
CashDeskSetup=Satış Noktası kurulum modülü
-CashDeskThirdPartyForSell=Satışlar için kullanılan genel bir üçüncü parti
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Nakit ödemeleri almak için kullanılan varsayılan hesap
CashDeskBankAccountForCheque= Ödemeleri çek ile almak için kullanılan varsayılan hesap
CashDeskBankAccountForCB= Nakit ödemeleri kredi kartıyla almak için kullanılan varsayılan hesap
-CashDeskIdWareHouse=Satışlar için kullanılan depo
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Yerimi modülü kurulumu
BookmarkDesc=Bu modül yerimlerini yönetmenize olanak sağlar. Ayrıca, soldaki menüden herhangi Dolibarr sayfaları veya dış web siteleri için kısayollar ekleyebilirsiniz.
@@ -1539,6 +1543,13 @@ ConfirmDeleteFiscalYear=Bu mali yılın silmek istediğinizden emin misiniz?
Opened=Açık
Closed=Kapalı
AlwaysEditable=Her zaman düzenlenebilir
-
+MAIN_APPLICATION_TITLE=Uygulamanın görünür adına zorla (uyarı: burada kendi adınızı ayarlamanız, DoliDoid mobil uygulamasını kullanırken, kullanıcı adını oto doldur özelliğini durdurabilir)
+NbMajMin=Enaz sayıdaki büyük harf karakteri
+NbNumMin=Enaz sayıdaki sayısal karakterler
+NbSpeMin=Enaz sayıdaki özel karakterler
+NbIteConsecutive=Ençok sayıdaki tekrarlanan aynı karakter
+NoAmbiCaracAutoGeneration=Otomatik oluşturma için belirsiz karakter ("1","l","i","|","0","O") kullanmayın
+SalariesSetup=Ücretler Modülü Ayarları
+SortOrder=Sıralama düzeni
Format=Biçim
TypePaymentDesc=0:Müşteri ödeme türü, 1:Tedarikçi ödeme türü, 2:Hem müşteri hem de tedarikçi ödeme türü
diff --git a/htdocs/langs/tr_TR/agenda.lang b/htdocs/langs/tr_TR/agenda.lang
index ca20ca270f0337014186ad7b5cd89897594a600c..18a36d5b8d390e9b805cb2f9955981f4d76c65b6 100644
--- a/htdocs/langs/tr_TR/agenda.lang
+++ b/htdocs/langs/tr_TR/agenda.lang
@@ -18,11 +18,11 @@ OtherEvents=Diğer etkinlikler
ListOfActions=Etkinlik listesi
Location=Konum
EventOnFullDay=Tam gün etkinliği
-SearchAnAction= Bir eylem/görev ara
-MenuToDoActions=Tüm sonlanmayan eylemler
-MenuDoneActions=Tüm sonlanan eylemler
-MenuToDoMyActions=Sonlanmayan eylemlerim
-MenuDoneMyActions=Sonlanan eylemlerim
+SearchAnAction= Bir etkinlik/görev ara
+MenuToDoActions=Tüm sonlanmayan etkinlikler
+MenuDoneActions=Tüm sonlanan etkinlikler
+MenuToDoMyActions=Sonlanmayan etkinliklerim
+MenuDoneMyActions=Sonlanan etkinliklerim
ListOfEvents=Etkinlik listesi (iç takvim)
ActionsAskedBy=Etkinliği bildiren
ActionsToDoBy=Etkinlikten etkilenen
@@ -30,7 +30,7 @@ ActionsDoneBy=Etkinliği yapan
ActionsForUser=Kullanıcı etkinlikleri
ActionsForUsersGroup=Grupun tüm üyelerine ait etkinlikler
AllMyActions= Tüm etkinliklerim/görevlerim
-AllActions= Tüm eylemler/görevler
+AllActions= Tüm etkinlikler/görevler
ViewList=Liste görünümü
ViewCal=Ay görünümü
ViewDay=Gün görünümü
@@ -41,9 +41,10 @@ AutoActions= Gündemin otomatik doldurulması
AgendaAutoActionDesc= Burada Dolibarr'ın otomatik olarak gündemde oluşturmasını istediğiniz etkinlikleri tanımlayın. İşaretli bir şey yoksa (varsayılan olarak) sadece el ile girilen etkinlikler gündeme dahil edilecektir.
AgendaSetupOtherDesc= Bu sayfa Dolibarr etkinliklerinin dış bir takvime aktarılması için seçenekler sağlar. (thunderbird, google calendar, ...)
AgendaExtSitesDesc=Bu sayfa takvimlerin dış kaynaklarında Dolibarr gündemindeki etkinliklerinin görünmesini sağlar.
-ActionsEvents= Dolibarr'ın otomatik olarak gündemde bir etkinlik oluşturacağı eylemler
-PropalValidatedInDolibarr= %s Teklifi doğrulandı
-InvoiceValidatedInDolibarr= %s Faturası doğrulandı
+ActionsEvents=Dolibarr'ın otomatik olarak gündemde bir etkinlik oluşturacağı eylemler
+PropalValidatedInDolibarr=%s Teklifi doğrulandı
+InvoiceValidatedInDolibarr=%s Faturası doğrulandı
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=%s Faturasını taslak durumuna geri götür
InvoiceDeleteDolibarr=%s faturası silindi
OrderValidatedInDolibarr= %s Siparişi doğrulandı
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=%s Siparişi onayladı
OrderRefusedInDolibarr=Reddedilen teklif %s
OrderBackToDraftInDolibarr=%s Siparişini taslak durumuna geri götür
OrderCanceledInDolibarr=%s Siparişi iptal edildi
-InterventionValidatedInDolibarr=%s Müdahalesi doğrulandı
ProposalSentByEMail=%s Teklifi Eposta ile gönderildi
OrderSentByEMail=%s Müşteri siparişi Eposta ile gönderildi
InvoiceSentByEMail=%s Müşteri faturası Eposta ile gönderildi
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=%s Tedarikçi siparişi Eposta ile gönderildi
SupplierInvoiceSentByEMail=%s Tedarikçi faturası Eposta ile gönderildi
ShippingSentByEMail=%s Sevkiyatı Eposta ile gönderildi
ShippingValidated= Nakliyat %s doğrulandı
-InterventionSentByEMail=%s Müdahalesi Eposta ile gönderildi
-InterventionClassifiedBilled=Müdahale %s Faturalandı olarak sınıflandırıldı
NewCompanyToDolibarr= Üçüncü parti oluşturuldu
DateActionPlannedStart= Planlanan başlangıç tarihi
DateActionPlannedEnd= Planlanan bitiş tarihi
diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang
index 47682da9ab25d3270916c895ce762dc31a100475..d855c5c73e3e5863bbb09c503ac797b4f70a1899 100644
--- a/htdocs/langs/tr_TR/bills.lang
+++ b/htdocs/langs/tr_TR/bills.lang
@@ -137,8 +137,6 @@ BillFrom=Kimden
BillTo=Kime
ActionsOnBill=Fatura üzerindeki eylemler
NewBill=Yeni fatura
-Prélèvements=Ödeme talimatı
-Prélèvements=Ödeme talimatı
LastBills=Son %s fatura
LastCustomersBills=Son %s müşteri faturası
LastSuppliersBills=Son %s tedarikçi faturası
@@ -219,8 +217,7 @@ NoInvoice=Fatura yok
ClassifyBill=Fatura sınıflandır
SupplierBillsToPay=Ödenecek tedarikçi faturaları
CustomerBillsUnpaid=Ödenmemiş müşteri faturaları
-DispenseMontantLettres=Mekanografik olarak tasarlanan fatura harf sırasının dışında tutulur
-DispenseMontantLettres=Mekanografik olarak tasarlanan fatura harf sırasının dışında tutulur
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=Kurtarılamaz
SetConditions=Ödeme koşullarını ayarla
SetMode=Ödeme biçimini ayarla
diff --git a/htdocs/langs/tr_TR/categories.lang b/htdocs/langs/tr_TR/categories.lang
index 1a4a2cce4e5c4000d6f38117ff9c15a7747a5faf..e440ab7c4f439c8ddfd8ade6b596c6fd8f065f55 100644
--- a/htdocs/langs/tr_TR/categories.lang
+++ b/htdocs/langs/tr_TR/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Tedarikçiler ve kategoriler arasındaki bağlantılar
CatCusLinks=Müşteriler/adaylar ve kategoriler arasındaki bağlantılar
CatProdLinks=Ürünler/hizmetler ve kategoriler arasındaki bağlantılar
CatMemberLinks=Üyeler ve kategoriler arasındaki bağlantılar
-CatProdLinks=Ürünler/hizmetler ve kategoriler arasındaki bağlantılar
-CatCusLinks=Müşteriler/adaylar ve kategoriler arasındaki bağlantılar
-CatSupLinks=Tedarikçiler ve kategoriler arasındaki bağlantılar
DeleteFromCat=Kategoriden kaldır
DeletePicture=Resim silindi
ConfirmDeletePicture=Resim silmeyi onayla
@@ -112,3 +109,4 @@ CategoriesSetup=Kategori ayarları
CategorieRecursiv=Ana kategoriyle otomatik bağlantılı
CategorieRecursivHelp=Etkinse, ürün bir alt kategoriye eklenirken aynı zamanda ana kategoriye de eklenecektir
AddProductServiceIntoCategory=Aşağıdaki ürünü/hizmeti ekle
+ShowCategory=Kategori göster
diff --git a/htdocs/langs/tr_TR/compta.lang b/htdocs/langs/tr_TR/compta.lang
index 7101f169e35f12ec8df0a2554a080315d1dac875..a97057a7824653a41e9c95563b90735477818740 100644
--- a/htdocs/langs/tr_TR/compta.lang
+++ b/htdocs/langs/tr_TR/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=%s için hatalı müşteri muhasebe kodu
SuppliersProductsSellSalesTurnover=Tedarikçi ürünlerinin satışından oluşan ciro.
CheckReceipt=Çek hesabı
CheckReceiptShort=Çek hesabı
+LastCheckReceiptShort=Son %s çek makbuzu
NewCheckReceipt=Yeni indirim
NewCheckDeposit=Yeni çek hesabı
NewCheckDepositOn=Bu hesap için makbuz oluştur: %s
diff --git a/htdocs/langs/tr_TR/contracts.lang b/htdocs/langs/tr_TR/contracts.lang
index fcc10813061918d796679eeadd43860ad539aff6..7a4c4151b2ffc60cbd1986025c08a7345e33a9ce 100644
--- a/htdocs/langs/tr_TR/contracts.lang
+++ b/htdocs/langs/tr_TR/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Sözleşmeler alanı
ListOfContracts=Sözleşme Listesi
-LastContracts=Değiştirilen son %s sözleşme
+LastModifiedContracts=Last %s modified contracts
AllContracts=Bütün sözleşmeler
ContractCard=Sözleşme kartı
ContractStatus=Sözleşme durumu
@@ -28,7 +28,7 @@ MenuExpiredServices=Süresi dolmuş hizmetler
MenuClosedServices=Kapalı hizmetler
NewContract=Yeni sözleşme
AddContract=Sözleşme oluştur
-SearchAContract=Bir sözleşme ara
+SearchAContract=Sözleşme ara
DeleteAContract=Bir sözleşme sil
CloseAContract=Bir sözleşme kapat
ConfirmDeleteAContract=Bu sözleşme ve bütün hizmetlerini silmek istediğinize emin misiniz?
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Yürürlükte olan hizmet kalemleri
ListOfRunningServices=Yürürlükteki hizmetler listesi
NotActivatedServices=Etkin olmayan hizmetler (doğrulanmış sözleşmeler arasından)
BoardNotActivatedServices=Doğrulanmış sözleşmelerden etkinleştirilecek hizmetler
-LastContracts=Değiştirilen son %s sözleşme
+LastContracts=Last % contracts
LastActivatedServices=Etkinleştirilen son %s hizmet
LastModifiedServices=Değiştirilen son %s hizmet
EditServiceLine=Hizmet kalemi düzenle
diff --git a/htdocs/langs/tr_TR/cron.lang b/htdocs/langs/tr_TR/cron.lang
index 0a6fe0bcc538c34519e7944a496db25323cd2c0f..f2fe6338f23579971d1951c740361d8524d4f8cf 100644
--- a/htdocs/langs/tr_TR/cron.lang
+++ b/htdocs/langs/tr_TR/cron.lang
@@ -18,9 +18,8 @@ CronExplainHowToRunUnix=Unix ortamında her dakika Komut satırını çalıştı
CronExplainHowToRunWin=Microsoft (tm) Windows ortamında her dakika Komut satırı çalıştırmak için Planlı görev araçlarını kullanabilirsiniz
# Menu
CronJobs=Planlı işler
-CronListActive= Etkin işler listesi
-CronListInactive= Etkin olmayan işler listesi
-CronListActive= Etkin işler listesi
+CronListActive=List of active/scheduled jobs
+CronListInactive=Etkin olmayan işler listesi
# Page list
CronDateLastRun=Son çalıştırma
CronLastOutput=Son çalıştırma çıktısı
diff --git a/htdocs/langs/tr_TR/donations.lang b/htdocs/langs/tr_TR/donations.lang
index 0740b8dcd07f73d475bc4c3b6e1742f260ceb934..234a7e4c859eb7c8b8cf8044024d37f5fbb5116a 100644
--- a/htdocs/langs/tr_TR/donations.lang
+++ b/htdocs/langs/tr_TR/donations.lang
@@ -31,3 +31,8 @@ DonationRecipient=Bağış alıcısı
ThankYou=Teşekkürler
IConfirmDonationReception=Alıcı, bağış olarak aşağıdaki tutarı aldığını belirtir
MinimumAmount=Enaz miktar %s
+FreeTextOnDonations=Sayfa altında gösterilecek serbest metin
+FrenchOptions=Fransa için seçenekler
+DONATION_ART200=Eğer ilgileniyorsanız CGI den 200 öğe göster
+DONATION_ART238=Eğer ilgileniyorsanız CGI den 238 öğe göster
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/tr_TR/externalsite.lang b/htdocs/langs/tr_TR/externalsite.lang
index 26f99f18a755ced228cd0e138e8ff3ec6c9b99db..9fa0dc6fbabd2dfa59611580e94da1dad0872c20 100644
--- a/htdocs/langs/tr_TR/externalsite.lang
+++ b/htdocs/langs/tr_TR/externalsite.lang
@@ -2,3 +2,4 @@
ExternalSiteSetup=Dış Web Sitesi ayarları
ExternalSiteURL=Dış Web Sitesi URL si
ExternalSiteModuleNotComplete=Dış Web Sitesi modülü doğru yapılandırılmamış.
+ExampleMyMenuEntry=Menüme giriş
diff --git a/htdocs/langs/tr_TR/holiday.lang b/htdocs/langs/tr_TR/holiday.lang
index 0d918690ab68b328678164bb1cd46318fdfd69a5..7dbeba5d8593b341955b53f423e218f1496f17e4 100644
--- a/htdocs/langs/tr_TR/holiday.lang
+++ b/htdocs/langs/tr_TR/holiday.lang
@@ -48,7 +48,6 @@ ConfirmDeleteCP=Bu izin isteğinin silinmesini onaylıyor musunuz?
ErrorCantDeleteCP=Hata, bu izin isteğini silmek için yetkiniz yok.
CantCreateCP=İzin isteği yapmak için yetkiniz yok.
InvalidValidatorCP=İzin isteğiniz için bir onaylayıcı seçmelisiniz.
-UpdateButtonCP=Güncelle
CantUpdate=Bu izin isteğini güncelleyemezsiniz.
NoDateDebut=Bir başlama tarihi seçmelisiniz.
NoDateFin=Bir bitiş tarihi seçmelisiniz.
@@ -112,7 +111,7 @@ ValidEventCP=Doğrula
UpdateEventCP=Etkinlikleri güncelle
CreateEventCP=Oluştur
NameEventCP=Etkinlik adı
-OkCreateEventCP=The addition of the event went well.
+OkCreateEventCP=Etkinlik eklemesi başarılı oldu.
ErrorCreateEventCP=Etkinlik oluştururken hata.
UpdateEventOkCP=Etkinlik güncellemesi iyi gitti.
ErrorUpdateEventCP=Etkinlik güncellenirken hata oluştu.
diff --git a/htdocs/langs/tr_TR/interventions.lang b/htdocs/langs/tr_TR/interventions.lang
index 3fd1d2086a0998960395fc4f888f6d62c0281395..0202aa11bfd44b8d4c57523a26878bc2e6d7563e 100644
--- a/htdocs/langs/tr_TR/interventions.lang
+++ b/htdocs/langs/tr_TR/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Müdahale
Interventions=Müdahaleler
InterventionCard=Müdahale kartı
NewIntervention=Yeni müdahale
-AddIntervention=Müdahale ekle
+AddIntervention=Müdahale oluştur
ListOfInterventions=Müdahaleler listesi
EditIntervention=Müdahale düzenle
ActionsOnFicheInter=Müdahale eylemleri
@@ -24,12 +24,21 @@ NameAndSignatureOfInternalContact=Müdahilin adı ve imzası :
NameAndSignatureOfExternalContact=Müşterinin adı ve imzası :
DocumentModelStandard=Müdahaleler için standart belge modeli
InterventionCardsAndInterventionLines=Müdahalelere ait müdahaleler ve satırları
-InterventionClassifyBilled=Classify "Billed"
-InterventionClassifyUnBilled=Classify "Unbilled"
+InterventionClassifyBilled=Sınıflandırma "Faturalandı"
+InterventionClassifyUnBilled=Sınıflandırma "Faturalanmadı"
StatusInterInvoiced=Faturalanmış
RelatedInterventions=İlgili müdahaleler
ShowIntervention=Müdahale göster
SendInterventionRef=%s müdahalesinin sunulması
+SendInterventionByMail=Müdahaleyi Eposta ile gönder
+InterventionCreatedInDolibarr=Oluşturulan müdahale %s
+InterventionValidatedInDolibarr=Doğrulanan müdahale %s
+InterventionModifiedInDolibarr=Değiştirilen müdahale %s
+InterventionClassifiedBilledInDolibarr=Faturalandı olarak ayarlanan müdahale %s
+InterventionClassifiedUnbilledInDolibarr=Faturalanmadı olarak ayarlanan müdahale %s
+InterventionSentByEMail=Eposta ile gönderilen müdahale %s
+InterventionDeletedInDolibarr=Silinen müdahale %s
+SearchAnIntervention=Müdahale ara
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Müdahale izleme temsilcisi
TypeContact_fichinter_internal_INTERVENING=Müdahalede
diff --git a/htdocs/langs/tr_TR/mails.lang b/htdocs/langs/tr_TR/mails.lang
index a6086f765c219373a1361e4383afc99c0dc56dbf..9210e6a384d6839102b414f49a2680d116628b51 100644
--- a/htdocs/langs/tr_TR/mails.lang
+++ b/htdocs/langs/tr_TR/mails.lang
@@ -53,7 +53,7 @@ ConfirmValidMailing=Bu epostayı doğrulamak istediğinizden emin misiniz?
ConfirmResetMailing=Uyarı, Bu <b>%s</b> Epostasını yeniden başlatarak, bu Epostanın toplu gönderiminin başka bir zaman yapılmasını sağlarsınız. Bunu yapmak istediğinizden emin misiniz?
ConfirmDeleteMailing=Bu Epostayı silmek istediğinizden emin misiniz?
NbOfRecipients=Alıcı sayısı
-NbOfUniqueEMails=Eşsiz e-posta sayısı
+NbOfUniqueEMails=Benzersiz eposta sayısı
NbOfEMails=Eposta sayısı
TotalNbOfDistinctRecipients=Farklı alıcıların sayısı
NoTargetYet=Henüz hiç bir alıcı tanımlanmadı (‘Alıcılar’ sekmesine gidin)
@@ -106,7 +106,7 @@ MailSelectedRecipients=Seçilen alıcılar
MailingArea=Eposta alanı
LastMailings=Son %s eposta
TargetsStatistics=Hedef istatistikleri
-NbOfCompaniesContacts=Şirketlerin eşsiz kişileri
+NbOfCompaniesContacts=Benzersiz kişiler/adresler
MailNoChangePossible=Doğrulanmış epostaların alıcıları değiştirilemez
SearchAMailing=Eposta ara
SendMailing=E-posta gönder
@@ -115,7 +115,7 @@ SentBy=Gönderen
MailingNeedCommand=Güvenlik nedeni ile, Eposta gönderiminin komut satırından yapılması daha iyidir. Bütün posta alıcılarına eposta göndermek için sunucu yönetcisinden aşağıdaki komutu başlatmasını isteyin:
MailingNeedCommand2=Bunula birlikte, oturum tarafından gönderilecek ençok Eposta sayılı MAILING_LIMIT_SENDBYWEB parametresini ekleyerek çevrim içi olarak gönderebilirsiniz. Bunu için Giriş-Kurulum-Diğer menüsüne gidin.
ConfirmSendingEmailing=Eğer www tarayıcınız ile gönderemiyor ya da yeğlemiyorsanız, lütfen kendi tarayıcınızdan eposta göndermek istediğinizden emin olduğunuzu onaylayın.
-LimitSendingEmailing=Not: Epostaların çevrimiçi gönderimi güvenlik ve süre aşımı nedenleriyle gönderme oturumu tarafından <b>%s</b> kadar alıcıyla sınırlandırılmıştır.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=Listeyi temizle
ToClearAllRecipientsClickHere=Bu e-posta Alıcı listesini temizlemek için burayı tıkla
ToAddRecipientsChooseHere=Listeden seçerek alıcıları ekle
@@ -130,9 +130,12 @@ TagSignature=Gönderen kullanıcı imzası
TagMailtoEmail=Alıcı epostası
# Module Notifications
Notifications=Bildirimler
-NoNotificationsWillBeSent=Bu eylem ve firma için hiçbir Eposta bildirimi planlanmamış
+NoNotificationsWillBeSent=Bu etkinlik ve firma için hiçbir Eposta bildirimi planlanmamış
ANotificationsWillBeSent=Eposta ile 1 bildirim gönderilecektir
SomeNotificationsWillBeSent=Epostayala %s bildirim gönderilecektir
AddNewNotification=Yeni bir eposta bildirim hedefi etkinleştir
ListOfActiveNotifications=Bütün etkin eposta bildirim hedeflerini listele
ListOfNotificationsDone=Gönderilen tüm e-posta bildirimleri listesi
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang
index a8cd3f0fd1bda6f50bc3aa79dcb421bdd19e40d1..c475724245bd12e3667895b9956e323ae131cd38 100644
--- a/htdocs/langs/tr_TR/main.lang
+++ b/htdocs/langs/tr_TR/main.lang
@@ -7,7 +7,7 @@ DIRECTION=ltr
FONTFORPDF=DejaVuSans
FONTSIZEFORPDF=8
SeparatorDecimal=,
-SeparatorThousand=None
+SeparatorThousand=.
FormatDateShort=%d/%m/%Y
FormatDateShortInput=%d/%m/%Y
FormatDateShortJava=dd/MM/yyyy
@@ -60,7 +60,7 @@ ErrorNoSocialContributionForSellerCountry=Hata, ülke %s için herhangi bir sosy
ErrorFailedToSaveFile=Hata, dosya kaydedilemedi.
SetDate=Ayar tarihi
SelectDate=Bir tarih seç
-SeeAlso=See also %s
+SeeAlso=Buna da bakın %s
BackgroundColorByDefault=Varsayılan arkaplan rengi
FileNotUploaded=Dosya yüklenmemiş
FileUploaded=Dosya yüklemesi başarılı
@@ -74,7 +74,7 @@ LevelOfFeature=Özellik düzeyleri
NotDefined=Tanımlanmamış
DefinedAndHasThisValue=Tanımlanmış ve şuna değer atanmıştır
IsNotDefined=tanımlanmamış
-DolibarrInHttpAuthenticationSoPasswordUseless=Yapılandırma dosyası <b>conf.php</b>da Dolibarr kimlik doğrulama modu <b>%s</b> a ayarlanmıştır.<br>Bu demektir ki; veritabanı parolası Dolibarr dışıdır, yani bu alanı değiştirmek hiçbir etki yaratmaz.
+DolibarrInHttpAuthenticationSoPasswordUseless=Yapılandırma dosyası <b>conf.php</b> içinde Dolibarr kimlik doğrulama modu buna <b>%s</b> ayarlanmıştır.<br>Bu demektir ki; veritabanı parolası Dolibarr dışıdır, yani bu alanı değiştirmek hiçbir etki yaratmaz.
Administrator=Yönetici
Undefined=Tanımlanmamış
PasswordForgotten=Parolanızı mı unuttunuz?
@@ -126,12 +126,12 @@ Disabled=Engelli
Add=Ekle
AddLink=Bağlantı ekle
Update=Güncelle
-AddActionToDo=Yapılacak eylem ekle
-AddActionDone=Bitmiş eylem ekle
+AddActionToDo=Yapılacak etkinlik ekle
+AddActionDone=Bitmiş etkinlik ekle
Close=Kapat
Close2=Kapat
Confirm=Onayla
-ConfirmSendCardByMail=Gerçekten bu kartı posta ile <b>%s</b> a göndermek istiyor musunuz?
+ConfirmSendCardByMail=Gerçekten bu kartı posta ile buna <b>%s</b> göndermek istiyor musunuz?
Delete=Sil
Remove=Kaldır
Resiliate=Sonlandır
@@ -349,8 +349,8 @@ RefPayment=Ref. ödeme
CommercialProposalsShort=Teklifler
Comment=Açıklama
Comments=Açıklamalar
-ActionsToDo=Yapılacak eylemler
-ActionsDone=Biten eylemler
+ActionsToDo=Yapılacak etkinlikler
+ActionsDone=Biten etkinlikler
ActionsToDoShort=Yapılacaklar
ActionsRunningshort=Başladı
ActionsDoneShort=Yapıldı
@@ -363,10 +363,11 @@ CompanyFoundation=Firma/Dernek
ContactsForCompany=Bu üçüncü partinin kişileri
ContactsAddressesForCompany=Bu üçüncü partinin kişleri/adresleri
AddressesForCompany=Bu üçüncü partinin adresleri
-ActionsOnCompany=Bu üçüncü parti hakkındaki eylemler
-ActionsOnMember=Bu üye hakkındaki eylemler
-NActions=%s eylemleri
+ActionsOnCompany=Bu üçüncü parti hakkındaki etkinlikler
+ActionsOnMember=Bu üye hakkındaki etkinlikler
+NActions=%s etkinlikleri
NActionsLate=%s son
+RequestAlreadyDone=İstek zaten kayıtlı
Filter=Süzgeç
RemoveFilter=Süzgeç kaldır
ChartGenerated=Grafik oluşturuldu
@@ -672,7 +673,7 @@ from=itibaren
toward=yönünde
Access=Erişim
HelpCopyToClipboard=Panoya kopyalamak için Crtl+C
-SaveUploadedFileWithMask=Dosyayı sunucuya "<strong>%s</strong>" (aksi durumda "%s") adıyla kaydedin
+SaveUploadedFileWithMask=Dosyayı "<strong>%s</strong>" adlı sunucuya kaydedin (aksi durumda "%s")
OriginFileName=Özgün dosya adı
SetDemandReason=Kaynağı ayarlayın
SetBankAccount=Banka Hesabı Tanımla
diff --git a/htdocs/langs/tr_TR/margins.lang b/htdocs/langs/tr_TR/margins.lang
index f8b7865faf400dc8518602c0ec31b33be559d5ac..26da20b82a5a3730de0bba44357a7815c8e5bef9 100644
--- a/htdocs/langs/tr_TR/margins.lang
+++ b/htdocs/langs/tr_TR/margins.lang
@@ -41,3 +41,4 @@ AgentContactType=Ticari temsilci ilgili tipi
AgentContactTypeDetails=Satış temsilcisine göre oran raporu için kullanılacak kişi türünü (faturala bağlantılı) tanımla
rateMustBeNumeric=Oran sayısal bir değer olmalı
markRateShouldBeLesserThan100=İşaretli oran 100 den daha düşük olmalı
+ShowMarginInfos=Oran bilgisi göster
diff --git a/htdocs/langs/tr_TR/orders.lang b/htdocs/langs/tr_TR/orders.lang
index 5e2770ce8e74e3b91937444c93d46773756c9019..26268de14f19aec2a65ed2d9c7be98615c9837ed 100644
--- a/htdocs/langs/tr_TR/orders.lang
+++ b/htdocs/langs/tr_TR/orders.lang
@@ -53,7 +53,7 @@ ShippingExist=Bir sevkiyat var
DraftOrWaitingApproved=Taslak veya onaylanmış henüz sipariş verilmemiş
DraftOrWaitingShipped=Taslak veya onaylanmış henüz sevkedilmemiş
MenuOrdersToBill=Teslim edilen siparişler
-MenuOrdersToBill2=Faturalanacak siparişler
+MenuOrdersToBill2=Billable orders
SearchOrder=Sipariş ara
SearchACustomerOrder=Müşteri siparişi ara
ShipProduct=Ürünü sevket
@@ -96,14 +96,14 @@ GenerateBill=Fatura oluştur
ClassifyShipped=Teslim edildi sınıflandır
ClassifyBilled=Faturalı olarak sınıflandır
ComptaCard=Muhasebe kartı
-DraftOrders=Taslak sipariş
+DraftOrders=Taslak siparişler
RelatedOrders=İlgili siparişler
OnProcessOrders=İşlemdeki siparişler
RefOrder=Sipariş ref.
RefCustomerOrder=Müşteri sipariş ref.
RefCustomerOrderShort=Müşt. Sipariş ref.
SendOrderByMail=Siparişi postayla gönder
-ActionsOnOrder=Sipariş eylemleri
+ActionsOnOrder=Sipariş etkinlikleri
NoArticleOfTypeProduct='ürün' türünde herhangi bir madde olmadığından bu sipariş için sevkedilebilir madde yok
OrderMode=Sipariş yöntemi
AuthorRequest=Siparişi yazan
@@ -154,7 +154,6 @@ OrderByPhone=Telefon
CreateInvoiceForThisCustomer=Sipariş Faturala
NoOrdersToInvoice=Faturalanabilir sipariş yok
CloseProcessedOrdersAutomatically=Seçilen tüm siparişleri "İşlendi" olarak sınıflandır.
-MenuOrdersToBill2=Faturalanacak siparişler
OrderCreation=Sipariş oluşturma
Ordered=Sipariş verildi
OrderCreated=Siparişleriniz oluşturulmuştur
diff --git a/htdocs/langs/tr_TR/oscommerce.lang b/htdocs/langs/tr_TR/oscommerce.lang
deleted file mode 100644
index a4a6a26a3905f5e696e37b4faaead84cd856d32c..0000000000000000000000000000000000000000
--- a/htdocs/langs/tr_TR/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=OS Ticaret modülü kurulumu
-OSCommerceSetupSaved=OS Ticaret kurulumu kaydedildi
-OSCommerceServer=OS Ticaret Sunucusu host/ip
-OSCommerceDatabaseName=OS Ticaret veritabanı adı
-OSCommercePrefix=OS Ticaret tablo öneki
-OSCommerceUser=OS Ticaret veritabanı kullanıcı girişi
diff --git a/htdocs/langs/tr_TR/other.lang b/htdocs/langs/tr_TR/other.lang
index d0d2a5d3b2c5f7266afb18944d4ec62dd9a797fc..bb3087d5a36f48b7a8603eceb57568d97e3152c3 100644
--- a/htdocs/langs/tr_TR/other.lang
+++ b/htdocs/langs/tr_TR/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=Güvenlik kodu
Calendar=Takvim
-AddTrip=Gezi ekle
Tools=Araçlar
ToolsDesc=Bu alan diğer menü girişlerinde bulunmayan çeşitli araçların gruplandırılmasına ayrılmıştır.<br><br>O araçlara kenardaki menüden ulaşılabilir.
Birthday=Doğumgünü
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Proje oluşturma
Notify_TASK_CREATE=Görev oluşturuldu
Notify_TASK_MODIFY=Görev bilgileri değiştirildi
Notify_TASK_DELETE=Görev silindi
+SeeModuleSetup=Modül kurulumuna bak
NbOfAttachedFiles=Eklenen dosya/belge sayısı
TotalSizeOfAttachedFiles=Eklenen dosyaların/belgelerin toplam boyutu
MaxSize=Ençok boyut
@@ -182,8 +182,8 @@ NewSizeAfterCropping=Kırpmadan sonraki yeni boyut
DefineNewAreaToPick=Alınacak görüntü üzerinde yeni alan tanımla (görüntü üzerine sol klikle sonra karşı köşeye ulaşana kadar sürükle)
CurrentInformationOnImage=Bu araç bir görüntüyü yeniden boyutlandırmanızı veya kırpmanızı sağlar. Bu, düzenlenmiş güncel görüntünün bilgisidir
ImageEditor=Görüntü düzenleyici
-YouReceiveMailBecauseOfNotification=Bu mesajı aldınız çünkü epostanız %s e ait %s yazılımında belirli olaylar hakkında bilgilendirilecekler listesine eklenmiştir.
-YouReceiveMailBecauseOfNotification2=Bu olay aşağıdadır:
+YouReceiveMailBecauseOfNotification=Bu mesajı aldınız çünkü epostanız %s e ait %s yazılımında belirli etkinlikler hakkında bilgilendirilecekler listesine eklenmiştir.
+YouReceiveMailBecauseOfNotification2=Bu etkinlik şudur:
ThisIsListOfModules=Bu, bu demo profili tarafından önceden seçili modüllerin listesidir (yalnızca en çok kullanılan modüller görünür bu demoda). Daha kişiselleştirilmiş bir demo için bunu düzenleyin ve “Başla” ya tıklayın.
ClickHere=Buraya tıkla
UseAdvancedPerms=Bazı modüllerin gelişmiş izinlerini kullan
@@ -203,25 +203,26 @@ ForgetIfNothing=Bu değiştirmeyi istemediyseniz, bu epostayı unutun. Kimlik bi
##### Calendar common #####
AddCalendarEntry=% Takvimine giriş ekleyin
-NewCompanyToDolibarr=%s Firması Dolibarr’a eklenmiştir
-ContractValidatedInDolibarr=Contract %s validated in Dolibarr
-ContractCanceledInDolibarr=Contract %s canceled in Dolibarr
-ContractClosedInDolibarr=Contract %s closed in Dolibarr
-PropalClosedSignedInDolibarr=%s Teklifi Dolibarr’da imzalanmıştır
-PropalClosedRefusedInDolibarr=%s Teklifi Dolibarr’da reddedilmiştir
-PropalValidatedInDolibarr=%s Teklifi Dolibarr’da doğrulanmıştır
-InvoiceValidatedInDolibarr=%s Faturası Dolibarr’da doğrulanmıştır
-InvoicePaidInDolibarr=%s Faturası Dolibarr’da ödendi olarak değiştirilmiştir
-InvoiceCanceledInDolibarr=%s Faturası Dolibarr’da iptal edilmiştir
-PaymentDoneInDolibarr=%s Ödemesi Dolibarr’da yapılmıştır
-CustomerPaymentDoneInDolibarr=%s Müşteri ödemesi Dolibarr’da yapılmıştır
-SupplierPaymentDoneInDolibarr=%s Tedarikçi ödemesi Dolibarr’da yapılmıştır
-MemberValidatedInDolibarr=%s Üyesi Dolibarr’da doğrulanmıştır
-MemberResiliatedInDolibarr=%s Üyeliği Dolibarr’da bitirilmiştir
-MemberDeletedInDolibarr=%s Üyesi Dolibarr’dan tarafından silinmiştir
-MemberSubscriptionAddedInDolibarr=%s Üyesinin aboneliği Dolibarr’a eklenmiştir
-ShipmentValidatedInDolibarr=%s Sevkiyatı Dolibarr’da doğrulanmıştır
-ShipmentDeletedInDolibarr=%s sevkiyatı Dolibarr üzerinden silindi
+NewCompanyToDolibarr=Eklenen firma %s
+ContractValidatedInDolibarr=Doğrulanan firma %s
+ContractCanceledInDolibarr=İptal edilen sözleşme %s
+ContractClosedInDolibarr=Kapatılan sözleşme %s
+PropalClosedSignedInDolibarr=İmzalan teklif %s
+PropalClosedRefusedInDolibarr=Reddedilen teklif %s
+PropalValidatedInDolibarr=Doğrulanan teklif %s
+PropalClassifiedBilledInDolibarr=Faturalandı olarak sınıflandırılan teklif %s
+InvoiceValidatedInDolibarr=Doğrulanan fatura %s
+InvoicePaidInDolibarr=Ödemeye değiştirilen fatura %s
+InvoiceCanceledInDolibarr=İptal edilen fatura %s
+PaymentDoneInDolibarr=Yapılan ödeme %s
+CustomerPaymentDoneInDolibarr=Yapılan müşteri ödemesi %s
+SupplierPaymentDoneInDolibarr=Yapılan tedarikçi ödemesi %s
+MemberValidatedInDolibarr=Doğrulanan üye %s
+MemberResiliatedInDolibarr=Bitirilen üyelik %s
+MemberDeletedInDolibarr=Silinen üyelik %s
+MemberSubscriptionAddedInDolibarr=Abonelik eklenen üye %s
+ShipmentValidatedInDolibarr=Doğrulanan sevkiyat %s
+ShipmentDeletedInDolibarr=Silinen sevkiyat %s
##### Export #####
Export=Dışaaktar
ExportsArea=Dışaaktar alanı
diff --git a/htdocs/langs/tr_TR/paybox.lang b/htdocs/langs/tr_TR/paybox.lang
index fc5d30d1a84ca01baac866e8f903e4c5a6c652a9..4f8e6ac5f3a5eb973d2b131bd919a982b491d742 100644
--- a/htdocs/langs/tr_TR/paybox.lang
+++ b/htdocs/langs/tr_TR/paybox.lang
@@ -35,3 +35,6 @@ MessageKO=İptal edilen ödeme sayfası mesajı
NewPayboxPaymentReceived=Yeni Paybox ödemesi alındı
NewPayboxPaymentFailed=Yeni Paybox ödemesi denendi ama başarısız oldu
PAYBOX_PAYONLINE_SENDEMAIL=Ödeme sonrası uyarı Epostası (başarılı ya da başarısız)
+PAYBOX_PBX_SITE=PBX SITE için değer
+PAYBOX_PBX_RANG=PBX Rang için değer
+PAYBOX_PBX_IDENTIFIANT=PBX ID için değer
diff --git a/htdocs/langs/tr_TR/resource.lang b/htdocs/langs/tr_TR/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..e8adc0a0e76eaf99aea8dcb717e5ffb163c01cb5
--- /dev/null
+++ b/htdocs/langs/tr_TR/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Kaynaklar
+MenuResourceAdd=Yeni kaynaklar
+MenuResourcePlanning=Kaynak planlama
+DeleteResource=Kaynak sil
+ConfirmDeleteResourceElement=Bu öğe için kaynağı silmeyi onayla
+NoResourceInDatabase=Veritabanında kaynak yok
+NoResourceLinked=Bağlantılı kaynak yok
+
+ResourcePageIndex=Kaynak listesi
+ResourceSingular=Kaynak
+ResourceCard=Kaynak kartı
+AddResource=Bir kaynak oluştur
+ResourceFormLabel_ref=Kaynak adı
+ResourceType=Kaynak türü
+ResourceFormLabel_description=Kaynak açıklaması
+
+ResourcesLinkedToElement=Öğeye bağlantılı kaynaklar
+
+ShowResourcePlanning=Kaynak planlama göster
+GotoDate=Tarihe git
+
+ResourceElementPage=Öğe kaynağı
+ResourceCreatedWithSuccess=Kaynak oluşturma başarılı
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Kaynak bağlantılama başarılı
+
+TitleResourceCard=Kaynak kartı
+ConfirmDeleteResource=Bu kaynağı silmeyi onayla
+RessourceSuccessfullyDeleted=Kaynak silme başarılı
+DictionaryResourceType=Kaynak türleri
+
+DictionaryEMailTemplates=E-posta modelleri
+
+SelectResource=Kaynak seç
diff --git a/htdocs/langs/tr_TR/sendings.lang b/htdocs/langs/tr_TR/sendings.lang
index 3419729b7c3cb2b33a0c50496e3dfba0bc3a9f93..ea8adf02c7f4e930ca66b775eb7a77853b7833e8 100644
--- a/htdocs/langs/tr_TR/sendings.lang
+++ b/htdocs/langs/tr_TR/sendings.lang
@@ -55,12 +55,14 @@ DateDeliveryPlanned=Planlanan teslim tarihi
DateReceived=Teslim alınan tarih
SendShippingByEMail=Sevkiyatı EPostayla gönder
SendShippingRef=% Nakliyatının yapılması
-ActionsOnShipping=Sevkiyat eylemleri
+ActionsOnShipping=Sevkiyat etkinlikleri
LinkToTrackYourPackage=Paketinizi izleyeceğiniz bağlantı
ShipmentCreationIsDoneFromOrder=Şu an için, yeni bir sevkiyatın oluşturulması sipariş kartından yapılmıştır.
RelatedShippings=İlgili sevkiyatlar
ShipmentLine=Sevkiyat kalemi
CarrierList=Taşımacı listesi
+SendingRunning=Müşteri siparişindeki ürün zaten gönderildi
+SuppliersReceiptRunning=Tedarikçi siparişindeki ürün zaten alındı
# Sending methods
SendingMethodCATCH=Müşteri tarafından
diff --git a/htdocs/langs/tr_TR/stocks.lang b/htdocs/langs/tr_TR/stocks.lang
index 967a8a811fb4a9154d2fb57133b923694f728c96..85a354f5c48289e32b66bb70f83fea64bd535848 100644
--- a/htdocs/langs/tr_TR/stocks.lang
+++ b/htdocs/langs/tr_TR/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Depo etiketi gereklidir
CorrectStock=Stok düzelt
ListOfWarehouses=Depo listesi
ListOfStockMovements=Stok hareketleri listesi
-StocksArea=Stok alanı
+StocksArea=Depo alanı
Location=Konum
LocationSummary=Kısa konum adı
NumberOfDifferentProducts=Farklı ürün sayısı
diff --git a/htdocs/langs/tr_TR/users.lang b/htdocs/langs/tr_TR/users.lang
index 84c9b09f57afd0689f8bd346b4f1c7c6ffe09b30..edbf7dc5df3f508e72a48f1a1373c9022154f9d3 100644
--- a/htdocs/langs/tr_TR/users.lang
+++ b/htdocs/langs/tr_TR/users.lang
@@ -63,7 +63,6 @@ ShowGroup=Grubu göster
ShowUser=Kullanıcıyı göster
NonAffectedUsers=Etkilenmemiş kullanıcılar
UserModified=Kullanıcı başarıyla değiştirildi
-GroupModified=Grup başarıyla değiştirildi
PhotoFile=Fotoğraf dosyası
UserWithDolibarrAccess=Dolibarr erişimli kullanıcı
ListOfUsersInGroup=Bu gruptaki kullanıcıların listesi
@@ -103,7 +102,7 @@ UserDisabled=Kullanıcı %s engellendi
UserEnabled=Kullanıcı %s etkinleştirildi
UserDeleted=Kullanıcı %s kaldırıldı
NewGroupCreated=Grup %s oluşturuldu
-GroupModified=Grup başarıyla değiştirildi
+GroupModified=Group %s modified
GroupDeleted=Grubu %s kaldırıldı
ConfirmCreateContact=Bu kişi için bir Dolibarr hesabı oluşturmak istediğinizden emin misiniz?
ConfirmCreateLogin=Bu üye için Dolibarr hesabı oluşturmak istediğinizden emin misiniz?
diff --git a/htdocs/langs/tr_TR/withdrawals.lang b/htdocs/langs/tr_TR/withdrawals.lang
index 857baa3f52110bf33e3ebfe6806a996ff450bfc1..d62f8661f0c103502d41f27d40e56311af37c3fa 100644
--- a/htdocs/langs/tr_TR/withdrawals.lang
+++ b/htdocs/langs/tr_TR/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=Makbuz
LastWithdrawalReceipts=Son %s para çekme makbuzu
WithdrawedBills=Parası çekilmiş faturalar
WithdrawalsLines=Para çekme satırları
-RequestStandingOrderToTreat=Ödeme talimatları işleme isteği
-RequestStandingOrderTreated=Ödeme talimatlarının işlenmesi isteği isteği
+RequestStandingOrderToTreat=İşlenecek ödeme talimatı isteği
+RequestStandingOrderTreated=İşlenemiş ödeme talimatı isteği
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Henüz olası değil. Özel satırlarda reddedildi olarak bildirilmeden önce paraçekme durumu 'alacaklandırıldı' olarak ayarlkanmalıdır.
CustomersStandingOrders=Müşteri ödeme talimatları
CustomerStandingOrder=Müşteri ödeme talimatı
NbOfInvoiceToWithdraw=Para çekme istekli fatura sayısı
@@ -40,14 +41,13 @@ TransMetod=Havale yöntemi
Send=Gönder
Lines=Satırlar
StandingOrderReject=Bir ret düzenle
-InvoiceRefused=Fatura reddedildi
WithdrawalRefused=Para çekme reddedildi
WithdrawalRefusedConfirm=Dernek için bir para çekme reddedilme işlemi girmek istediğinizden emin misiniz
RefusedData=Ret Tarihi
RefusedReason=Ret nedeni
RefusedInvoicing=Rettin faturalandırılması
NoInvoiceRefused=Reddi borç yazmayın
-InvoiceRefused=Fatura reddedildi
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=Durum
StatusUnknown=Bilinmeyen
StatusWaiting=Bekliyor
@@ -76,7 +76,7 @@ WithBankUsingRIB=RIB kullanan banka hesapları için
WithBankUsingBANBIC=IBAN/BIC/SWIFT kullanan banka hesapları için
BankToReceiveWithdraw=Para çekilecek banka hesabı
CreditDate=Alacak tarihi
-WithdrawalFileNotCapable=Ülkeniz için para çekme makbuzu dosyası oluşturulamıyor
+WithdrawalFileNotCapable=Ülkeniz %s için para çekme makbuzu oluşturulamıyor (Ülkeniz desteklenmiyor)
ShowWithdraw=Para çekme göster
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Faturaya henüz enaz bir ödeme tahsilatı işlenmemişse, para çekme yönetimine izin vermek için ödendi olarak ayarlanamaz.
DoStandingOrdersBeforePayments=Bu sekmeler ödeme talimatı istemenizi sağlar. Bitirildiğinde, faturayı kapatmak için ödemeyi yazabilirsiniz.
diff --git a/htdocs/langs/uk_UA/accountancy.lang b/htdocs/langs/uk_UA/accountancy.lang
index 8cab9d2b651d75b0721d76fda619e2034e4509b4..39c2732ec29852cf93d41614ed1812c2a4c1ce4f 100644
--- a/htdocs/langs/uk_UA/accountancy.lang
+++ b/htdocs/langs/uk_UA/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts
Validate=Validate
Addanaccount=Add an accounting account
AccountAccounting=Accounting account
-Ventilation=Ventilation
+Ventilation=Breakdown
ToDispatch=To dispatch
Dispatched=Dispatched
-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
TradeMargin=Trade margin
Reports=Reports
ByCustomerInvoice=By invoices customers
@@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger
Bookkeeping=General ledger
AccountBalanceByMonth=Account balance by month
-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
Line=Line
CAHTF=Total purchase supplier HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice
IntoAccount=In the accounting account
Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
+VentilationAuto=Automatic breakdown
Processing=Processing
EndProcessing=The end of processing
@@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account
ACCOUNTING_SEPARATORCSV=Separator CSV
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
@@ -140,14 +140,14 @@ Active=Statement
NewFiscalYear=New fiscal year
-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
TotalVente=Total turnover HT
TotalMarge=Total sales margin
DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
ChangeAccount=Change the accounting account for lines selected by the account:
Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
@@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically
ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index d0a47c3bcf5caf745cfe2d9c5c1cdc726b11269f..37e41038659fa71a07c302f67440e24471324b4d 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -437,8 +437,8 @@ Module52Name=Stocks
Module52Desc=Stock management (products)
Module53Name=Services
Module53Desc=Service management
-Module54Name=Contracts
-Module54Desc=Contract and service management
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=Barcodes
Module55Desc=Barcode management
Module56Name=Telephony
@@ -475,8 +475,8 @@ Module320Name=RSS Feed
Module320Desc=Add RSS feed inside Dolibarr screen pages
Module330Name=Bookmarks
Module330Desc=Bookmark management
-Module400Name=Projects
-Module400Desc=Project management inside other modules
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=Webcalendar
Module410Desc=Webcalendar integration
Module500Name=Special expenses (tax, social contributions, dividends)
@@ -484,7 +484,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di
Module510Name=Salaries
Module510Desc=Management of employees salaries and payments
Module600Name=Notifications
-Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Donations
Module700Desc=Donation management
Module1200Name=Mantis
@@ -514,16 +514,16 @@ Module5000Name=Multi-company
Module5000Desc=Allows you to manage multiple companies
Module6000Name=Workflow
Module6000Desc=Workflow management
-Module20000Name=Holidays
-Module20000Desc=Declare and follow employees holidays
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
Module39000Name=Product batch
Module39000Desc=Batch number, eat-by and sell-by date management on products
Module50000Name=PayBox
Module50000Desc=Module to offer an online payment page by credit card with PayBox
Module50100Name=Point of sales
Module50100Desc=Point of sales module
-Module50200Name= Paypal
-Module50200Desc= Module to offer an online payment page by credit card with Paypal
+Module50200Name=Paypal
+Module50200Desc=Module to offer an online payment page by credit card with Paypal
Module50400Name=Accounting (advanced)
Module50400Desc=Accounting management (double parties)
Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=Read standing orders
Permission152=Create/modify a standing orders request
Permission153=Transmission standing orders receipts
Permission154=Credit/refuse standing orders receipts
-Permission161=Read contracts
-Permission162=Create/modify contracts
-Permission163=Activate a service of a contract
-Permission164=Disable a service of a contract
-Permission165=Delete contracts
-Permission171=Read trips
-Permission172=Create/modify trips
-Permission173=Delete trips
-Permission178=Export trips
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Read trips and expenses (own and his subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
Permission180=Read suppliers
Permission181=Read supplier orders
Permission182=Create/modify supplier orders
@@ -671,7 +672,7 @@ Permission300=Read bar codes
Permission301=Create/modify bar codes
Permission302=Delete bar codes
Permission311=Read services
-Permission312=Assign service to contract
+Permission312=Assign service/subscription to contract
Permission331=Read bookmarks
Permission332=Create/modify bookmarks
Permission333=Delete bookmarks
@@ -701,8 +702,8 @@ Permission701=Read donations
Permission702=Create/modify donations
Permission703=Delete donations
Permission1001=Read stocks
-Permission1002=Create/modify stocks
-Permission1003=Delete stocks
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=Read stock movements
Permission1005=Create/modify stock movements
Permission1101=Read delivery orders
@@ -1038,7 +1039,6 @@ YesInSummer=Yes in summer
OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
SuhosinSessionEncrypt=Session storage encrypted by Suhosin
ConditionIsCurrently=Condition is currently %s
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
YouUseBestDriver=You use driver %s that is best driver available currently.
YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by
ModuleCompanyCodePanicum=Return an empty accountancy code.
ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
UseNotifications=Use notifications
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events, to third parties (customers or suppliers) that are configured to. Choice of active notification and targets contacts is made one third party at time.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
ModelModules=Documents templates
DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
WatermarkOnDraft=Watermark on draft document
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=Add delivery date ability
UseOptionLineIfNoQuantity=A line of product/service with a zero amount is considered as an option
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list
ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order
FreeLegalTextOnOrders=Free text on orders
WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
##### Clicktodial #####
ClickToDialSetup=Click To Dial module setup
ClickToDialUrlDesc=Url called when a click on phone picto is done. In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=Intervention numbering models
TemplatePDFInterventions=Intervention card documents models
WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
##### Contracts #####
-ContractsSetup=Contracts module setup
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=Contracts numbering modules
TemplatePDFContracts=Contracts documents models
FreeLegalTextOnContracts=Free text on contracts
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
CacheByServer=Cache by server
CacheByClient=Cache by browser
CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=Products module setup
ServiceSetup=Services module setup
@@ -1382,9 +1384,10 @@ MailingSetup=EMailing module setup
MailingEMailFrom=Sender EMail (From) for emails sent by emailing module
MailingEMailError=Return EMail (Errors-to) for emails with errors
##### Notification #####
-NotificationSetup=Notification bu email module setup
+NotificationSetup=EMail notification module setup
NotificationEMailFrom=Sender EMail (From) for emails sent for notifications
-ListOfAvailableNotifications=List of available notifications (This list depends on activated modules)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
##### Sendings #####
SendingsSetup=Sending module setup
SendingsReceiptModel=Sending receipt model
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe
OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
##### Stock #####
-StockSetup=Configuration module stock
-UserWarehouse=Use user personal stocks
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=Menu deleted
TreeMenu=Tree menus
@@ -1478,11 +1482,14 @@ ClickToDialDesc=This module allows to add an icon after phone numbers. A click o
##### Point Of Sales (CashDesk) #####
CashDesk=Point of sales
CashDeskSetup=Point of sales module setup
-CashDeskThirdPartyForSell=Generic third party to use for sells
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Default account to use to receive cash payments
CashDeskBankAccountForCheque= Default account to use to receive payments by cheque
CashDeskBankAccountForCB= Default account to use to receive payments by credit cards
-CashDeskIdWareHouse=Warehouse to use for sells
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Bookmark module setup
BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Delete fiscal year
ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
Opened=Opened
Closed=Closed
-
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
diff --git a/htdocs/langs/uk_UA/agenda.lang b/htdocs/langs/uk_UA/agenda.lang
index b279f5aa92cdc8546ea1a2d0f9016f30176e17c9..43252eb188c53749640668057552abb3eb545847 100644
--- a/htdocs/langs/uk_UA/agenda.lang
+++ b/htdocs/langs/uk_UA/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= Automatic filling
AgendaAutoActionDesc= Define here events for which you want Dolibarr to create automatically an event in agenda. If nothing is checked (by default), only manual actions will be included in agenda.
AgendaSetupOtherDesc= This page provides options to allow export of your Dolibarr events into an external calendar (thunderbird, google calendar, ...)
AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda.
-ActionsEvents= Events for which Dolibarr will create an action in agenda automatically
-PropalValidatedInDolibarr= Proposal %s validated
-InvoiceValidatedInDolibarr= Invoice %s validated
+ActionsEvents=Events for which Dolibarr will create an action in agenda automatically
+PropalValidatedInDolibarr=Proposal %s validated
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
InvoiceDeleteDolibarr=Invoice %s deleted
OrderValidatedInDolibarr= Order %s validated
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Order %s approved
OrderRefusedInDolibarr=Order %s refused
OrderBackToDraftInDolibarr=Order %s go back to draft status
OrderCanceledInDolibarr=Order %s canceled
-InterventionValidatedInDolibarr=Intervention %s validated
ProposalSentByEMail=Commercial proposal %s sent by EMail
OrderSentByEMail=Customer order %s sent by EMail
InvoiceSentByEMail=Customer invoice %s sent by EMail
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=Supplier order %s sent by EMail
SupplierInvoiceSentByEMail=Supplier invoice %s sent by EMail
ShippingSentByEMail=Shipping %s sent by EMail
ShippingValidated= Shipping %s validated
-InterventionSentByEMail=Intervention %s sent by EMail
-InterventionClassifiedBilled=Intervention %s classified as Billed
NewCompanyToDolibarr= Third party created
DateActionPlannedStart= Planned start date
DateActionPlannedEnd= Planned end date
@@ -70,9 +68,9 @@ DateActionStart= Start date
DateActionEnd= End date
AgendaUrlOptions1=You can also add following parameters to filter output:
AgendaUrlOptions2=<b>login=%s</b> to restrict output to actions created by, assigned to or done by user <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions created by user <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> to restrict output to actions done by user <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
AgendaShowBirthdayEvents=Show birthday's contacts
AgendaHideBirthdayEvents=Hide birthday's contacts
Busy=Busy
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=URL to access .ical file
ExtSiteNoLabel=No Description
WorkingTimeRange=Working time range
WorkingDaysRange=Working days range
-AddEvent=Add event
+AddEvent=Create event
MyAvailability=My availability
diff --git a/htdocs/langs/uk_UA/bills.lang b/htdocs/langs/uk_UA/bills.lang
index 1edd72130768502f868a057917ba530eeb280671..81b7515a8b8c3c3aa8a2d9e46e3fe9ccad263f59 100644
--- a/htdocs/langs/uk_UA/bills.lang
+++ b/htdocs/langs/uk_UA/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Credit note
InvoiceAvoirAsk=Credit note to correct invoice
InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example).
invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
-invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
ReplaceInvoice=Replace invoice %s
ReplacementInvoice=Replacement invoice
ReplacedByInvoice=Replaced by invoice %s
@@ -87,7 +87,7 @@ ClassifyCanceled=Classify 'Abandoned'
ClassifyClosed=Classify 'Closed'
ClassifyUnBilled=Classify 'Unbilled'
CreateBill=Create Invoice
-AddBill=Add invoice or credit note
+AddBill=Create invoice or credit note
AddToDraftInvoices=Add to draft invoice
DeleteBill=Delete invoice
SearchACustomerInvoice=Search for a customer invoice
@@ -99,7 +99,7 @@ DoPaymentBack=Do payment back
ConvertToReduc=Convert into future discount
EnterPaymentReceivedFromCustomer=Enter payment received from customer
EnterPaymentDueToCustomer=Make payment due to customer
-DisabledBecauseRemainderToPayIsZero=Disabled because remainder to pay is zero
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
Amount=Amount
PriceBase=Price base
BillStatus=Invoice status
@@ -137,8 +137,6 @@ BillFrom=From
BillTo=To
ActionsOnBill=Actions on invoice
NewBill=New invoice
-Prélèvements=Standing order
-Prélèvements=Standing order
LastBills=Last %s invoices
LastCustomersBills=Last %s customers invoices
LastSuppliersBills=Last %s suppliers invoices
@@ -156,9 +154,9 @@ ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b> ?
ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned' ?
ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid ?
ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice ?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
@@ -191,9 +189,9 @@ AlreadyPaid=Already paid
AlreadyPaidBack=Already paid back
AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposits)
Abandoned=Abandoned
-RemainderToPay=Remainder to pay
-RemainderToTake=Remainder to take
-RemainderToPayBack=Remainder to pay back
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
Rest=Pending
AmountExpected=Amount claimed
ExcessReceived=Excess received
@@ -219,19 +217,18 @@ NoInvoice=No invoice
ClassifyBill=Classify invoice
SupplierBillsToPay=Suppliers invoices to pay
CustomerBillsUnpaid=Unpaid customers invoices
-DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters
-DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=Non-recoverable
SetConditions=Set payment terms
SetMode=Set payment mode
Billed=Billed
-RepeatableInvoice=Pre-defined invoice
-RepeatableInvoices=Pre-defined invoices
-Repeatable=Pre-defined
-Repeatables=Pre-defined
-ChangeIntoRepeatableInvoice=Convert into pre-defined
-CreateRepeatableInvoice=Create pre-defined invoice
-CreateFromRepeatableInvoice=Create from pre-defined invoice
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines
CustomersInvoicesAndPayments=Customer invoices and payments
ExportDataset_invoice_1=Customer invoices list and invoice's lines
diff --git a/htdocs/langs/uk_UA/categories.lang b/htdocs/langs/uk_UA/categories.lang
index ed61bfc08a61b4e5bfdadecfe7f6a15298afc6e3..22914931db137a565a45daad16b9b04fbd08465b 100644
--- a/htdocs/langs/uk_UA/categories.lang
+++ b/htdocs/langs/uk_UA/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories
CatCusLinks=Links between customers/prospects and categories
CatProdLinks=Links between products/services and categories
CatMemberLinks=Links between members and categories
-CatProdLinks=Links between products/services and categories
-CatCusLinks=Links between customers/prospects and categories
-CatSupLinks=Links between suppliers and categories
DeleteFromCat=Remove from category
DeletePicture=Picture delete
ConfirmDeletePicture=Confirm picture deletion?
@@ -112,3 +109,4 @@ CategoriesSetup=Categories setup
CategorieRecursiv=Link with parent category automatically
CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category
diff --git a/htdocs/langs/uk_UA/compta.lang b/htdocs/langs/uk_UA/compta.lang
index 3929cfde0367b6f5d8dc7945385de4877d9e4759..9fe5eff520d881c617f38aa7d9db675ec18f118a 100644
--- a/htdocs/langs/uk_UA/compta.lang
+++ b/htdocs/langs/uk_UA/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s
SuppliersProductsSellSalesTurnover=The generated turnover by the sales of supplier's products.
CheckReceipt=Check deposit
CheckReceiptShort=Check deposit
+LastCheckReceiptShort=Last %s check receipts
NewCheckReceipt=New discount
NewCheckDeposit=New check deposit
NewCheckDepositOn=Create receipt for deposit on account: %s
diff --git a/htdocs/langs/uk_UA/contracts.lang b/htdocs/langs/uk_UA/contracts.lang
index e5ad112b222db93bedf8e6ded250a39d062215c6..511516dc755e4f3aba2d67e91238426896629cbd 100644
--- a/htdocs/langs/uk_UA/contracts.lang
+++ b/htdocs/langs/uk_UA/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Contracts area
ListOfContracts=List of contracts
-LastContracts=Last %s modified contracts
+LastModifiedContracts=Last %s modified contracts
AllContracts=All contracts
ContractCard=Contract card
ContractStatus=Contract status
@@ -27,7 +27,7 @@ MenuRunningServices=Running services
MenuExpiredServices=Expired services
MenuClosedServices=Closed services
NewContract=New contract
-AddContract=Add contract
+AddContract=Create contract
SearchAContract=Search a contract
DeleteAContract=Delete a contract
CloseAContract=Close a contract
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines
ListOfRunningServices=List of running services
NotActivatedServices=Inactive services (among validated contracts)
BoardNotActivatedServices=Services to activate among validated contracts
-LastContracts=Last %s modified contracts
+LastContracts=Last % contracts
LastActivatedServices=Last %s activated services
LastModifiedServices=Last %s modified services
EditServiceLine=Edit service line
diff --git a/htdocs/langs/uk_UA/cron.lang b/htdocs/langs/uk_UA/cron.lang
index 768cd012384454aef37c15bb651dcf719a11e334..195ad43c87c41ae0938fa27745ba14209fbac724 100644
--- a/htdocs/langs/uk_UA/cron.lang
+++ b/htdocs/langs/uk_UA/cron.lang
@@ -1,10 +1,8 @@
# Dolibarr language file - Source file is en_US - cron
-#
# About page
About = About
CronAbout = About Cron
CronAboutPage = Cron about page
-
# Right
Permission23101 = Read Scheduled task
Permission23102 = Create/update Scheduled task
@@ -20,9 +18,8 @@ CronExplainHowToRunUnix=On Unix environment you should use crontab to run Comman
CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
# Menu
CronJobs=Scheduled jobs
-CronListActive= List of active jobs
-CronListInactive= List of disabled jobs
-CronListActive= List of active jobs
+CronListActive=List of active/scheduled jobs
+CronListInactive=List of disabled jobs
# Page list
CronDateLastRun=Last run
CronLastOutput=Last run output
diff --git a/htdocs/langs/uk_UA/donations.lang b/htdocs/langs/uk_UA/donations.lang
index 66ddea95a5c694d8044c40b7da05319d0b77a530..f7aed91cf81caf0e83e390519642ea1f199670c6 100644
--- a/htdocs/langs/uk_UA/donations.lang
+++ b/htdocs/langs/uk_UA/donations.lang
@@ -4,7 +4,7 @@ Donations=Donations
DonationRef=Donation ref.
Donor=Donor
Donors=Donors
-AddDonation=Add a donation
+AddDonation=Create a donation
NewDonation=New donation
ShowDonation=Show donation
DonationPromise=Gift promise
@@ -31,3 +31,8 @@ DonationRecipient=Donation recipient
ThankYou=Thank You
IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
MinimumAmount=Minimum amount is %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/uk_UA/externalsite.lang b/htdocs/langs/uk_UA/externalsite.lang
index 62da68c045d199d9fd0a078061cc7739f33ae967..da4853df0df086e3040a294cec116c590f4c2e9e 100644
--- a/htdocs/langs/uk_UA/externalsite.lang
+++ b/htdocs/langs/uk_UA/externalsite.lang
@@ -2,3 +2,4 @@
ExternalSiteSetup=Setup link to external website
ExternalSiteURL=External Site URL
ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/uk_UA/holiday.lang b/htdocs/langs/uk_UA/holiday.lang
index c25abf6449ca2cc97d5dba6340d1530b5ea9c675..f5b87fefb0878c40cc75768a1d1c4bcf4cb80c72 100644
--- a/htdocs/langs/uk_UA/holiday.lang
+++ b/htdocs/langs/uk_UA/holiday.lang
@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
CantCreateCP=You don't have the right to make leave requests.
InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=Update
CantUpdate=You cannot update this leave request.
NoDateDebut=You must select a start date.
NoDateFin=You must select an end date.
-ErrorDureeCP=Your request for holidays does not contain working day.
-TitleValidCP=Approve the request holidays
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
ConfirmValidCP=Are you sure you want to approve the leave request?
DateValidCP=Date approved
TitleToValidCP=Send leave request
ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the request holidays
+TitleRefuseCP=Refuse the leave request
ConfirmRefuseCP=Are you sure you want to refuse the leave request?
NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
+TitleCancelCP=Cancel the leave request
ConfirmCancelCP=Are you sure you want to cancel the leave request?
DetailRefusCP=Reason for refusal
DateRefusCP=Date of refusal
@@ -78,7 +77,7 @@ ActionByCP=Performed by
UserUpdateCP=For the user
PrevSoldeCP=Previous Balance
NewSoldeCP=New Balance
-alreadyCPexist=A request for holidays has already been done on this period.
+alreadyCPexist=A leave request has already been done on this period.
UserName=Name
Employee=Employee
FirstDayOfHoliday=First day of vacation
@@ -88,25 +87,25 @@ ManualUpdate=Manual update
HolidaysCancelation=Leave request cancelation
## Configuration du Module ##
-ConfCP=Configuration of holidays module
+ConfCP=Configuration of leave request module
DescOptionCP=Description of the option
ValueOptionCP=Value
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
UpdateConfCPOK=Updated successfully.
ErrorUpdateConfCP=An error occurred during the update, please try again.
-AddCPforUsers=Please add the balance of holidays of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
Module27130Name= Management of leave requests
Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
TitleOptionEventCP=Settings of leave requets for events
ValidEventCP=Validate
UpdateEventCP=Update events
diff --git a/htdocs/langs/uk_UA/interventions.lang b/htdocs/langs/uk_UA/interventions.lang
index 17641a0ab3e499b2f66a4b4ddd80c46d478ff702..c79da05364e615bb2b234ce4211a373fc94e9168 100644
--- a/htdocs/langs/uk_UA/interventions.lang
+++ b/htdocs/langs/uk_UA/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Intervention
Interventions=Interventions
InterventionCard=Intervention card
NewIntervention=New intervention
-AddIntervention=Add intervention
+AddIntervention=Create intervention
ListOfInterventions=List of interventions
EditIntervention=Edit intervention
ActionsOnFicheInter=Actions on intervention
@@ -30,6 +30,15 @@ StatusInterInvoiced=Billed
RelatedInterventions=Related interventions
ShowIntervention=Show intervention
SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention
TypeContact_fichinter_internal_INTERVENING=Intervening
diff --git a/htdocs/langs/uk_UA/mails.lang b/htdocs/langs/uk_UA/mails.lang
index 98e6dc335eeced95e230de5b5ca5b8f78fc59681..7a2111988228ab02739bad001958aa455eb9013c 100644
--- a/htdocs/langs/uk_UA/mails.lang
+++ b/htdocs/langs/uk_UA/mails.lang
@@ -115,7 +115,7 @@ SentBy=Sent by
MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=Clear list
ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
ToAddRecipientsChooseHere=Add recipients by choosing from the lists
@@ -133,6 +133,9 @@ Notifications=Notifications
NoNotificationsWillBeSent=No email notifications are planned for this event and company
ANotificationsWillBeSent=1 notification will be sent by email
SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification request
-ListOfActiveNotifications=List all active email notification requests
+AddNewNotification=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
ListOfNotificationsDone=List all email notifications sent
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang
index aedae0c8a6e8e13b71ec8e57c1925a72f52164f0..120e6bf0544711b82e3bb5edc0efffdaa8d7c602 100644
--- a/htdocs/langs/uk_UA/main.lang
+++ b/htdocs/langs/uk_UA/main.lang
@@ -22,21 +22,21 @@ FormatDateHourShort=%m/%d/%Y %I:%M %p
FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
FormatDateHourTextShort=%b %d, %Y, %I:%M %p
FormatDateHourText=%B %d, %Y, %I:%M %p
-DatabaseConnection=Database connection
-NoTranslation=No translation
-NoRecordFound=No record found
-NoError=No error
-Error=Error
-ErrorFieldRequired=Field '%s' is required
-ErrorFieldFormat=Field '%s' has a bad value
-ErrorFileDoesNotExists=File %s does not exist
-ErrorFailedToOpenFile=Failed to open file %s
-ErrorCanNotCreateDir=Can not create dir %s
-ErrorCanNotReadDir=Can not read dir %s
-ErrorConstantNotDefined=Parameter %s not defined
-ErrorUnknown=Unknown error
-ErrorSQL=SQL Error
-ErrorLogoFileNotFound=Logo file '%s' was not found
+DatabaseConnection=Підключеня до Бази Данних
+NoTranslation=Немає перекладу
+NoRecordFound=Записів не знайдено
+NoError=Немає помилок
+Error=Помилка
+ErrorFieldRequired=Поле '%s' є обов'язковим
+ErrorFieldFormat=Поле '%s' містить помилкове значення
+ErrorFileDoesNotExists=Файл %s не існує
+ErrorFailedToOpenFile=Неможливо відкрити файл %s
+ErrorCanNotCreateDir=Неможливо створити каталог %s
+ErrorCanNotReadDir=Неможливо прочитати каталог %s
+ErrorConstantNotDefined=Параметр %s не було визначено
+ErrorUnknown=Невідома помилка
+ErrorSQL=Помилка SQL
+ErrorLogoFileNotFound=Файл логотипу '%s' не знайдено
ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this
ErrorGoToModuleSetup=Go to Module setup to fix this
ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr
ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'.
ErrorFailedToSaveFile=Error, failed to save file.
-ErrorOnlyPngJpgSupported=Error, only .png and .jpg image format file are supported.
-ErrorImageFormatNotSupported=Your PHP does not support functions to convert images of this format.
SetDate=Set date
SelectDate=Select a date
SeeAlso=See also %s
BackgroundColorByDefault=Default background color
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
NbOfEntries=Nb of entries
GoToWikiHelpPage=Read online help (need Internet access)
@@ -266,6 +266,7 @@ Afternoon=Afternoon
Quadri=Quadri
MonthOfDay=Month of the day
HourShort=H
+MinuteShort=mn
Rate=Rate
UseLocalTax=Include tax
Bytes=Bytes
@@ -340,6 +341,7 @@ FullList=Full list
Statistics=Statistics
OtherStatistics=Other statistics
Status=Status
+Favorite=Favorite
ShortInfo=Info.
Ref=Ref.
RefSupplier=Ref. supplier
@@ -365,6 +367,7 @@ ActionsOnCompany=Events about this third party
ActionsOnMember=Events about this member
NActions=%s events
NActionsLate=%s late
+RequestAlreadyDone=Request already recorded
Filter=Filter
RemoveFilter=Remove filter
ChartGenerated=Chart generated
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Extra attributes setup
URLPhoto=URL of photo/logo
SetLinkToThirdParty=Link to another third party
CreateDraft=Create draft
+SetToDraft=Back to draft
ClickToEdit=Click to edit
ObjectDeleted=Object %s deleted
ByCountry=By country
@@ -678,7 +682,7 @@ ViewPrivateNote=View notes
XMoreLines=%s line(s) hidden
PublicUrl=Public URL
AddBox=Add box
-
+SelectElementAndClickRefresh=Select an element and click Refresh
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/langs/uk_UA/margins.lang b/htdocs/langs/uk_UA/margins.lang
index 3fca6d7a6440d0e09acfc61f524ed9b7c3326a78..606d5e5053a25855631a7d6ee61b6c392c1fe32c 100644
--- a/htdocs/langs/uk_UA/margins.lang
+++ b/htdocs/langs/uk_UA/margins.lang
@@ -38,4 +38,7 @@ BuyingCost=Cost price
UnitCharges=Unit charges
Charges=Charges
AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/uk_UA/orders.lang b/htdocs/langs/uk_UA/orders.lang
index 3d53001215463a6647c838394ec11668d45c4bcf..6ee9c19fa95f45044b7466cc0fdcbf21819ef13a 100644
--- a/htdocs/langs/uk_UA/orders.lang
+++ b/htdocs/langs/uk_UA/orders.lang
@@ -53,7 +53,7 @@ ShippingExist=A shipment exists
DraftOrWaitingApproved=Draft or approved not yet ordered
DraftOrWaitingShipped=Draft or validated not yet shipped
MenuOrdersToBill=Orders delivered
-MenuOrdersToBill2=Orders to bill
+MenuOrdersToBill2=Billable orders
SearchOrder=Search order
SearchACustomerOrder=Search a customer order
ShipProduct=Ship product
@@ -65,7 +65,7 @@ ValidateOrder=Validate order
UnvalidateOrder=Unvalidate order
DeleteOrder=Delete order
CancelOrder=Cancel order
-AddOrder=Add order
+AddOrder=Create order
AddToMyOrders=Add to my orders
AddToOtherOrders=Add to other orders
AddToDraftOrders=Add to draft order
@@ -154,7 +154,6 @@ OrderByPhone=Phone
CreateInvoiceForThisCustomer=Bill orders
NoOrdersToInvoice=No orders billable
CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-MenuOrdersToBill2=Orders to bill
OrderCreation=Order creation
Ordered=Ordered
OrderCreated=Your orders have been created
diff --git a/htdocs/langs/uk_UA/oscommerce.lang b/htdocs/langs/uk_UA/oscommerce.lang
deleted file mode 100644
index 3ff9108ead4e2ba3a94229a24177998c14e624fc..0000000000000000000000000000000000000000
--- a/htdocs/langs/uk_UA/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=OS Commerce module setup
-OSCommerceSetupSaved=OS Commerce setup saved
-OSCommerceServer=OS Commerce server host/ip
-OSCommerceDatabaseName=OS Commerce database name
-OSCommercePrefix=OS Commerce tables prefix
-OSCommerceUser=OS Commerce database login
diff --git a/htdocs/langs/uk_UA/other.lang b/htdocs/langs/uk_UA/other.lang
index b56ef2944951b7c0d44d285b1e7a02ad6077a579..889918881838dcbc59b7a031b8af656cec175167 100644
--- a/htdocs/langs/uk_UA/other.lang
+++ b/htdocs/langs/uk_UA/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=Security code
Calendar=Calendar
-AddTrip=Add trip
Tools=Tools
ToolsDesc=This area is dedicated to group miscellaneous tools not available into other menu entries.<br><br>Those tools can be reached from menu on the side.
Birthday=Birthday
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation
Notify_TASK_CREATE=Task created
Notify_TASK_MODIFY=Task modified
Notify_TASK_DELETE=Task deleted
+SeeModuleSetup=See module setup
NbOfAttachedFiles=Number of attached files/documents
TotalSizeOfAttachedFiles=Total size of attached files/documents
MaxSize=Maximum size
@@ -80,6 +80,16 @@ ModifiedBy=Modified by %s
ValidatedBy=Validated by %s
CanceledBy=Canceled by %s
ClosedBy=Closed by %s
+CreatedById=User id who created
+ModifiedById=User id who made last change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made last change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
FileWasRemoved=File %s was removed
DirWasRemoved=Directory %s was removed
FeatureNotYetAvailableShort=Available in a next version
@@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your
##### Calendar common #####
AddCalendarEntry=Add entry in calendar %s
-NewCompanyToDolibarr=Company %s added into Dolibarr
-ContractValidatedInDolibarr=Contract %s validated in Dolibarr
-ContractCanceledInDolibarr=Contract %s canceled in Dolibarr
-ContractClosedInDolibarr=Contract %s closed in Dolibarr
-PropalClosedSignedInDolibarr=Proposal %s signed in Dolibarr
-PropalClosedRefusedInDolibarr=Proposal %s refused in Dolibarr
-PropalValidatedInDolibarr=Proposal %s validated in Dolibarr
-InvoiceValidatedInDolibarr=Invoice %s validated in Dolibarr
-InvoicePaidInDolibarr=Invoice %s changed to paid in Dolibarr
-InvoiceCanceledInDolibarr=Invoice %s canceled in Dolibarr
-PaymentDoneInDolibarr=Payment %s done in Dolibarr
-CustomerPaymentDoneInDolibarr=Customer payment %s done in Dolibarr
-SupplierPaymentDoneInDolibarr=Supplier payment %s done in Dolibarr
-MemberValidatedInDolibarr=Member %s validated in Dolibarr
-MemberResiliatedInDolibarr=Member %s resiliated in Dolibarr
-MemberDeletedInDolibarr=Member %s deleted from Dolibarr
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added in Dolibarr
-ShipmentValidatedInDolibarr=Shipment %s validated in Dolibarr
-ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
##### Export #####
Export=Export
ExportsArea=Exports area
diff --git a/htdocs/langs/uk_UA/paybox.lang b/htdocs/langs/uk_UA/paybox.lang
index f937768240c3bb7b70a1bdf3e499c60b71d16ab9..aced32a49440a9ff7a1b1e0279522ff49cec7821 100644
--- a/htdocs/langs/uk_UA/paybox.lang
+++ b/htdocs/langs/uk_UA/paybox.lang
@@ -35,3 +35,6 @@ MessageKO=Message on canceled payment return page
NewPayboxPaymentReceived=New Paybox payment received
NewPayboxPaymentFailed=New Paybox payment tried but failed
PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/uk_UA/resource.lang b/htdocs/langs/uk_UA/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..d64075dfbf595897a63e3eebf19194d8f71030dd
--- /dev/null
+++ b/htdocs/langs/uk_UA/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
diff --git a/htdocs/langs/uk_UA/sendings.lang b/htdocs/langs/uk_UA/sendings.lang
index 2ae43f3976607147c1e8fc3a41898f572cee9868..f6111bac6841189e50c3c7fb9028962b56e3997e 100644
--- a/htdocs/langs/uk_UA/sendings.lang
+++ b/htdocs/langs/uk_UA/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is do
RelatedShippings=Related shippings
ShipmentLine=Shipment line
CarrierList=List of transporters
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
# Sending methods
SendingMethodCATCH=Catch by customer
diff --git a/htdocs/langs/uk_UA/stocks.lang b/htdocs/langs/uk_UA/stocks.lang
index 5d11b0fd7a0992284856369a2d4b919e56a34453..06c502504e9f19219ba028be8d02fbb55e5f0697 100644
--- a/htdocs/langs/uk_UA/stocks.lang
+++ b/htdocs/langs/uk_UA/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Warehouse label is required
CorrectStock=Correct stock
ListOfWarehouses=List of warehouses
ListOfStockMovements=List of stock movements
-StocksArea=Stocks area
+StocksArea=Warehouses area
Location=Location
LocationSummary=Short name location
NumberOfDifferentProducts=Number of different products
diff --git a/htdocs/langs/uk_UA/users.lang b/htdocs/langs/uk_UA/users.lang
index 0afaab6ad7f7ca7de787d1bad2656917763a3f45..baf209f9d1c7ff7527f6f0237519cac6f683a9e3 100644
--- a/htdocs/langs/uk_UA/users.lang
+++ b/htdocs/langs/uk_UA/users.lang
@@ -63,7 +63,6 @@ ShowGroup=Show group
ShowUser=Show user
NonAffectedUsers=Non assigned users
UserModified=User modified successfully
-GroupModified=Group modified successfully
PhotoFile=Photo file
UserWithDolibarrAccess=User with Dolibarr access
ListOfUsersInGroup=List of users in this group
@@ -103,7 +102,7 @@ UserDisabled=User %s disabled
UserEnabled=User %s activated
UserDeleted=User %s removed
NewGroupCreated=Group %s created
-GroupModified=Group modified successfully
+GroupModified=Group %s modified
GroupDeleted=Group %s removed
ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact ?
ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member ?
@@ -114,8 +113,10 @@ YourRole=Your roles
YourQuotaOfUsersIsReached=Your quota of active users is reached !
NbOfUsers=Nb of users
DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
-HierarchicalResponsible=Hierarchical responsible
+HierarchicalResponsible=Supervisor
HierarchicView=Hierarchical view
UseTypeFieldToChange=Use field Type to change
OpenIDURL=OpenID URL
LoginUsingOpenID=Use OpenID to login
+WeeklyHours=Weekly hours
+ColorUser=Color of the user
diff --git a/htdocs/langs/uk_UA/withdrawals.lang b/htdocs/langs/uk_UA/withdrawals.lang
index 58ac3e252ec59d67ff8d71c394b4c44265bc3add..e433730908416bbfa32c181a580b9e2e7e34717c 100644
--- a/htdocs/langs/uk_UA/withdrawals.lang
+++ b/htdocs/langs/uk_UA/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=Receipt
LastWithdrawalReceipts=Last %s withdrawal receipts
WithdrawedBills=Withdrawn invoices
WithdrawalsLines=Withdrawal lines
-RequestStandingOrderToTreat=Request for standing orders to treat
-RequestStandingOrderTreated=Request for standing orders treated
+RequestStandingOrderToTreat=Request for standing orders to process
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=Customer standing orders
CustomerStandingOrder=Customer standing order
NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
@@ -40,14 +41,13 @@ TransMetod=Transmission method
Send=Send
Lines=Lines
StandingOrderReject=Issue a rejection
-InvoiceRefused=Invoice refused
WithdrawalRefused=Withdrawal refused
WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society
RefusedData=Date of rejection
RefusedReason=Reason for rejection
RefusedInvoicing=Billing the rejection
NoInvoiceRefused=Do not charge the rejection
-InvoiceRefused=Invoice refused
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=Status
StatusUnknown=Unknown
StatusWaiting=Waiting
@@ -76,7 +76,7 @@ WithBankUsingRIB=For bank accounts using RIB
WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
BankToReceiveWithdraw=Bank account to receive withdraws
CreditDate=Credit on
-WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
ShowWithdraw=Show Withdraw
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index e3e30f01dd45fb2c05d3f595e65a403a20a57b5c..b5d84a0aca719247703edbf256ec07a363a655bc 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -437,8 +437,8 @@ Module52Name=Stocks
Module52Desc=Stock management (products)
Module53Name=Services
Module53Desc=Service management
-Module54Name=Contracts
-Module54Desc=Contract and service management
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=Barcodes
Module55Desc=Barcode management
Module56Name=Telephony
@@ -475,8 +475,8 @@ Module320Name=RSS Feed
Module320Desc=Add RSS feed inside Dolibarr screen pages
Module330Name=Bookmarks
Module330Desc=Bookmark management
-Module400Name=Projects
-Module400Desc=Project management inside other modules
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=Webcalendar
Module410Desc=Webcalendar integration
Module500Name=Special expenses (tax, social contributions, dividends)
@@ -484,7 +484,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di
Module510Name=Salaries
Module510Desc=Management of employees salaries and payments
Module600Name=Notifications
-Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Donations
Module700Desc=Donation management
Module1200Name=Mantis
@@ -514,16 +514,16 @@ Module5000Name=Multi-company
Module5000Desc=Allows you to manage multiple companies
Module6000Name=Workflow
Module6000Desc=Workflow management
-Module20000Name=Holidays
-Module20000Desc=Declare and follow employees holidays
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
Module39000Name=Product batch
Module39000Desc=Batch number, eat-by and sell-by date management on products
Module50000Name=PayBox
Module50000Desc=Module to offer an online payment page by credit card with PayBox
Module50100Name=Point of sales
Module50100Desc=Point of sales module
-Module50200Name= Paypal
-Module50200Desc= Module to offer an online payment page by credit card with Paypal
+Module50200Name=Paypal
+Module50200Desc=Module to offer an online payment page by credit card with Paypal
Module50400Name=Accounting (advanced)
Module50400Desc=Accounting management (double parties)
Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=Read standing orders
Permission152=Create/modify a standing orders request
Permission153=Transmission standing orders receipts
Permission154=Credit/refuse standing orders receipts
-Permission161=Read contracts
-Permission162=Create/modify contracts
-Permission163=Activate a service of a contract
-Permission164=Disable a service of a contract
-Permission165=Delete contracts
-Permission171=Read trips
-Permission172=Create/modify trips
-Permission173=Delete trips
-Permission178=Export trips
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Read trips and expenses (own and his subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
Permission180=Read suppliers
Permission181=Read supplier orders
Permission182=Create/modify supplier orders
@@ -671,7 +672,7 @@ Permission300=Read bar codes
Permission301=Create/modify bar codes
Permission302=Delete bar codes
Permission311=Read services
-Permission312=Assign service to contract
+Permission312=Assign service/subscription to contract
Permission331=Read bookmarks
Permission332=Create/modify bookmarks
Permission333=Delete bookmarks
@@ -701,8 +702,8 @@ Permission701=Read donations
Permission702=Create/modify donations
Permission703=Delete donations
Permission1001=Read stocks
-Permission1002=Create/modify stocks
-Permission1003=Delete stocks
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=Read stock movements
Permission1005=Create/modify stock movements
Permission1101=Read delivery orders
@@ -1038,7 +1039,6 @@ YesInSummer=Yes in summer
OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
SuhosinSessionEncrypt=Session storage encrypted by Suhosin
ConditionIsCurrently=Condition is currently %s
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
YouUseBestDriver=You use driver %s that is best driver available currently.
YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by
ModuleCompanyCodePanicum=Return an empty accountancy code.
ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
UseNotifications=Use notifications
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events, to third parties (customers or suppliers) that are configured to. Choice of active notification and targets contacts is made one third party at time.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
ModelModules=Documents templates
DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
WatermarkOnDraft=Watermark on draft document
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=Add delivery date ability
UseOptionLineIfNoQuantity=A line of product/service with a zero amount is considered as an option
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list
ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order
FreeLegalTextOnOrders=Free text on orders
WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
##### Clicktodial #####
ClickToDialSetup=Click To Dial module setup
ClickToDialUrlDesc=Url called when a click on phone picto is done. In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=Intervention numbering models
TemplatePDFInterventions=Intervention card documents models
WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
##### Contracts #####
-ContractsSetup=Contracts module setup
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=Contracts numbering modules
TemplatePDFContracts=Contracts documents models
FreeLegalTextOnContracts=Free text on contracts
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
CacheByServer=Cache by server
CacheByClient=Cache by browser
CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=Products module setup
ServiceSetup=Services module setup
@@ -1382,9 +1384,10 @@ MailingSetup=EMailing module setup
MailingEMailFrom=Sender EMail (From) for emails sent by emailing module
MailingEMailError=Return EMail (Errors-to) for emails with errors
##### Notification #####
-NotificationSetup=Notification bu email module setup
+NotificationSetup=EMail notification module setup
NotificationEMailFrom=Sender EMail (From) for emails sent for notifications
-ListOfAvailableNotifications=List of available notifications (This list depends on activated modules)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
##### Sendings #####
SendingsSetup=Sending module setup
SendingsReceiptModel=Sending receipt model
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe
OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
##### Stock #####
-StockSetup=Configuration module stock
-UserWarehouse=Use user personal stocks
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=Menu deleted
TreeMenu=Tree menus
@@ -1478,11 +1482,14 @@ ClickToDialDesc=This module allows to add an icon after phone numbers. A click o
##### Point Of Sales (CashDesk) #####
CashDesk=Point of sales
CashDeskSetup=Point of sales module setup
-CashDeskThirdPartyForSell=Generic third party to use for sells
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Default account to use to receive cash payments
CashDeskBankAccountForCheque= Default account to use to receive payments by cheque
CashDeskBankAccountForCB= Default account to use to receive payments by credit cards
-CashDeskIdWareHouse=Warehouse to use for sells
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Bookmark module setup
BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu.
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Delete fiscal year
ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
Opened=Opened
Closed=Closed
-
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
diff --git a/htdocs/langs/uz_UZ/agenda.lang b/htdocs/langs/uz_UZ/agenda.lang
index 9b3efc07dabbe9581725281613818cea48764551..1ed4e637d146d23c70eb1cad90469a4841a9678d 100644
--- a/htdocs/langs/uz_UZ/agenda.lang
+++ b/htdocs/langs/uz_UZ/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= Automatic filling
AgendaAutoActionDesc= Define here events for which you want Dolibarr to create automatically an event in agenda. If nothing is checked (by default), only manual actions will be included in agenda.
AgendaSetupOtherDesc= This page provides options to allow export of your Dolibarr events into an external calendar (thunderbird, google calendar, ...)
AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda.
-ActionsEvents= Events for which Dolibarr will create an action in agenda automatically
-PropalValidatedInDolibarr= Proposal %s validated
-InvoiceValidatedInDolibarr= Invoice %s validated
+ActionsEvents=Events for which Dolibarr will create an action in agenda automatically
+PropalValidatedInDolibarr=Proposal %s validated
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
InvoiceDeleteDolibarr=Invoice %s deleted
OrderValidatedInDolibarr= Order %s validated
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=Order %s approved
OrderRefusedInDolibarr=Order %s refused
OrderBackToDraftInDolibarr=Order %s go back to draft status
OrderCanceledInDolibarr=Order %s canceled
-InterventionValidatedInDolibarr=Intervention %s validated
ProposalSentByEMail=Commercial proposal %s sent by EMail
OrderSentByEMail=Customer order %s sent by EMail
InvoiceSentByEMail=Customer invoice %s sent by EMail
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=Supplier order %s sent by EMail
SupplierInvoiceSentByEMail=Supplier invoice %s sent by EMail
ShippingSentByEMail=Shipping %s sent by EMail
ShippingValidated= Shipping %s validated
-InterventionSentByEMail=Intervention %s sent by EMail
-InterventionClassifiedBilled=Intervention %s classified as Billed
NewCompanyToDolibarr= Third party created
DateActionPlannedStart= Planned start date
DateActionPlannedEnd= Planned end date
@@ -70,9 +68,9 @@ DateActionStart= Start date
DateActionEnd= End date
AgendaUrlOptions1=You can also add following parameters to filter output:
AgendaUrlOptions2=<b>login=%s</b> to restrict output to actions created by, assigned to or done by user <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions created by user <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> to restrict output to actions done by user <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
AgendaShowBirthdayEvents=Show birthday's contacts
AgendaHideBirthdayEvents=Hide birthday's contacts
Busy=Busy
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=URL to access .ical file
ExtSiteNoLabel=No Description
WorkingTimeRange=Working time range
WorkingDaysRange=Working days range
-AddEvent=Add event
+AddEvent=Create event
MyAvailability=My availability
diff --git a/htdocs/langs/uz_UZ/bills.lang b/htdocs/langs/uz_UZ/bills.lang
index 1edd72130768502f868a057917ba530eeb280671..81b7515a8b8c3c3aa8a2d9e46e3fe9ccad263f59 100644
--- a/htdocs/langs/uz_UZ/bills.lang
+++ b/htdocs/langs/uz_UZ/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Credit note
InvoiceAvoirAsk=Credit note to correct invoice
InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example).
invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
-invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
ReplaceInvoice=Replace invoice %s
ReplacementInvoice=Replacement invoice
ReplacedByInvoice=Replaced by invoice %s
@@ -87,7 +87,7 @@ ClassifyCanceled=Classify 'Abandoned'
ClassifyClosed=Classify 'Closed'
ClassifyUnBilled=Classify 'Unbilled'
CreateBill=Create Invoice
-AddBill=Add invoice or credit note
+AddBill=Create invoice or credit note
AddToDraftInvoices=Add to draft invoice
DeleteBill=Delete invoice
SearchACustomerInvoice=Search for a customer invoice
@@ -99,7 +99,7 @@ DoPaymentBack=Do payment back
ConvertToReduc=Convert into future discount
EnterPaymentReceivedFromCustomer=Enter payment received from customer
EnterPaymentDueToCustomer=Make payment due to customer
-DisabledBecauseRemainderToPayIsZero=Disabled because remainder to pay is zero
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
Amount=Amount
PriceBase=Price base
BillStatus=Invoice status
@@ -137,8 +137,6 @@ BillFrom=From
BillTo=To
ActionsOnBill=Actions on invoice
NewBill=New invoice
-Prélèvements=Standing order
-Prélèvements=Standing order
LastBills=Last %s invoices
LastCustomersBills=Last %s customers invoices
LastSuppliersBills=Last %s suppliers invoices
@@ -156,9 +154,9 @@ ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b> ?
ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned' ?
ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid ?
ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice ?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
@@ -191,9 +189,9 @@ AlreadyPaid=Already paid
AlreadyPaidBack=Already paid back
AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposits)
Abandoned=Abandoned
-RemainderToPay=Remainder to pay
-RemainderToTake=Remainder to take
-RemainderToPayBack=Remainder to pay back
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
Rest=Pending
AmountExpected=Amount claimed
ExcessReceived=Excess received
@@ -219,19 +217,18 @@ NoInvoice=No invoice
ClassifyBill=Classify invoice
SupplierBillsToPay=Suppliers invoices to pay
CustomerBillsUnpaid=Unpaid customers invoices
-DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters
-DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=Non-recoverable
SetConditions=Set payment terms
SetMode=Set payment mode
Billed=Billed
-RepeatableInvoice=Pre-defined invoice
-RepeatableInvoices=Pre-defined invoices
-Repeatable=Pre-defined
-Repeatables=Pre-defined
-ChangeIntoRepeatableInvoice=Convert into pre-defined
-CreateRepeatableInvoice=Create pre-defined invoice
-CreateFromRepeatableInvoice=Create from pre-defined invoice
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines
CustomersInvoicesAndPayments=Customer invoices and payments
ExportDataset_invoice_1=Customer invoices list and invoice's lines
diff --git a/htdocs/langs/uz_UZ/categories.lang b/htdocs/langs/uz_UZ/categories.lang
index ed61bfc08a61b4e5bfdadecfe7f6a15298afc6e3..22914931db137a565a45daad16b9b04fbd08465b 100644
--- a/htdocs/langs/uz_UZ/categories.lang
+++ b/htdocs/langs/uz_UZ/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories
CatCusLinks=Links between customers/prospects and categories
CatProdLinks=Links between products/services and categories
CatMemberLinks=Links between members and categories
-CatProdLinks=Links between products/services and categories
-CatCusLinks=Links between customers/prospects and categories
-CatSupLinks=Links between suppliers and categories
DeleteFromCat=Remove from category
DeletePicture=Picture delete
ConfirmDeletePicture=Confirm picture deletion?
@@ -112,3 +109,4 @@ CategoriesSetup=Categories setup
CategorieRecursiv=Link with parent category automatically
CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category
diff --git a/htdocs/langs/uz_UZ/compta.lang b/htdocs/langs/uz_UZ/compta.lang
index 3929cfde0367b6f5d8dc7945385de4877d9e4759..9fe5eff520d881c617f38aa7d9db675ec18f118a 100644
--- a/htdocs/langs/uz_UZ/compta.lang
+++ b/htdocs/langs/uz_UZ/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s
SuppliersProductsSellSalesTurnover=The generated turnover by the sales of supplier's products.
CheckReceipt=Check deposit
CheckReceiptShort=Check deposit
+LastCheckReceiptShort=Last %s check receipts
NewCheckReceipt=New discount
NewCheckDeposit=New check deposit
NewCheckDepositOn=Create receipt for deposit on account: %s
diff --git a/htdocs/langs/uz_UZ/contracts.lang b/htdocs/langs/uz_UZ/contracts.lang
index e5ad112b222db93bedf8e6ded250a39d062215c6..511516dc755e4f3aba2d67e91238426896629cbd 100644
--- a/htdocs/langs/uz_UZ/contracts.lang
+++ b/htdocs/langs/uz_UZ/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Contracts area
ListOfContracts=List of contracts
-LastContracts=Last %s modified contracts
+LastModifiedContracts=Last %s modified contracts
AllContracts=All contracts
ContractCard=Contract card
ContractStatus=Contract status
@@ -27,7 +27,7 @@ MenuRunningServices=Running services
MenuExpiredServices=Expired services
MenuClosedServices=Closed services
NewContract=New contract
-AddContract=Add contract
+AddContract=Create contract
SearchAContract=Search a contract
DeleteAContract=Delete a contract
CloseAContract=Close a contract
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=List of running contract lines
ListOfRunningServices=List of running services
NotActivatedServices=Inactive services (among validated contracts)
BoardNotActivatedServices=Services to activate among validated contracts
-LastContracts=Last %s modified contracts
+LastContracts=Last % contracts
LastActivatedServices=Last %s activated services
LastModifiedServices=Last %s modified services
EditServiceLine=Edit service line
diff --git a/htdocs/langs/uz_UZ/cron.lang b/htdocs/langs/uz_UZ/cron.lang
index 768cd012384454aef37c15bb651dcf719a11e334..195ad43c87c41ae0938fa27745ba14209fbac724 100644
--- a/htdocs/langs/uz_UZ/cron.lang
+++ b/htdocs/langs/uz_UZ/cron.lang
@@ -1,10 +1,8 @@
# Dolibarr language file - Source file is en_US - cron
-#
# About page
About = About
CronAbout = About Cron
CronAboutPage = Cron about page
-
# Right
Permission23101 = Read Scheduled task
Permission23102 = Create/update Scheduled task
@@ -20,9 +18,8 @@ CronExplainHowToRunUnix=On Unix environment you should use crontab to run Comman
CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
# Menu
CronJobs=Scheduled jobs
-CronListActive= List of active jobs
-CronListInactive= List of disabled jobs
-CronListActive= List of active jobs
+CronListActive=List of active/scheduled jobs
+CronListInactive=List of disabled jobs
# Page list
CronDateLastRun=Last run
CronLastOutput=Last run output
diff --git a/htdocs/langs/uz_UZ/donations.lang b/htdocs/langs/uz_UZ/donations.lang
index 66ddea95a5c694d8044c40b7da05319d0b77a530..f7aed91cf81caf0e83e390519642ea1f199670c6 100644
--- a/htdocs/langs/uz_UZ/donations.lang
+++ b/htdocs/langs/uz_UZ/donations.lang
@@ -4,7 +4,7 @@ Donations=Donations
DonationRef=Donation ref.
Donor=Donor
Donors=Donors
-AddDonation=Add a donation
+AddDonation=Create a donation
NewDonation=New donation
ShowDonation=Show donation
DonationPromise=Gift promise
@@ -31,3 +31,8 @@ DonationRecipient=Donation recipient
ThankYou=Thank You
IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
MinimumAmount=Minimum amount is %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/uz_UZ/externalsite.lang b/htdocs/langs/uz_UZ/externalsite.lang
index 62da68c045d199d9fd0a078061cc7739f33ae967..da4853df0df086e3040a294cec116c590f4c2e9e 100644
--- a/htdocs/langs/uz_UZ/externalsite.lang
+++ b/htdocs/langs/uz_UZ/externalsite.lang
@@ -2,3 +2,4 @@
ExternalSiteSetup=Setup link to external website
ExternalSiteURL=External Site URL
ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/uz_UZ/holiday.lang b/htdocs/langs/uz_UZ/holiday.lang
index c25abf6449ca2cc97d5dba6340d1530b5ea9c675..f5b87fefb0878c40cc75768a1d1c4bcf4cb80c72 100644
--- a/htdocs/langs/uz_UZ/holiday.lang
+++ b/htdocs/langs/uz_UZ/holiday.lang
@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
CantCreateCP=You don't have the right to make leave requests.
InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=Update
CantUpdate=You cannot update this leave request.
NoDateDebut=You must select a start date.
NoDateFin=You must select an end date.
-ErrorDureeCP=Your request for holidays does not contain working day.
-TitleValidCP=Approve the request holidays
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
ConfirmValidCP=Are you sure you want to approve the leave request?
DateValidCP=Date approved
TitleToValidCP=Send leave request
ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the request holidays
+TitleRefuseCP=Refuse the leave request
ConfirmRefuseCP=Are you sure you want to refuse the leave request?
NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
+TitleCancelCP=Cancel the leave request
ConfirmCancelCP=Are you sure you want to cancel the leave request?
DetailRefusCP=Reason for refusal
DateRefusCP=Date of refusal
@@ -78,7 +77,7 @@ ActionByCP=Performed by
UserUpdateCP=For the user
PrevSoldeCP=Previous Balance
NewSoldeCP=New Balance
-alreadyCPexist=A request for holidays has already been done on this period.
+alreadyCPexist=A leave request has already been done on this period.
UserName=Name
Employee=Employee
FirstDayOfHoliday=First day of vacation
@@ -88,25 +87,25 @@ ManualUpdate=Manual update
HolidaysCancelation=Leave request cancelation
## Configuration du Module ##
-ConfCP=Configuration of holidays module
+ConfCP=Configuration of leave request module
DescOptionCP=Description of the option
ValueOptionCP=Value
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
UpdateConfCPOK=Updated successfully.
ErrorUpdateConfCP=An error occurred during the update, please try again.
-AddCPforUsers=Please add the balance of holidays of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
Module27130Name= Management of leave requests
Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
TitleOptionEventCP=Settings of leave requets for events
ValidEventCP=Validate
UpdateEventCP=Update events
diff --git a/htdocs/langs/uz_UZ/interventions.lang b/htdocs/langs/uz_UZ/interventions.lang
index 17641a0ab3e499b2f66a4b4ddd80c46d478ff702..c79da05364e615bb2b234ce4211a373fc94e9168 100644
--- a/htdocs/langs/uz_UZ/interventions.lang
+++ b/htdocs/langs/uz_UZ/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Intervention
Interventions=Interventions
InterventionCard=Intervention card
NewIntervention=New intervention
-AddIntervention=Add intervention
+AddIntervention=Create intervention
ListOfInterventions=List of interventions
EditIntervention=Edit intervention
ActionsOnFicheInter=Actions on intervention
@@ -30,6 +30,15 @@ StatusInterInvoiced=Billed
RelatedInterventions=Related interventions
ShowIntervention=Show intervention
SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention
TypeContact_fichinter_internal_INTERVENING=Intervening
diff --git a/htdocs/langs/uz_UZ/mails.lang b/htdocs/langs/uz_UZ/mails.lang
index 98e6dc335eeced95e230de5b5ca5b8f78fc59681..7a2111988228ab02739bad001958aa455eb9013c 100644
--- a/htdocs/langs/uz_UZ/mails.lang
+++ b/htdocs/langs/uz_UZ/mails.lang
@@ -115,7 +115,7 @@ SentBy=Sent by
MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=Clear list
ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
ToAddRecipientsChooseHere=Add recipients by choosing from the lists
@@ -133,6 +133,9 @@ Notifications=Notifications
NoNotificationsWillBeSent=No email notifications are planned for this event and company
ANotificationsWillBeSent=1 notification will be sent by email
SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification request
-ListOfActiveNotifications=List all active email notification requests
+AddNewNotification=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
ListOfNotificationsDone=List all email notifications sent
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang
index 21d3458532d0c4cba6be098db5ce6e3b29a2ecdd..b586bf4ea5a59959b1b58cb89ef7cf2367ebc692 100644
--- a/htdocs/langs/uz_UZ/main.lang
+++ b/htdocs/langs/uz_UZ/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr
ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'.
ErrorFailedToSaveFile=Error, failed to save file.
-ErrorOnlyPngJpgSupported=Error, only .png and .jpg image format file are supported.
-ErrorImageFormatNotSupported=Your PHP does not support functions to convert images of this format.
SetDate=Set date
SelectDate=Select a date
SeeAlso=See also %s
BackgroundColorByDefault=Default background color
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
NbOfEntries=Nb of entries
GoToWikiHelpPage=Read online help (need Internet access)
@@ -266,6 +266,7 @@ Afternoon=Afternoon
Quadri=Quadri
MonthOfDay=Month of the day
HourShort=H
+MinuteShort=mn
Rate=Rate
UseLocalTax=Include tax
Bytes=Bytes
@@ -340,6 +341,7 @@ FullList=Full list
Statistics=Statistics
OtherStatistics=Other statistics
Status=Status
+Favorite=Favorite
ShortInfo=Info.
Ref=Ref.
RefSupplier=Ref. supplier
@@ -365,6 +367,7 @@ ActionsOnCompany=Events about this third party
ActionsOnMember=Events about this member
NActions=%s events
NActionsLate=%s late
+RequestAlreadyDone=Request already recorded
Filter=Filter
RemoveFilter=Remove filter
ChartGenerated=Chart generated
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Extra attributes setup
URLPhoto=URL of photo/logo
SetLinkToThirdParty=Link to another third party
CreateDraft=Create draft
+SetToDraft=Back to draft
ClickToEdit=Click to edit
ObjectDeleted=Object %s deleted
ByCountry=By country
@@ -678,7 +682,7 @@ ViewPrivateNote=View notes
XMoreLines=%s line(s) hidden
PublicUrl=Public URL
AddBox=Add box
-
+SelectElementAndClickRefresh=Select an element and click Refresh
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/langs/uz_UZ/margins.lang b/htdocs/langs/uz_UZ/margins.lang
index 3fca6d7a6440d0e09acfc61f524ed9b7c3326a78..606d5e5053a25855631a7d6ee61b6c392c1fe32c 100644
--- a/htdocs/langs/uz_UZ/margins.lang
+++ b/htdocs/langs/uz_UZ/margins.lang
@@ -38,4 +38,7 @@ BuyingCost=Cost price
UnitCharges=Unit charges
Charges=Charges
AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/uz_UZ/orders.lang b/htdocs/langs/uz_UZ/orders.lang
index 3d53001215463a6647c838394ec11668d45c4bcf..6ee9c19fa95f45044b7466cc0fdcbf21819ef13a 100644
--- a/htdocs/langs/uz_UZ/orders.lang
+++ b/htdocs/langs/uz_UZ/orders.lang
@@ -53,7 +53,7 @@ ShippingExist=A shipment exists
DraftOrWaitingApproved=Draft or approved not yet ordered
DraftOrWaitingShipped=Draft or validated not yet shipped
MenuOrdersToBill=Orders delivered
-MenuOrdersToBill2=Orders to bill
+MenuOrdersToBill2=Billable orders
SearchOrder=Search order
SearchACustomerOrder=Search a customer order
ShipProduct=Ship product
@@ -65,7 +65,7 @@ ValidateOrder=Validate order
UnvalidateOrder=Unvalidate order
DeleteOrder=Delete order
CancelOrder=Cancel order
-AddOrder=Add order
+AddOrder=Create order
AddToMyOrders=Add to my orders
AddToOtherOrders=Add to other orders
AddToDraftOrders=Add to draft order
@@ -154,7 +154,6 @@ OrderByPhone=Phone
CreateInvoiceForThisCustomer=Bill orders
NoOrdersToInvoice=No orders billable
CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-MenuOrdersToBill2=Orders to bill
OrderCreation=Order creation
Ordered=Ordered
OrderCreated=Your orders have been created
diff --git a/htdocs/langs/uz_UZ/oscommerce.lang b/htdocs/langs/uz_UZ/oscommerce.lang
deleted file mode 100644
index 3ff9108ead4e2ba3a94229a24177998c14e624fc..0000000000000000000000000000000000000000
--- a/htdocs/langs/uz_UZ/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=OS Commerce module setup
-OSCommerceSetupSaved=OS Commerce setup saved
-OSCommerceServer=OS Commerce server host/ip
-OSCommerceDatabaseName=OS Commerce database name
-OSCommercePrefix=OS Commerce tables prefix
-OSCommerceUser=OS Commerce database login
diff --git a/htdocs/langs/uz_UZ/other.lang b/htdocs/langs/uz_UZ/other.lang
index b56ef2944951b7c0d44d285b1e7a02ad6077a579..889918881838dcbc59b7a031b8af656cec175167 100644
--- a/htdocs/langs/uz_UZ/other.lang
+++ b/htdocs/langs/uz_UZ/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=Security code
Calendar=Calendar
-AddTrip=Add trip
Tools=Tools
ToolsDesc=This area is dedicated to group miscellaneous tools not available into other menu entries.<br><br>Those tools can be reached from menu on the side.
Birthday=Birthday
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation
Notify_TASK_CREATE=Task created
Notify_TASK_MODIFY=Task modified
Notify_TASK_DELETE=Task deleted
+SeeModuleSetup=See module setup
NbOfAttachedFiles=Number of attached files/documents
TotalSizeOfAttachedFiles=Total size of attached files/documents
MaxSize=Maximum size
@@ -80,6 +80,16 @@ ModifiedBy=Modified by %s
ValidatedBy=Validated by %s
CanceledBy=Canceled by %s
ClosedBy=Closed by %s
+CreatedById=User id who created
+ModifiedById=User id who made last change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made last change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
FileWasRemoved=File %s was removed
DirWasRemoved=Directory %s was removed
FeatureNotYetAvailableShort=Available in a next version
@@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your
##### Calendar common #####
AddCalendarEntry=Add entry in calendar %s
-NewCompanyToDolibarr=Company %s added into Dolibarr
-ContractValidatedInDolibarr=Contract %s validated in Dolibarr
-ContractCanceledInDolibarr=Contract %s canceled in Dolibarr
-ContractClosedInDolibarr=Contract %s closed in Dolibarr
-PropalClosedSignedInDolibarr=Proposal %s signed in Dolibarr
-PropalClosedRefusedInDolibarr=Proposal %s refused in Dolibarr
-PropalValidatedInDolibarr=Proposal %s validated in Dolibarr
-InvoiceValidatedInDolibarr=Invoice %s validated in Dolibarr
-InvoicePaidInDolibarr=Invoice %s changed to paid in Dolibarr
-InvoiceCanceledInDolibarr=Invoice %s canceled in Dolibarr
-PaymentDoneInDolibarr=Payment %s done in Dolibarr
-CustomerPaymentDoneInDolibarr=Customer payment %s done in Dolibarr
-SupplierPaymentDoneInDolibarr=Supplier payment %s done in Dolibarr
-MemberValidatedInDolibarr=Member %s validated in Dolibarr
-MemberResiliatedInDolibarr=Member %s resiliated in Dolibarr
-MemberDeletedInDolibarr=Member %s deleted from Dolibarr
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added in Dolibarr
-ShipmentValidatedInDolibarr=Shipment %s validated in Dolibarr
-ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
##### Export #####
Export=Export
ExportsArea=Exports area
diff --git a/htdocs/langs/uz_UZ/paybox.lang b/htdocs/langs/uz_UZ/paybox.lang
index f937768240c3bb7b70a1bdf3e499c60b71d16ab9..aced32a49440a9ff7a1b1e0279522ff49cec7821 100644
--- a/htdocs/langs/uz_UZ/paybox.lang
+++ b/htdocs/langs/uz_UZ/paybox.lang
@@ -35,3 +35,6 @@ MessageKO=Message on canceled payment return page
NewPayboxPaymentReceived=New Paybox payment received
NewPayboxPaymentFailed=New Paybox payment tried but failed
PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/uz_UZ/sendings.lang b/htdocs/langs/uz_UZ/sendings.lang
index 2ae43f3976607147c1e8fc3a41898f572cee9868..f6111bac6841189e50c3c7fb9028962b56e3997e 100644
--- a/htdocs/langs/uz_UZ/sendings.lang
+++ b/htdocs/langs/uz_UZ/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is do
RelatedShippings=Related shippings
ShipmentLine=Shipment line
CarrierList=List of transporters
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
# Sending methods
SendingMethodCATCH=Catch by customer
diff --git a/htdocs/langs/uz_UZ/stocks.lang b/htdocs/langs/uz_UZ/stocks.lang
index 5d11b0fd7a0992284856369a2d4b919e56a34453..06c502504e9f19219ba028be8d02fbb55e5f0697 100644
--- a/htdocs/langs/uz_UZ/stocks.lang
+++ b/htdocs/langs/uz_UZ/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Warehouse label is required
CorrectStock=Correct stock
ListOfWarehouses=List of warehouses
ListOfStockMovements=List of stock movements
-StocksArea=Stocks area
+StocksArea=Warehouses area
Location=Location
LocationSummary=Short name location
NumberOfDifferentProducts=Number of different products
diff --git a/htdocs/langs/uz_UZ/users.lang b/htdocs/langs/uz_UZ/users.lang
index 0afaab6ad7f7ca7de787d1bad2656917763a3f45..baf209f9d1c7ff7527f6f0237519cac6f683a9e3 100644
--- a/htdocs/langs/uz_UZ/users.lang
+++ b/htdocs/langs/uz_UZ/users.lang
@@ -63,7 +63,6 @@ ShowGroup=Show group
ShowUser=Show user
NonAffectedUsers=Non assigned users
UserModified=User modified successfully
-GroupModified=Group modified successfully
PhotoFile=Photo file
UserWithDolibarrAccess=User with Dolibarr access
ListOfUsersInGroup=List of users in this group
@@ -103,7 +102,7 @@ UserDisabled=User %s disabled
UserEnabled=User %s activated
UserDeleted=User %s removed
NewGroupCreated=Group %s created
-GroupModified=Group modified successfully
+GroupModified=Group %s modified
GroupDeleted=Group %s removed
ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact ?
ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member ?
@@ -114,8 +113,10 @@ YourRole=Your roles
YourQuotaOfUsersIsReached=Your quota of active users is reached !
NbOfUsers=Nb of users
DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
-HierarchicalResponsible=Hierarchical responsible
+HierarchicalResponsible=Supervisor
HierarchicView=Hierarchical view
UseTypeFieldToChange=Use field Type to change
OpenIDURL=OpenID URL
LoginUsingOpenID=Use OpenID to login
+WeeklyHours=Weekly hours
+ColorUser=Color of the user
diff --git a/htdocs/langs/uz_UZ/withdrawals.lang b/htdocs/langs/uz_UZ/withdrawals.lang
index 58ac3e252ec59d67ff8d71c394b4c44265bc3add..e433730908416bbfa32c181a580b9e2e7e34717c 100644
--- a/htdocs/langs/uz_UZ/withdrawals.lang
+++ b/htdocs/langs/uz_UZ/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=Receipt
LastWithdrawalReceipts=Last %s withdrawal receipts
WithdrawedBills=Withdrawn invoices
WithdrawalsLines=Withdrawal lines
-RequestStandingOrderToTreat=Request for standing orders to treat
-RequestStandingOrderTreated=Request for standing orders treated
+RequestStandingOrderToTreat=Request for standing orders to process
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=Customer standing orders
CustomerStandingOrder=Customer standing order
NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
@@ -40,14 +41,13 @@ TransMetod=Transmission method
Send=Send
Lines=Lines
StandingOrderReject=Issue a rejection
-InvoiceRefused=Invoice refused
WithdrawalRefused=Withdrawal refused
WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society
RefusedData=Date of rejection
RefusedReason=Reason for rejection
RefusedInvoicing=Billing the rejection
NoInvoiceRefused=Do not charge the rejection
-InvoiceRefused=Invoice refused
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=Status
StatusUnknown=Unknown
StatusWaiting=Waiting
@@ -76,7 +76,7 @@ WithBankUsingRIB=For bank accounts using RIB
WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
BankToReceiveWithdraw=Bank account to receive withdraws
CreditDate=Credit on
-WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
ShowWithdraw=Show Withdraw
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
diff --git a/htdocs/langs/vi_VN/accountancy.lang b/htdocs/langs/vi_VN/accountancy.lang
index 2d2bda8acb2eaf1fd91cbae53f47ecef9128882c..8eba08cd1d643c70814052633a5e063c2227b0b3 100644
--- a/htdocs/langs/vi_VN/accountancy.lang
+++ b/htdocs/langs/vi_VN/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=Chọn một biểu đồ của tài khoản
Validate=Xác nhận
Addanaccount=Thêm một tài khoản kế toán
AccountAccounting=Tài khoản kế toán
-Ventilation=Thông gió
-ToDispatch=Cử
-Dispatched=Cử
+Ventilation=Breakdown
+ToDispatch=Gửi đi
+Dispatched=Đã gửi đi
-CustomersVentilation=Khách hàng thông gió
-SuppliersVentilation=Các nhà cung cấp hệ thống thông gió
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
TradeMargin=Lợi nhuận thương mại
Reports=Báo cáo
ByCustomerInvoice=Hoá đơn cho khách hàng
@@ -40,57 +40,57 @@ Update=Cập nhật
List=Danh sách
Create=Tạo
UpdateAccount=Sự biến đổi của một tài khoản kế toán
-UpdateMvts=Sửa đổi của một phong trào
+UpdateMvts=Sửa đổi của một thay đổi
WriteBookKeeping=Tài khoản ghi trong sổ kế toán tổng
Bookkeeping=Sổ cái tổng hợp
AccountBalanceByMonth=Số dư tài khoản theo tháng
-AccountingVentilation=Thông gió Kế toán
-AccountingVentilationSupplier=Nhà cung cấp hệ thống thông gió Kế toán
-AccountingVentilationCustomer=Kế toán thông gió khách hàng
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
Line=Dòng
CAHTF=Tổng số nhà cung cấp mua HT
-InvoiceLines=Dòng hoá đơn được thông gió
-InvoiceLinesDone=Đường thông gió hóa đơn
+InvoiceLines=Dòng hoá đơn được ventilation
+InvoiceLinesDone=Đường ventilation hóa đơn
IntoAccount=Trong tài khoản kế toán
-Ventilate=Thông gió
-VentilationAuto=Thông gió tự động
+Ventilate=Ventilation
+VentilationAuto=Automatic breakdown
Processing=Chế biến
EndProcessing=Sự kết thúc của chế biến
-AnyLineVentilate=Bất kỳ dòng để thông gió
+AnyLineVentilate=Bất kỳ dòng để ventilation
SelectedLines=Đường lựa chọn
Lineofinvoice=Dòng của hóa đơn
-VentilatedinAccount=Thông gió thành công trong các tài khoản kế toán
-NotVentilatedinAccount=Không thông gió trong tài khoản kế toán
+VentilatedinAccount=Ventilation thành công trong các tài khoản kế toán
+NotVentilatedinAccount=Không ventilation trong tài khoản kế toán
ACCOUNTING_SEPARATORCSV=Separator CSV
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
AccountLength=Chiều dài của kế toán tài khoản thể hiện trong Dolibarr
AccountLengthDesc=Chức năng cho phép để giả vờ chiều dài của tài khoản kế toán bằng cách thay thế không gian bởi các con số không. Chức năng này chỉ chạm vào màn hình, nó không sửa đổi các tài khoản kế toán đăng ký tại Dolibarr. Đối với xuất khẩu, chức năng này là cần thiết để tương thích với phần mềm nhất định.
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+ACCOUNTING_LENGTH_GACCOUNT=Chiều dài của các tài khoản tổng hợp
+ACCOUNTING_LENGTH_AACCOUNT=Chiều dài của các tài khoản của bên thứ ba
-ACCOUNTING_SELL_JOURNAL=Sell journal
-ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
-ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
-ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_SELL_JOURNAL=Bán tạp chí
+ACCOUNTING_PURCHASE_JOURNAL=Mua tạp chí
+ACCOUNTING_BANK_JOURNAL=Tạp chí Ngân hàng
+ACCOUNTING_CASH_JOURNAL=Tạp chí tiền mặt
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Linh tinh tạp chí
+ACCOUNTING_SOCIAL_JOURNAL=Tạp chí Xã hội
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
-ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Tài khoản chuyển nhượng
+ACCOUNTING_ACCOUNT_SUSPENSE=Tài khoản của chờ đợi
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Kế toán tài khoản mặc định cho các sản phẩm đã mua (nếu không quy định trong bảng sản phẩm)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Kế toán tài khoản mặc định cho các sản phẩm bán ra (nếu không quy định trong bảng sản phẩm)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Kế toán tài khoản mặc định cho các dịch vụ mua (nếu không quy định trong bảng dịch vụ)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Kế toán tài khoản mặc định cho các dịch vụ bán ra (nếu không quy định trong bảng dịch vụ)
Doctype=Loại văn bản
Docdate=Ngày
@@ -122,9 +122,9 @@ CustomerInvoicePayment=Thanh toán hóa đơn của khách hàng
ThirdPartyAccount=Tài khoản của bên thứ ba
-NewAccountingMvt=Phong trào mới
-NumMvts=Số phong trào
-ListeMvts=Danh sách của phong trào
+NewAccountingMvt=Thay đổi mới
+NumMvts=Số thay đổi
+ListeMvts=Danh sách của thay đổi
ErrorDebitCredit=Thẻ ghi nợ và tín dụng không thể có một giá trị cùng một lúc
ReportThirdParty=Danh sách tài khoản của bên thứ ba
@@ -140,19 +140,19 @@ Active=Trữ
NewFiscalYear=Năm tài chính mới
-DescVentilCustomer=Tham khảo ý kiến ở đây thông gió kế toán năm của hoá đơn khách hàng của bạn
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
TotalVente=Tổng kim ngạch HT
TotalMarge=Lợi nhuận tổng doanh thu
DescVentilDoneCustomer=Tham khảo ý kiến ở đây là danh sách các dòng hoá đơn cho khách hàng và tài khoản kế toán
-DescVentilTodoCustomer=Thông gió cho đường dây của bạn hóa đơn của khách hàng với một tài khoản kế toán
+DescVentilTodoCustomer=Ventilation cho đường dây của bạn hóa đơn của khách hàng với một tài khoản kế toán
ChangeAccount=Thay đổi tài khoản kế toán cho dòng lựa chọn tài khoản:
Vide=-
-DescVentilSupplier=Tham khảo ý kiến ở đây thông gió kế toán năm của các nhà cung cấp hoá đơn của bạn
-DescVentilTodoSupplier=Thông gió cho đường dây của nhà cung cấp hóa đơn với một tài khoản kế toán
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilTodoSupplier=Ventilation cho đường dây của nhà cung cấp hóa đơn với một tài khoản kế toán
DescVentilDoneSupplier=Tham khảo ý kiến ở đây là danh sách các dòng nhà cung cấp hoá đơn, tài khoản kế toán
ValidateHistory=Tự động xác nhận
ErrorAccountancyCodeIsAlreadyUse=Lỗi, bạn không thể xóa tài khoản kế toán này bởi vì nó được sử dụng
-FicheVentilation=Thẻ thông gió
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index 1e13448338f3e094542cc1cf3d07b300e91ad735..01fe161a7d1b3d2fe69d1825e59515ab75dc60c2 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -15,7 +15,7 @@ PurgeSessions=Cập nhật phiên làm việc
ConfirmPurgeSessions=Bạn có muốn xóa sạch các phiên làm việc? Điều này sẽ ngắt kết nối với tất cả người dùng (ngoại trừ bạn).
NoSessionListWithThisHandler=Phần quản lý lưu trữ phiên làm việc được tùy chỉnh trong PHP của bạn không được phép liệt kê các phiên làm việc hiện có.
LockNewSessions=Khóa kết nối mới
-ConfirmLockNewSessions=Bạn có chắc về việc hạn chế bất kỳ kết nối mới nào được tạo bởi Dolibarr hay không. Chỉ người dùng <b>%s</b> mới cs thể kết nối sau đó.
+ConfirmLockNewSessions=Bạn có chắc về việc hạn chế bất kỳ kết nối mới nào được tạo bởi Dolibarr hay không. Chỉ người dùng <b>%s</b> mới có thể kết nối sau đó.
UnlockNewSessions=Bỏ việc khóa kết nôi
YourSession=Phiên làm việc của bạn
Sessions=Phiên làm việc của người dùng
@@ -149,10 +149,10 @@ Purge=Thanh lọc
PurgeAreaDesc=Trang này cho phép bạn xóa toàn bộ các tập tin đã được xây dựng hoặc trữ bở Dolibarr (các tập tin tạm hoặc tất cả các tập tin trong thư mục <b>%s</b>). Không cần thiết phải sử dụng tính năng này. Phần này được cung cấp cho những người dùng Dolibarr mà phần hosting được cung cấp bởi một nhà cung cấp không cung cấp tính năng xóa các tập tin được xây dựng trên web server đó.
PurgeDeleteLogFile=Xóa tập tin nhật trình <b>%s</b> được tạo bởi module Syslog (không gây nguy hiểm cho việc mất mát dữ liệu)
PurgeDeleteTemporaryFiles=Xóa toàn bộ các tập tin tạm (không gây nguy hiểm cho việc thất thoát dữ liệu)
-PurgeDeleteAllFilesInDocumentsDir=Xóa tất cả các file trong thư <b>mục% s.</b> Tập tin tạm thời mà còn sao lưu cơ sở dữ liệu bãi, tập tin đính kèm với các yếu tố (các bên thứ ba, hóa đơn, ...) và tải lên vào module ECM sẽ bị xóa.
+PurgeDeleteAllFilesInDocumentsDir=Xóa tất cả các file trong thư mục <b>%s</b>. Tập tin tạm thời mà còn sao lưu cơ sở dữ liệu bãi, tập tin đính kèm với các yếu tố (các bên thứ ba, hóa đơn, ...) và tải lên vào module ECM sẽ bị xóa.
PurgeRunNow=Tẩy giờ
PurgeNothingToDelete=Không có thư mục hoặc tập tin để xóa.
-PurgeNDirectoriesDeleted=<b>% Của</b> các tập tin hoặc thư mục bị xóa.
+PurgeNDirectoriesDeleted=<b>%</b> các tập tin hoặc thư mục bị xóa.
PurgeAuditEvents=Thanh trừng tất cả các sự kiện an ninh
ConfirmPurgeAuditEvents=Bạn Bạn có chắc chắn muốn thanh trừng tất cả các sự kiện an ninh? Tất cả các nhật bảo mật sẽ bị xóa, không có dữ liệu khác sẽ bị xóa.
NewBackup=Sao lưu mới
@@ -171,8 +171,8 @@ ImportMethod=Phương pháp nhập khẩu
ToBuildBackupFileClickHere=Để xây dựng một tập tin sao lưu, nhấn vào <a href="%s">đây</a> .
ImportMySqlDesc=Để nhập một tập tin sao lưu, bạn phải sử dụng lệnh mysql từ dòng lệnh:
ImportPostgreSqlDesc=Để nhập một tập tin sao lưu, bạn phải sử dụng lệnh pg_restore từ dòng lệnh:
-ImportMySqlCommand=% S% s <mybackupfile.sql
-ImportPostgreSqlCommand=% S% s mybackupfile.sql
+ImportMySqlCommand=%s %s < mybackupfile.sql
+ImportPostgreSqlCommand=%s %s mybackupfile.sql
FileNameToGenerate=Tên tập tin để tạo ra
Compression=Nén
CommandsToDisableForeignKeysForImport=Lệnh để vô hiệu hóa các phím nước ngoài nhập khẩu
@@ -213,19 +213,19 @@ URL=Liên kết
BoxesAvailable=Hộp có sẵn
BoxesActivated=Hộp kích hoạt
ActivateOn=Kích hoạt trên
-ActiveOn=Hoạt tính
+ActiveOn=Đã kích hoạt trên
SourceFile=Tập tin nguồn
AutomaticIfJavascriptDisabled=Tự động nếu Javascript bị vô hiệu hóa
AvailableOnlyIfJavascriptNotDisabled=Chỉ có sẵn nếu JavaScript không bị vô hiệu hóa
AvailableOnlyIfJavascriptAndAjaxNotDisabled=Chỉ có sẵn nếu JavaScript không bị vô hiệu hóa
Required=Yêu cầu
-UsedOnlyWithTypeOption=Used by some agenda option only
+UsedOnlyWithTypeOption=Được sử dụng bởi một số chương trình nghị sự lựa chọn duy nhất
Security=An ninh
Passwords=Mật khẩu
DoNotStoreClearPassword=Do không có cửa hàng mật khẩu rõ ràng trong cơ sở dữ liệu nhưng cửa hàng chỉ có giá trị được mã hóa (đề nghị Đã kích hoạt)
MainDbPasswordFileConfEncrypted=Cơ sở dữ liệu mật khẩu được mã hóa trong conf.php (Đã kích hoạt được đề nghị)
-InstrucToEncodePass=Để có mật khẩu mã hóa vào tập tin <b>conf.php,</b> thay thế dòng <br> <b>$ Dolibarr_main_db_pass = "..."</b> <br> bởi <br> <b>$ Dolibarr_main_db_pass = "crypted:% s"</b>
-InstrucToClearPass=Để có mật khẩu giải mã (làm sạch) vào tập tin <b>conf.php,</b> thay thế dòng <br> <b>$ Dolibarr_main_db_pass = "crypted: ..."</b> <br> bởi <br> <b>$ Dolibarr_main_db_pass = "% s"</b>
+InstrucToEncodePass=Để có mật khẩu mã hóa vào tập tin <b>conf.php</b>, thay thế dòng <br><b>$dolibarr_main_db_pass="..."</b><br> bởi <br><b>$dolibarr_main_db_pass="crypted:%s"</b>
+InstrucToClearPass=Để có mật khẩu giải mã (làm sạch) vào tập tin <b>conf.php</b>, thay thế dòng <br><b>$dolibarr_main_db_pass="crypted:..."</b><br> bởi <br><b>$dolibarr_main_db_pass="%s"</b>
ProtectAndEncryptPdfFiles=Bảo vệ các tập tin pdf được tạo ra (hoạt không được khuyến khích, phá vỡ hệ pdf khối lượng)
ProtectAndEncryptPdfFilesDesc=Bảo vệ tài liệu PDF giữ cho nó có sẵn để đọc và in với bất kỳ trình duyệt PDF. Tuy nhiên, chỉnh sửa và sao chép là không thể nữa. Lưu ý rằng việc sử dụng tính năng này làm cho xây dựng một tích lũy pdf toàn cầu không làm việc (như hóa đơn chưa thanh toán).
Feature=Tính năng
@@ -241,23 +241,23 @@ OfficialMarketPlace=Thị trường chính thức cho các module bên ngoài /
OfficialWebHostingService=Dịch vụ lưu trữ web tham chiếu (Cloud lưu trữ)
ReferencedPreferredPartners=Đối tác ưa thích
OtherResources=Autres nguồn tài
-ForDocumentationSeeWiki=Đối với người dùng hay tài liệu hướng dẫn phát triển (tài liệu, Hỏi đáp về ...), <br> hãy xem các Dolibarr Wiki: <br> <a href="%s" target="_blank"><b>% S</b></a>
-ForAnswersSeeForum=Đối với bất kỳ câu hỏi khác / giúp đỡ, bạn có thể sử dụng diễn đàn Dolibarr: <br> <a href="%s" target="_blank"><b>% S</b></a>
+ForDocumentationSeeWiki=Đối với người dùng hay tài liệu hướng dẫn phát triển (tài liệu, Hỏi đáp về ...), <br> hãy xem các Dolibarr Wiki: <br><b><a href="%s" target="_blank">%s</a></b>
+ForAnswersSeeForum=Đối với bất kỳ câu hỏi khác / giúp đỡ, bạn có thể sử dụng diễn đàn Dolibarr: <br><b><a href="%s" target="_blank">%s</a></b>
HelpCenterDesc1=Khu vực này có thể giúp bạn để có được một dịch vụ hỗ trợ giúp về Dolibarr.
-HelpCenterDesc2=Một số phần của dịch vụ này <b>chỉ</b> có sẵn trong <b>tiếng Anh.</b>
-CurrentTopMenuHandler=Hiện xử lý đơn hàng đầu
+HelpCenterDesc2=Một số phần của dịch vụ này có sẵn <b>chỉ trong tiếng Anh</b>.
+CurrentTopMenuHandler=Xử lý menu trên cùng hiện tại
CurrentLeftMenuHandler=Xử lý menu bên trái hiện tại
-CurrentMenuHandler=Xử lý đơn hiện tại
-CurrentSmartphoneMenuHandler=Xử lý đơn điện thoại thông minh hiện nay
+CurrentMenuHandler=Xử lý menu hiện tại
+CurrentSmartphoneMenuHandler=Xử lý menu điện thoại thông minh hiện tại
MeasuringUnit=Đơn vị đo
Emails=E-mail
EMailsSetup=E-mail cài đặt
EMailsDesc=Trang này cho phép bạn ghi đè lên các thông số PHP của bạn cho e-mail gửi. Trong hầu hết các trường hợp trên Unix / Linux hệ điều hành, thiết lập PHP của bạn là chính xác và các thông số này là vô ích.
-MAIN_MAIL_SMTP_PORT=SMTP / SMTPS Port (Theo mặc định trong <b>php.ini:% s)</b>
-MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS Host (Theo mặc định trong <b>php.ini:% s)</b>
+MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (Theo mặc định trong php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (Theo mặc định trong php.ini: <b>%s</b>)
MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP / SMTPS Port (Không xác định vào PHP trên Unix như hệ thống)
MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS Host (Không xác định vào PHP trên Unix như hệ thống)
-MAIN_MAIL_EMAIL_FROM=Tên người gửi e-mail cho các email tự động (theo mặc định trong <b>php.ini:% s)</b>
+MAIN_MAIL_EMAIL_FROM=Tên người gửi e-mail cho các email tự động (theo mặc định trong php.ini: <b>%s</b>)
MAIN_MAIL_ERRORS_TO=Tên người gửi e-mail được sử dụng cho các lỗi trả về email được gửi
MAIN_MAIL_AUTOCOPY_TO= Gửi một cách có hệ thống ẩn carbon bản sao của tất cả các email gửi tới
MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Gửi một cách có hệ thống ẩn carbon bản sao của kiến nghị gửi qua email
@@ -272,7 +272,7 @@ MAIN_DISABLE_ALL_SMS=Vô hiệu hoá tất cả sendings SMS (cho mục đích t
MAIN_SMS_SENDMODE=Phương pháp sử dụng để gửi tin nhắn SMS
MAIN_MAIL_SMS_FROM=Số điện thoại mặc định cho người gửi SMS gửi
FeatureNotAvailableOnLinux=Tính năng không có sẵn trên Unix như hệ thống. Kiểm tra chương trình sendmail của bạn tại địa phương.
-SubmitTranslation=Nếu dịch cho ngôn ngữ này không phải là hoàn toàn hoặc bạn tìm thấy lỗi, bạn có thể khắc phục điều này bằng cách chỉnh sửa tập tin vào thư mục <b>langs /% s</b> và nộp hồ sơ sửa www.dolibarr.org diễn đàn.
+SubmitTranslation=Nếu dịch cho ngôn ngữ này không phải là hoàn toàn hoặc bạn tìm thấy lỗi, bạn có thể khắc phục điều này bằng cách chỉnh sửa tập tin vào thư mục <b>langs/%s</b> và submit file đã chỉnh sửa trên diễn đàn www.dolibarr.org.
ModuleSetup=Thiết lập mô-đun
ModulesSetup=Các mô-đun cài đặt
ModuleFamilyBase=Hệ thống
@@ -289,39 +289,39 @@ MenuHandlers=Xử lý đơn
MenuAdmin=Biên tập đơn
DoNotUseInProduction=Không sử dụng trong sản xuất
ThisIsProcessToFollow=Đây là thiết lập để quá trình:
-StepNb=Bước% s
-FindPackageFromWebSite=Tìm một gói phần mềm cung cấp các tính năng mà bạn muốn (ví dụ như trên trang web chính thức% s).
+StepNb=Bước%s
+FindPackageFromWebSite=Tìm một gói phần mềm cung cấp các tính năng mà bạn muốn (ví dụ như trên trang web chính thức %s).
DownloadPackageFromWebSite=Tải về gói.
-UnpackPackageInDolibarrRoot=Tập tin gói giải nén vào thư mục gốc của <b>Dolibarr% s</b>
+UnpackPackageInDolibarrRoot=Tập tin gói giải nén vào thư mục gốc của Dolibarr <b>%s</b>
SetupIsReadyForUse=Cài đặt xong và Dolibarr đã sẵn sàng để sử dụng với thành phần mới này.
NotExistsDirect=Các thư mục gốc thay thế không được định nghĩa. <br>
InfDirAlt=Kể từ phiên bản 3 có thể xác định một directory.This gốc thay thế cho phép bạn lưu trữ, cùng một vị trí, plug-in và các mẫu tùy chỉnh. <br> Chỉ cần tạo một thư mục trong thư mục gốc của Dolibarr (ví dụ như: tùy chỉnh). <br>
-InfDirExample=<br> Sau đó khai báo trong tập tin conf.php <br> $ Dolibarr_main_url_root_alt = 'http: // myserver / tùy chỉnh' <br> $ Dolibarr_main_document_root_alt = '/ path / of / dolibarr / htdocs / tùy chỉnh' <br> * Những dòng này được nhận xét với "#", để bỏ ghi chú chỉ loại bỏ các nhân vật.
+InfDirExample=<br> Sau đó khai báo trong tập tin conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>* Những dòng này được nhận xét với "#", để bỏ ghi chú chỉ loại bỏ các nhân vật.
YouCanSubmitFile=Chọn mô-đun:
CurrentVersion=Phiên bản hiện tại Dolibarr
CallUpdatePage=Tới trang đó cập nhật các cấu trúc cơ sở dữ liệu và dữ liệu:% s.
LastStableVersion=Cuối phiên bản ổn định
-GenericMaskCodes=Bạn có thể nhập bất kỳ số mặt nạ. Trong mặt nạ này, các thẻ sau đây có thể được sử dụng: <br> <b>{000000}</b> tương ứng với một số trong đó sẽ được phát triển trên mỗi% s. Nhập càng nhiều số không như độ dài mong muốn của các truy cập. Truy cập sẽ được hoàn thành vào số không trên bên trái để có nhiều số không như mặt nạ. <br> <b>{000000 + 000}</b> giống như trước nhưng một bù đắp tương ứng với số bên phải dấu + là đã áp dụng bắt đầu từ ngày đầu tiên% s. <br> <b>{000000 @ x}</b> giống như trước, nhưng truy cập được thiết lập lại để không khi tháng x đạt được (x từ 1 đến 12, hoặc từ 0 đến sử dụng những tháng đầu của năm tài chính được xác định trong cấu hình của bạn, hoặc 99 để thiết lập lại bằng không mỗi tháng ). Nếu tùy chọn này được sử dụng và x là 2 hoặc cao hơn, sau đó tự yy {} {mm} hoặc {yyyy} {mm} cũng được yêu cầu. <br> <b>{Đ}</b> ngày (01-31). <br> <b>{Mm}</b> tháng (01 đến 12). <br> <b>{Yyyy}, {yyyy}</b> hoặc <b>{y}</b> năm trong 2, 4 hoặc 1 con số. <br>
-GenericMaskCodes2=<b>{} Cccc</b> mã khách hàng về n ký tự <br> <b>{} Cccc000</b> mã khách hàng về n ký tự tiếp theo là một truy cập dành riêng cho khách hàng. Truy cập này dành riêng cho khách hàng được thiết lập lại tại cùng một thời gian hơn truy cập toàn cầu. <br> <b>{Tttt}</b> Đoạn mã của loại của bên thứ ba trên n ký tự (xem các loại từ điển của bên thứ ba). <br>
-GenericMaskCodes3=Tất cả các nhân vật khác trong mặt nạ sẽ vẫn còn nguyên vẹn. <br> Không gian không được phép. <br>
-GenericMaskCodes4a=<u>Ví dụ trên% s thứ 99 của TheCompany bên thứ ba thực hiện 2007-01-31:</u> <br>
-GenericMaskCodes4b=<u>Ví dụ về bên thứ ba tạo ra trên 2007/03/01:</u> <br>
-GenericMaskCodes4c=<u>Ví dụ về sản phẩm tạo ra trên 2007/03/01:</u> <br>
-GenericMaskCodes5=<b>ABC {yy} {mm} - {000000}</b> sẽ cung cấp cho <b>ABC0701-000099</b> <br> <b>{0000 + 100 @ 1} -ZZZ / đ {} / XXX</b> sẽ cung cấp cho <b>0.199-ZZZ / 31 / XXX</b>
+GenericMaskCodes=Bạn có thể nhập bất kỳ số mặt nạ. Trong mặt nạ này, các thẻ sau đây có thể được sử dụng: <br><b>{000000}</b> tương ứng với một số trong đó sẽ được phát triển trên mỗi%s. Nhập càng nhiều số không như độ dài mong muốn của các truy cập. Truy cập sẽ được hoàn thành vào số không trên bên trái để có nhiều số không như mặt nạ. <br><b>{000000+000}</b> giống như trước nhưng một bù đắp tương ứng với số bên phải dấu + là đã áp dụng bắt đầu từ ngày đầu tiên %s. <br><b>{000000@x}</b> giống như trước, nhưng truy cập được thiết lập lại để không khi tháng x đạt được (x từ 1 đến 12, hoặc từ 0 đến sử dụng những tháng đầu của năm tài chính được xác định trong cấu hình của bạn, hoặc 99 để thiết lập lại bằng không mỗi tháng ). Nếu tùy chọn này được sử dụng và x là 2 hoặc cao hơn, sau đó tự {yy}{mm} hoặc {yyyy}{mm} cũng được yêu cầu. <br><b>{dd}</b> ngày (01 đến 31). <br><b>{mm}</b> tháng (01 đến 12). <br><b>{yy}</b>, <b>{yyyy}</b> hoặc <b>{y}</b> năm trên 2, 4 hoặc 1 con số. <br>
+GenericMaskCodes2=<b>{cccc}</b> mã khách hàng về n ký tự <br><b>{cccc000}</b> mã khách hàng về n ký tự tiếp theo là một truy cập dành riêng cho khách hàng. Truy cập này dành riêng cho khách hàng được thiết lập lại tại cùng một thời gian hơn truy cập toàn cầu. <br><b>{tttt}</b> Đoạn mã của loại của bên thứ ba trên n ký tự (xem các loại từ điển của bên thứ ba). <br>
+GenericMaskCodes3=Tất cả các nhân vật khác trong mặt nạ sẽ vẫn còn nguyên vẹn. <br> Khoảng trống không được phép. <br>
+GenericMaskCodes4a=<u>Ví dụ trên %s thứ 99 của bên thứ ba TheCompany đã hoàn thành 2007-01-31:</u><br>
+GenericMaskCodes4b=<u>Ví dụ về bên thứ ba tạo ra trên 2007-03-01:</u><br>
+GenericMaskCodes4c=<u>Ví dụ về sản phẩm tạo ra trên 2007-03-01:</u><br>
+GenericMaskCodes5=b>ABC{yy}{mm}-{000000}</b> sẽ gửi cho <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> sẽ gửi cho <b>0199-ZZZ/31/XXX</b>
GenericNumRefModelDesc=Trả về một số tùy biến theo một mặt nạ được xác định.
-ServerAvailableOnIPOrPort=Máy chủ có sẵn tại địa <b>chỉ% s</b> trên <b>cổng% s</b>
-ServerNotAvailableOnIPOrPort=Máy chủ không có sẵn tại địa <b>chỉ% s</b> trên <b>cổng% s</b>
+ServerAvailableOnIPOrPort=Máy chủ có sẵn tại địa chỉ <b>%s</b> trêncổng <b>%s</b>
+ServerNotAvailableOnIPOrPort=Máy chủ không có sẵn tại địa chỉ <b>%s</b> trên cổng <b>%s</b>
DoTestServerAvailability=Kết nối máy chủ thử nghiệm
DoTestSend=Kiểm tra gửi
DoTestSendHTML=Kiểm tra gửi HTML
-ErrorCantUseRazIfNoYearInMask=Lỗi, không thể sử dụng tùy chọn @ để thiết lập lại truy cập mỗi năm nếu chuỗi {} hoặc {yy yyyy} không có trong mặt nạ.
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Lỗi, không thể sử dụng tùy chọn @ nếu chuỗi {yy} {mm} hoặc {yyyy} {mm} không có trong mặt nạ.
+ErrorCantUseRazIfNoYearInMask=Lỗi, không thể sử dụng tùy chọn @ để thiết lập lại truy cập mỗi năm nếu chuỗi {yy} hoặc {yyyy} không có trong mặt nạ.
+ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Lỗi, không thể sử dụng tùy chọn @ nếu chuỗi {yy}{mm} hoặc {yyyy}{mm} không có trong mặt nạ.
UMask=Umask tham số cho các tập tin mới trên hệ thống tập tin Unix / Linux / BSD / Mac.
UMaskExplanation=Thông số này cho phép bạn xác định quyền truy cập thiết lập mặc định trên các tập tin được tạo ra bởi Dolibarr trên máy chủ (khi tải ví dụ). <br> Nó phải là giá trị bát phân (ví dụ, 0666 có nghĩa là đọc và viết cho tất cả mọi người). <br> Tham số này là vô dụng trên một máy chủ Windows.
SeeWikiForAllTeam=Hãy xem các trang wiki cho danh sách đầy đủ của tất cả các diễn viên và các tổ chức của họ
UseACacheDelay= Delay cho xuất khẩu đáp ứng bộ nhớ đệm trong vài giây (0 hoặc trống rỗng không có bộ nhớ cache)
DisableLinkToHelpCenter=Ẩn liên kết <b>"Cần giúp đỡ hoặc hỗ trợ"</b> trên trang đăng nhập
-DisableLinkToHelp=Ẩn liên kết <b>"% s Hỗ trợ trực tuyến"</b> trên menu bên trái
+DisableLinkToHelp=Ẩn liên kết "<b>%s Hỗ trợ trực tuyến</b>" trên menu bên trái
AddCRIfTooLong=Không có gói tự động, do đó, nếu dòng là ra khỏi trang trên các tài liệu bởi vì quá dài, bạn phải thêm mình xuống dòng trong khung văn bản.
ModuleDisabled=Mô-đun bị vô hiệu hóa
ModuleDisabledSoNoEvent=Mô-đun để vô hiệu hóa sự kiện không bao giờ tạo ra
@@ -330,9 +330,9 @@ MinLength=Chiều dài tối thiểu
LanguageFilesCachedIntoShmopSharedMemory=Tập tin .lang nạp vào bộ nhớ chia sẻ
ExamplesWithCurrentSetup=Ví dụ với các thiết lập đang chạy
ListOfDirectories=Danh sách các mẫu tài liệu mở thư mục
-ListOfDirectoriesForModelGenODT=Danh sách các thư mục chứa tập tin mẫu với các định dạng tài liệu mở. <br><br> Đặt ở đây đường dẫn đầy đủ của thư mục. <br> Thêm một trở về vận chuyển giữa các thư mục EAH. <br> Để thêm một thư mục của module GED, thêm ở đây <b>DOL_DATA_ROOT / ECM / yourdirectoryname.</b> <br><br> File trong thư mục phải kết thúc với <b>.odt.</b>
+ListOfDirectoriesForModelGenODT=Danh sách các thư mục chứa tập tin mẫu với các định dạng tài liệu mở. <br><br> Đặt ở đây đường dẫn đầy đủ của thư mục. <br> Thêm một trở về vận chuyển giữa các thư mục EAH. <br> Để thêm một thư mục của module GED, thêm ở đây <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br> File trong thư mục phải kết thúc với <b>.odt</b>
NumberOfModelFilesFound=Số ODT / tập tin mẫu ODS tìm thấy trong các thư mục
-ExampleOfDirectoriesForModelGen=Ví dụ về các cú pháp: <br> c: \\ mydir <br> / Home / mydir <br> DOL_DATA_ROOT / ECM / ecmdir
+ExampleOfDirectoriesForModelGen=Ví dụ về các cú pháp: <br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
FollowingSubstitutionKeysCanBeUsed=<br> Để biết làm thế nào để tạo ra odt mẫu tài liệu của bạn, trước khi lưu trữ chúng trong các thư mục, đọc tài liệu wiki:
FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
FirstnameNamePosition=Chức vụ Tên / LastName
@@ -344,9 +344,9 @@ ThemeDir=Skins thư mục
ConnectionTimeout=Connexion thời gian chờ
ResponseTimeout=Đáp ứng thời gian chờ
SmsTestMessage=Tin nhắn kiểm tra từ __PHONEFROM__ để __PHONETO__
-ModuleMustBeEnabledFirst=<b>Mô-đun% s</b> phải được kích hoạt trước khi sử dụng tính năng này.
+ModuleMustBeEnabledFirst=<b>Mô-đun%s</b> phải được kích hoạt trước khi sử dụng tính năng này.
SecurityToken=Chìa khóa để đảm bảo URL
-NoSmsEngine=Không quản lý người gửi tin nhắn SMS có sẵn. Quản lý người gửi tin nhắn SMS không được cài đặt mặc định với phân phối (vì họ phụ thuộc vào một nhà cung cấp bên ngoài) nhưng bạn có thể tìm thấy một số trên% s
+NoSmsEngine=Không quản lý người gửi tin nhắn SMS có sẵn. Quản lý người gửi tin nhắn SMS không được cài đặt mặc định với phân phối (vì họ phụ thuộc vào một nhà cung cấp bên ngoài) nhưng bạn có thể tìm thấy một số trên%s
PDF=PDF
PDFDesc=Bạn có thể thiết lập cho mỗi tùy chọn toàn cầu liên quan đến các thế hệ PDF
PDFAddressForging=Quy định giả mạo địa chỉ hộp
@@ -357,7 +357,7 @@ HideDetailsOnPDF=Ẩn dòng sản phẩm chi tiết về PDF được tạo ra
Library=Thư viện
UrlGenerationParameters=Các thông số để đảm bảo URL
SecurityTokenIsUnique=Sử dụng một tham số securekey duy nhất cho mỗi URL
-EnterRefToBuildUrl=Nhập tham chiếu cho đối tượng% s
+EnterRefToBuildUrl=Nhập tham chiếu cho đối tượng %s
GetSecuredUrl=Nhận URL tính
ButtonHideUnauthorized=Ẩn nút cho các hành động trái phép, thay vì hiển thị các nút khuyết tật
OldVATRates=Thuế suất thuế GTGT cũ
@@ -384,20 +384,20 @@ ExtrafieldParamHelpcheckbox=Danh sách các thông số phải như quan trọng
ExtrafieldParamHelpradio=Danh sách các thông số phải như quan trọng, giá trị <br><br> ví dụ: <br> 1, value1 <br> 2, value2 <br> 3, value3 <br> ...
ExtrafieldParamHelpsellist=Danh sách các thông số xuất phát từ một bảng <br> Cú pháp: tên_bảng: label_field: id_field :: lọc <br> Ví dụ: c_typent: libelle: id :: lọc <br><br> bộ lọc có thể là một thử nghiệm đơn giản (ví dụ như hoạt động = 1) để hiển thị chỉ có giá trị tích cực <br> nếu bạn muốn lọc vào extrafields sử dụng syntaxt extra.fieldcode = ... (nơi mã trường là mã của extrafield) <br><br> Để có danh sách tùy thuộc vào khác: <br> c_typent: libelle: id: parent_list_code | parent_column: bộ lọc
LibraryToBuildPDF=Thư viện được sử dụng để xây dựng PDF
-WarningUsingFPDF=Cảnh báo: <b>conf.php</b> của bạn có chứa <b>dolibarr_pdf_force_fpdf</b> chỉ <b>= 1.</b> Điều này có nghĩa là bạn sử dụng thư viện FPDF để tạo ra các tập tin PDF. Thư viện này là cũ và không hỗ trợ rất nhiều tính năng (Unicode, minh bạch, hình ảnh, ngôn ngữ Cyrillic, Arab và châu Á, ...), vì vậy bạn có thể gặp một số lỗi trong hệ PDF. <br> Để giải quyết điều này và có một sự hỗ trợ đầy đủ các thế hệ PDF, xin vui lòng tải <a href="http://www.tcpdf.org/" target="_blank">thư viện TCPDF</a> , sau đó bình luận hoặc loại bỏ các dòng <b>$ dolibarr_pdf_force_fpdf = 1,</b> và thêm thay vì <b>$ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir'</b>
+WarningUsingFPDF=Cảnh báo: <b>conf.php</b> của bạn có chứa trực tiếp <b>dolibarr_pdf_force_fpdf=1</b>.</b> Điều này có nghĩa là bạn sử dụng thư viện FPDF để tạo ra các tập tin PDF. Thư viện này là cũ và không hỗ trợ rất nhiều tính năng (Unicode, minh bạch, hình ảnh, ngôn ngữ Cyrillic, Arab và châu Á, ...), vì vậy bạn có thể gặp một số lỗi trong hệ PDF. <br> Để giải quyết điều này và có một sự hỗ trợ đầy đủ các thế hệ PDF, xin vui lòng tải <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, sau đó bình luận hoặc loại bỏ các dòng <b>$dolibarr_pdf_force_fpdf=1</b>, và thêm thay vì <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
LocalTaxDesc=Một số quốc gia áp dụng 2 hoặc 3 loại thuế trên mỗi dòng hóa đơn. Nếu đây là trường hợp, chọn loại thuế thứ hai và thứ ba và tỷ lệ của nó. Loại có thể là: <br> 1: thuế địa phương áp dụng trên các sản phẩm và dịch vụ mà không có thùng (thùng không được áp dụng thuế địa phương) <br> 2: thuế địa phương áp dụng trên các sản phẩm và dịch vụ trước khi thùng (thùng được tính trên số tiền + localtax) <br> 3: thuế địa phương áp dụng vào các sản phẩm mà không có thùng (thùng không được áp dụng thuế địa phương) <br> 4: thuế địa phương áp dụng trên các sản phẩm trước khi thùng (thùng được tính trên số tiền + localtax) <br> 5: thuế địa phương áp dụng vào các dịch vụ mà không có thùng (thùng không được áp dụng thuế địa phương) <br> 6: thuế địa phương áp dụng vào các dịch vụ trước khi thùng (thùng được tính trên số tiền + localtax)
SMS=SMS
-LinkToTestClickToDial=Nhập số điện thoại để gọi cho thấy một liên kết để kiểm tra url ClickToDial cho người <strong>dùng% s</strong>
+LinkToTestClickToDial=Nhập số điện thoại để gọi cho thấy một liên kết để kiểm tra url ClickToDial cho người dùng <strong>%s</strong>
RefreshPhoneLink=Làm mới liên kết
-LinkToTest=Liên kết có thể click được tạo ra cho người <strong>dùng% s</strong> (bấm số điện thoại để kiểm tra)
+LinkToTest=Liên kết có thể click được tạo ra cho người dùng <strong>%s</strong> (bấm số điện thoại để kiểm tra)
KeepEmptyToUseDefault=Giữ trống để sử dụng giá trị mặc định
DefaultLink=Liên kết mặc định
ValueOverwrittenByUserSetup=Cảnh báo, giá trị này có thể được ghi đè bởi các thiết lập cụ thể người sử dụng (mỗi người dùng có thể thiết lập url clicktodial riêng của mình)
-ExternalModule=Bên ngoài mô-đun - cài đặt vào thư mục% s
+ExternalModule=Bên ngoài mô-đun - cài đặt vào thư mục%s
BarcodeInitForThirdparties=Init mã vạch hàng loạt cho thirdparties
BarcodeInitForProductsOrServices=Init mã vạch khối lượng hoặc thiết lập lại các sản phẩm hoặc dịch vụ
-CurrentlyNWithoutBarCode=Hiện tại, bạn <strong>có% s</strong> biên <strong>bản% s% s</strong> không có mã vạch xác định.
-InitEmptyBarCode=Giá trị init cho các hồ sơ có sản phẩm nào tiếp theo% s
+CurrentlyNWithoutBarCode=Hiện tại, bạn có <strong>%s</strong> biên bản <strong>%s</strong> %s không có mã vạch xác định.
+InitEmptyBarCode=Giá trị init cho các hồ sơ có sản phẩm nào tiếp theo%s
EraseAllCurrentBarCode=Xóa tất cả các giá trị hiện tại của mã vạch
ConfirmEraseAllCurrentBarCode=Bạn Bạn có chắc chắn muốn xóa tất cả các giá trị mã vạch hiện nay?
AllBarcodeReset=Tất cả giá trị mã vạch đã được loại bỏ
@@ -415,14 +415,14 @@ Module10Name=Kế toán
Module10Desc=Báo cáo kế toán đơn giản (các tạp chí, kim ngạch) dựa vào nội dung cơ sở dữ liệu. Không có điều phối.
Module20Name=Đề xuất
Module20Desc=Quản lý đề nghị thương mại
-Module22Name=Thánh Lễ E-thư
-Module22Desc=Thánh Lễ E-mail quản lý
+Module22Name=Gửi Email hàng loạt
+Module22Desc=Quản lý gửi Email hàng loạt
Module23Name= Năng lượng
Module23Desc= Giám sát việc tiêu thụ năng lượng
Module25Name=Đơn đặt hàng của khách hàng
Module25Desc=Quản lý đơn đặt hàng
Module30Name=Hoá đơn
-Module30Desc=Hóa đơn và lưu ý quản lý tín dụng cho khách hàng. Quản lý hóa đơn cho các nhà cung cấp
+Module30Desc=Quản lý hóa đơn và phiếu ghi nợ cho khách hàng. Quản lý hóa đơn cho các nhà cung cấp
Module40Name=Nhà cung cấp
Module40Desc=Quản lý nhà cung cấp và mua (đơn đặt hàng và hoá đơn)
Module42Name=Bản ghi
@@ -431,33 +431,33 @@ Module49Name=Biên tập
Module49Desc=Quản lý biên tập
Module50Name=Sản phẩm
Module50Desc=Quản lý sản phẩm
-Module51Name=Thư hàng loạt
-Module51Desc=Khối quản lý gửi thư giấy
-Module52Name=Cổ phiếu
+Module51Name=Gửi email hàng loạt
+Module51Desc=Quản lý gửi thư giấy hàng loạt
+Module52Name=Tồn kho
Module52Desc=Quản lý tồn kho (sản phẩm)
Module53Name=Dịch vụ
Module53Desc=Quản lý dịch vụ
-Module54Name=Hợp đồng
-Module54Desc=Hợp đồng dịch vụ quản lý
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=Mã vạch
Module55Desc=Quản lý mã vạch
Module56Name=Điện thoại
Module56Desc=Tích hợp điện thoại
-Module57Name=Đứng đơn đặt hàng
-Module57Desc=Đơn đặt hàng thường trực và quản lý thu hồi
+Module57Name=Chỉ thị thanh toán định kỳ
+Module57Desc=Quảng lý rút tiền và chỉ thị thanh toán định kỳ
Module58Name=ClickToDial
Module58Desc=Tích hợp hệ thống ClickToDial (Asterisk, ...)
Module59Name=Bookmark4u
Module59Desc=Thêm chức năng để tạo ra tài khoản Bookmark4u từ một tài khoản Dolibarr
Module70Name=Các can thiệp
Module70Desc=Quản lý can thiệp
-Module75Name=Chi phí chuyến đi và ghi chú
-Module75Desc=Chi phí chuyến đi và ghi chú quản lý
-Module80Name=Lô hàng
-Module80Desc=Vận chuyển và quản lý trật tự giao hàng
+Module75Name=Phiếu công tác phí
+Module75Desc=Quản lý phiếu công tác phí
+Module80Name=Vận chuyển
+Module80Desc=Quản lý đơn giao hàng và vận chuyển
Module85Name=Các ngân hàng và tiền mặt
Module85Desc=Quản lý tài khoản ngân hàng hoặc tiền mặt
-Module100Name=Trang web bên ngoài
+Module100Name=External site
Module100Desc=Module này bao gồm một trang web bên ngoài hoặc trang vào menu Dolibarr và xem nó vào một khung Dolibarr
Module105Name=Mailman và SPIP
Module105Desc=Giao diện Mailman hoặc SPIP cho mô-đun thành viên
@@ -467,30 +467,26 @@ Module210Name=PostNuke
Module210Desc=PostNuke hội nhập
Module240Name=Xuất khẩu dữ liệu
Module240Desc=Công cụ để xuất khẩu Dolibarr dữ liệu ngay (với các trợ lý)
-Module250Name=Nhập khẩu dữ liệu
-Module250Desc=Công cụ để nhập dữ liệu ngay trong Dolibarr (với trợ lý)
+Module250Name=Import dữ liệu
+Module250Desc=Công cụ để import dữ liệu ngay trong Dolibarr (với trợ lý)
Module310Name=Thành viên
-Module310Desc=Tổ chức quản lý thành viên
+Module310Desc=Quản lý thành viên công ty
Module320Name=RSS Feed
Module320Desc=Thêm nguồn cấp dữ liệu RSS trong trang màn hình Dolibarr
Module330Name=Đánh dấu
Module330Desc=Quản lý Bookmark
-Module400Name=Các dự án
-Module400Desc=Quản lý dự án bên trong mô-đun khác
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=Webcalendar
-Module410Desc=Webcalendar hội nhập
+Module410Desc=Webcalendar tích hợp
Module500Name=Chi phí đặc biệt (thuế, đóng góp xã hội, cổ tức)
Module500Desc=Quản lý chi phí đặc biệt như thuế, đóng góp xã hội, cổ tức và tiền lương
Module510Name=Tiền lương
Module510Desc=Quản lý lao động tiền lương và các khoản thanh toán
Module600Name=Thông báo
-Module600Desc=Gửi thông báo bằng thư điện tử trên một số sự kiện kinh doanh Dolibarr để liên lạc với bên thứ ba
-Module700Name=Đóng góp
+Module600Desc=Gửi thông báo EMail trên một số sự kiện kinh doanh Dolibarr để liên hệ của bên thứ ba (thiết lập được xác định trên mỗi thirdparty)
+Module700Name=Tài trợ
Module700Desc=Quản lý tài trợ
-Module800Name=OsCommerce bởi truy cập cơ sở dữ liệu trực tiếp
-Module800Desc=Giao diện hiển thị một cửa hàng osCommerce hoặc OSCSS thông qua truy cập cơ sở dữ liệu trực tiếp
-Module900Name=OsCommerce bởi WS
-Module900Desc=Giao diện hiển thị một cửa hàng osCommerce thông qua các dịch vụ Web. Module này requiere bạn cài đặt các thành phần từ / oscommerce_ws / ws_server vào máy chủ osCommerce của bạn. Xem tập tin README trong / oscommerce_ws / ws_server.
Module1200Name=Mantis
Module1200Desc=Mantis hội nhập
Module1400Name=Kế toán
@@ -518,16 +514,16 @@ Module5000Name=Nhiều công ty
Module5000Desc=Cho phép bạn quản lý nhiều công ty
Module6000Name=Quy trình làm việc
Module6000Desc=Quản lý công việc
-Module20000Name=Ngày lễ
-Module20000Desc=Kê khai, theo nhân viên lễ
+Module20000Name=Để lại yêu cầu quản lý
+Module20000Desc=Khai báo và nhân viên theo yêu cầu nghỉ phép
Module39000Name=Hàng loạt sản phẩm
Module39000Desc=Số lô, ăn theo và bán theo quản lý ngày sản phẩm
Module50000Name=Nơi trả tiền
Module50000Desc=Module để cung cấp một trang thanh toán trực tuyến bằng thẻ tín dụng với nơi trả tiền
Module50100Name=Điểm bán hàng
Module50100Desc=Quan điểm của mô-đun bán hàng
-Module50200Name= Paypal
-Module50200Desc= Module để cung cấp một trang thanh toán trực tuyến bằng thẻ tín dụng với Paypal
+Module50200Name=Paypal
+Module50200Desc=Module để cung cấp một trang thanh toán trực tuyến bằng thẻ tín dụng với Paypal
Module50400Name=Kế toán (nâng cao)
Module50400Desc=Kế toán quản trị (đôi bên)
Module54000Name=PrintIPP
@@ -558,7 +554,7 @@ Permission31=Ðọc sản phẩm
Permission32=Tạo / chỉnh sửa sản phẩm
Permission34=Xóa sản phẩm
Permission36=Xem / quản lý sản phẩm ẩn
-Permission38=Sản phẩm xuất khẩu
+Permission38=Export products
Permission41=Đọc các dự án (dự án được chia sẻ và các dự án tôi liên lạc)
Permission42=Tạo / sửa đổi dự án (dự án chung và các dự án tôi liên lạc)
Permission44=Xóa dự án (dự án chung và các dự án tôi liên lạc)
@@ -570,11 +566,11 @@ Permission71=Thành viên đã đọc
Permission72=Tạo / thay đổi thành viên
Permission74=Xóa thành viên
Permission75=Thiết lập các loại và các thuộc tính cho các thành viên
-Permission76=Xuất dữ liệu ngay
+Permission76=Export datas
Permission78=Đọc đăng ký
Permission79=Tạo / sửa đổi đăng ký
-Permission81=Khách hàng đã đọc đơn đặt hàng
-Permission82=Tạo / sửa đổi khách hàng đơn đặt hàng
+Permission81=Xem đơn đặt hàng của khách hàng
+Permission82=Tạo / sửa đổi đơn đặt hàng của khách hàng
Permission84=Xác nhận đơn đặt hàng cho khách hàng
Permission86=Gửi đơn đặt hàng cho khách hàng
Permission87=Đóng khách hàng đơn đặt hàng
@@ -596,29 +592,30 @@ Permission113=Thiết lập tài khoản financiel (tạo, quản lý danh mục
Permission114=Củng cố giao dịch
Permission115=Các giao dịch xuất khẩu, báo cáo tài khoản
Permission116=Chuyển giữa các tài khoản
-Permission117=Quản lý kiểm tra cử
+Permission117=Quản lý việc gửi séc
Permission121=Đọc các bên thứ ba liên quan đến người sử dụng
Permission122=Tạo / chỉnh sửa các bên thứ ba liên quan đến người sử dụng
Permission125=Xóa các bên thứ ba liên quan đến người sử dụng
-Permission126=Các bên thứ ba xuất khẩu
+Permission126=Export third parties
Permission141=Đọc các dự án (cũng tin tôi không liên lạc với)
Permission142=Tạo / sửa đổi dự án (cũng tin tôi không liên lạc với)
Permission144=Xóa dự án (cũng tin tôi không liên lạc với)
-Permission146=Đọc cung cấp
+Permission146=Xem nhà cung cấp
Permission147=Đọc số liệu thống kê
Permission151=Đọc lệnh đứng
Permission152=Tạo / sửa đổi một yêu cầu đơn đặt hàng thường trực
Permission153=Đơn đặt hàng đứng truyền thu
Permission154=Tín dụng / từ chối đứng đơn đặt hàng biên lai
-Permission161=Đọc hợp đồng
-Permission162=Tạo / sửa đổi hợp đồng
-Permission163=Kích hoạt dịch vụ của hợp đồng
-Permission164=Vô hiệu hoá một dịch vụ của hợp đồng
-Permission165=Xóa hợp đồng
-Permission171=Đọc đi
-Permission172=Tạo / sửa đổi các chuyến đi
-Permission173=Xóa các chuyến đi
-Permission178=Các chuyến đi xuất khẩu
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Đọc các chuyến đi và các chi phí (riêng và cấp dưới của mình)
+Permission172=Tạo / chỉnh sửa các chuyến đi và các chi phí
+Permission173=Xóa các chuyến đi và các chi phí
+Permission174=Đọc tất cả các chuyến đi và các chi phí
+Permission178=Xuất dữ liệu chuyến đi và chi phí
Permission180=Đọc cung cấp
Permission181=Đọc đơn đặt hàng nhà cung cấp
Permission182=Tạo / chỉnh sửa đơn đặt hàng nhà cung cấp
@@ -675,7 +672,7 @@ Permission300=Đọc mã vạch
Permission301=Tạo / chỉnh sửa mã vạch
Permission302=Xóa mã vạch
Permission311=Đọc dịch vụ
-Permission312=Chỉ định dịch vụ ký hợp đồng
+Permission312=Assign service/subscription to contract
Permission331=Đánh dấu đã đọc
Permission332=Tạo / chỉnh sửa bookmark
Permission333=Xóa dấu trang
@@ -683,12 +680,12 @@ Permission341=Đọc các điều khoản riêng của mình
Permission342=Tạo / chỉnh sửa thông tin người dùng của mình
Permission343=Thay đổi mật khẩu của mình
Permission344=Sửa đổi điều khoản riêng của mình
-Permission351=Nhóm đọc
-Permission352=Đọc các nhóm quyền
+Permission351=Đọc thông tin nhóm
+Permission352=Đọc thông tin về quyền của nhóm
Permission353=Tạo / sửa đổi nhóm
Permission354=Xóa hoặc vô hiệu hóa các nhóm
-Permission358=Người sử dụng xuất khẩu
-Permission401=Ðọc giảm giá
+Permission358=Xuất dữ liệu người dùng
+Permission401=Ðọc thông tin giảm giá
Permission402=Tạo / sửa đổi giảm giá
Permission403=Xác nhận giảm giá
Permission404=Xóa giảm giá
@@ -696,24 +693,24 @@ Permission510=Đọc Lương
Permission512=Tạo / sửa đổi tiền lương
Permission514=Xóa lương
Permission517=Xuất khẩu lương
-Permission531=Đọc dịch vụ
+Permission531=Đọc thông tin dịch vụ
Permission532=Tạo / thay đổi các dịch vụ
Permission534=Xóa dịch vụ
Permission536=Xem / quản lý dịch vụ ẩn
-Permission538=Dịch vụ xuất khẩu
-Permission701=Đọc đóng góp
+Permission538=Xuất dữ liệu Dịch vụ
+Permission701=Đọc thông tin Tài trợ
Permission702=Tạo / sửa đổi hiến
Permission703=Xóa tài trợ
-Permission1001=Đọc cổ phiếu
-Permission1002=Tạo / sửa đổi cổ phiếu
-Permission1003=Xóa cổ phiếu
-Permission1004=Đọc chuyển động chứng khoán
-Permission1005=Tạo / sửa đổi chuyển động chứng khoán
+Permission1001=Đọc tồn kho
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
+Permission1004=Đọc chuyển động tồn kho
+Permission1005=Tạo / sửa đổi chuyển động tồn kho
Permission1101=Đọc lệnh giao hàng
Permission1102=Tạo / chỉnh sửa lệnh giao hàng
Permission1104=Xác nhận lệnh giao hàng
Permission1109=Xóa lệnh giao hàng
-Permission1181=Đọc cung cấp
+Permission1181=Đọc thông tin Nhà cung cấp
Permission1182=Đọc đơn đặt hàng nhà cung cấp
Permission1183=Tạo / chỉnh sửa đơn đặt hàng nhà cung cấp
Permission1184=Xác nhận đơn đặt hàng nhà cung cấp
@@ -731,18 +728,18 @@ Permission1235=Gửi hóa đơn nhà cung cấp qua email
Permission1236=Nhà cung cấp xuất hóa đơn, thuộc tính và thanh toán
Permission1237=Đơn đặt hàng nhà cung cấp xuất khẩu và chi tiết của họ
Permission1251=Chạy nhập khẩu khối lượng của dữ liệu bên ngoài vào cơ sở dữ liệu (tải dữ liệu)
-Permission1321=Hóa đơn xuất khẩu của khách hàng, các thuộc tính và thanh toán
-Permission1421=Đơn đặt hàng xuất khẩu và các thuộc tính
-Permission23001 = Đọc nhiệm vụ theo lịch trình
+Permission1321=Xuất dữ liệu Hóa đơn của khách hàng, các thuộc tính và thanh toán
+Permission1421=Xuất dữ liệu Đơn đặt hàng và các thuộc tính
+Permission23001 = Đọc thông tin Lịch trình công việc
Permission23002 = Tạo / cập nhật theo lịch trình công việc
-Permission23003 = Xóa nhiệm vụ theo lịch trình
-Permission23004 = Thực hiện nhiệm vụ theo lịch trình
-Permission2401=Đọc hành động (sự kiện hay nhiệm vụ) liên quan đến tài khoản của mình
-Permission2402=Tạo / sửa đổi các hành động (sự kiện hay nhiệm vụ) liên quan đến tài khoản của mình
-Permission2403=Xóa hành động (sự kiện hay nhiệm vụ) liên quan đến tài khoản của mình
-Permission2411=Đọc hành động (sự kiện hay nhiệm vụ) của người khác
-Permission2412=Tạo / sửa đổi các hành động (sự kiện hay nhiệm vụ) của người khác
-Permission2413=Xóa hành động (sự kiện hay nhiệm vụ) của người khác
+Permission23003 = Xóa Lịch trình công việc
+Permission23004 = Thực hiện Lịch trình công việc
+Permission2401=Đọc hành động (sự kiện hay tác vụ) liên quan đến tài khoản của mình
+Permission2402=Tạo / sửa đổi các hành động (sự kiện hay tác vụ) liên quan đến tài khoản của mình
+Permission2403=Xóa hành động (sự kiện hay tác vụ) liên quan đến tài khoản của mình
+Permission2411=Đọc hành động (sự kiện hay tác vụ) của người khác
+Permission2412=Tạo / sửa đổi các hành động (sự kiện hay tác vụ) của người khác
+Permission2413=Xóa hành động (sự kiện hay tác vụ) của người khác
Permission2501=Đọc / Tải tài liệu
Permission2502=Tải về tài liệu
Permission2503=Nộp hoặc xóa tài liệu
@@ -764,12 +761,12 @@ DictionaryCanton=Nhà nước / Cantons
DictionaryRegion=Khu vực
DictionaryCountry=Nước
DictionaryCurrency=Đơn vị tiền tệ
-DictionaryCivility=Danh hiệu văn minh
+DictionaryCivility=Tiêu đề lịch sự
DictionaryActions=Loại sự kiện chương trình nghị sự
DictionarySocialContributions=Các loại đóng góp xã hội
DictionaryVAT=Giá thuế GTGT, thuế tiêu thụ giá
DictionaryRevenueStamp=Số tiền tem doanh thu
-DictionaryPaymentConditions=Phương thức thanh toán
+DictionaryPaymentConditions=Điều khoản thanh toán
DictionaryPaymentModes=Phương thức thanh toán
DictionaryTypeContact=Liên hệ / loại Địa chỉ
DictionaryEcotaxe=Ecotax (WEEE)
@@ -854,7 +851,7 @@ Database=Cơ sở dữ liệu
DatabaseServer=Máy chủ cơ sở dữ liệu
DatabaseName=Tên cơ sở dữ liệu
DatabasePort=Cổng cơ sở dữ liệu
-DatabaseUser=Sử dụng cơ sở dữ liệu
+DatabaseUser=Cơ sở dữ liệu người dùng
DatabasePassword=Cơ sở dữ liệu mật khẩu
DatabaseConfiguration=Thiết lập cơ sở dữ liệu
Tables=Bàn
@@ -873,14 +870,14 @@ SystemUpdate=Cập nhật hệ thống
SystemSuccessfulyUpdate=Hệ thống của bạn đã được cập nhật successfuly
MenuCompanySetup=Công ty / cơ sở
MenuNewUser=Người dùng mới
-MenuTopManager=Quản lý đơn hàng đầu
+MenuTopManager=Quản lý menu phía trên
MenuLeftManager=Quản lý menu bên trái
-MenuManager=Quản lý đơn
+MenuManager=Quản lý menu
MenuSmartphoneManager=Quản lý đơn điện thoại thông minh
-DefaultMenuTopManager=Quản lý đơn hàng đầu
+DefaultMenuTopManager=Quản lý menu phía trên
DefaultMenuLeftManager=Quản lý menu bên trái
-DefaultMenuManager= Quản lý đơn tiêu chuẩn
-DefaultMenuSmartphoneManager=Quản lý đơn điện thoại thông minh
+DefaultMenuManager= Quản lý menu chuẩn
+DefaultMenuSmartphoneManager=Quản lý menu điện thoại thông minh
Skin=Skin chủ đề
DefaultSkin=Giao diện mặc định da
MaxSizeList=Max length cho danh sách
@@ -892,8 +889,8 @@ DefaultLanguage=Ngôn ngữ mặc định để sử dụng (mã ngôn ngữ)
EnableMultilangInterface=Kích hoạt giao diện đa ngôn ngữ
EnableShowLogo=Hiển thị biểu tượng trên menu bên trái
SystemSuccessfulyUpdated=Hệ thống của bạn đã được cập nhật thành công
-CompanyInfo=Công ty / thông tin nền tảng
-CompanyIds=Bản sắc công ty / cơ sở
+CompanyInfo=Thông tin Công ty / cơ sở
+CompanyIds=Xác định Công ty/ Cơ sở
CompanyName=Tên
CompanyAddress=Địa chỉ
CompanyZip=Zip
@@ -904,7 +901,7 @@ Logo=Logo
DoNotShow=Không hiển thị
DoNotSuggestPaymentMode=Không đề nghị
NoActiveBankAccountDefined=Không có tài khoản ngân hàng hoạt động được xác định
-OwnerOfBankAccount=Chủ sở hữu của tài khoản ngân hàng% s
+OwnerOfBankAccount=Chủ sở hữu của tài khoản ngân hàng%s
BankModuleNotActive=Ngân hàng mô-đun tài khoản chưa được kích hoạt
ShowBugTrackLink=Hiển thị liên kết "Báo cáo một lỗi"
ShowWorkBoard=Xem "bàn làm việc" trên trang chủ
@@ -913,7 +910,7 @@ Delays=Sự chậm trễ
DelayBeforeWarning=Chậm trễ trước khi cảnh báo
DelaysBeforeWarning=Sự chậm trễ trước khi cảnh báo
DelaysOfToleranceBeforeWarning=Sự chậm trễ khoan dung trước khi cảnh báo
-DelaysOfToleranceDesc=Màn hình này cho phép bạn xác định sự chậm trễ trước khi chấp nhận một cảnh báo được báo cáo trên màn hình với Picto% s cho mỗi phần tử cuối.
+DelaysOfToleranceDesc=Màn hình này cho phép bạn xác định sự chậm trễ trước khi chấp nhận một cảnh báo được báo cáo trên màn hình với Picto%s cho mỗi phần tử cuối.
Delays_MAIN_DELAY_ACTIONS_TODO=Trì hoãn khoan dung (trong ngày) trước khi cảnh báo về các sự kiện theo kế hoạch chưa thực hiện
Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Trì hoãn khoan dung (trong ngày) trước khi cảnh báo về đơn đặt hàng chưa qua chế biến
Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Trì hoãn khoan dung (trong ngày) trước khi cảnh báo các nhà cung cấp đơn đặt hàng chưa qua chế biến
@@ -955,13 +952,13 @@ DisplayDesc=Bạn có thể chọn từng thông số liên quan đến Dolibarr
AvailableModules=Các mô-đun có sẵn
ToActivateModule=Để kích hoạt mô-đun, đi vào thiết lập trong khu vực (chủ-> Setup-> Modules).
SessionTimeOut=Thời gian cho phiên
-SessionExplanation=Bảo lãnh này con số đó sẽ không bao giờ hết hạn phiên trước sự chậm trễ này, nếu phiên sạch được thực hiện bằng nội PHP phiên sạch hơn (và không có gì khác). Nội phiên PHP sạch hơn không làm bảo lãnh rằng phiên sẽ hết hiệu lực ngay sau khi sự chậm trễ này. Nó sẽ hết hạn, sau khi sự chậm trễ này, và khi phiên sạch hơn là chạy, vì vậy <b>mỗi% s /% s</b> truy cập, nhưng chỉ trong thời gian truy cập được thực hiện bởi các phần khác. <br> Lưu ý: trên một số máy chủ với một cơ chế phiên làm sạch bên ngoài (cron dưới Debian, Ubuntu ...), các phiên giao dịch có thể bị phá hủy sau một thời gian được xác định bởi <strong>session.gc_maxlifetime</strong> mặc định, không có vấn đề gì giá trị nhập ở đây.
+SessionExplanation=Bảo lãnh này con số đó sẽ không bao giờ hết hạn phiên trước sự chậm trễ này, nếu phiên sạch được thực hiện bằng nội PHP phiên sạch hơn (và không có gì khác). Nội phiên PHP sạch hơn không làm bảo lãnh rằng phiên sẽ hết hiệu lực ngay sau khi sự chậm trễ này. Nó sẽ hết hạn, sau khi sự chậm trễ này, và khi phiên sạch hơn là chạy, vì vậy <b>mỗi%s /% s</b> truy cập, nhưng chỉ trong thời gian truy cập được thực hiện bởi các phần khác. <br> Lưu ý: trên một số máy chủ với một cơ chế phiên làm sạch bên ngoài (cron dưới Debian, Ubuntu ...), các phiên giao dịch có thể bị phá hủy sau một thời gian được xác định bởi <strong>session.gc_maxlifetime</strong> mặc định, không có vấn đề gì giá trị nhập ở đây.
TriggersAvailable=Kích hoạt sẵn
TriggersDesc=Gây nên là các tập tin mà sẽ thay đổi hành vi của Dolibarr quy trình làm việc một lần sao chép vào thư mục <b>htdocs / core / gây nên.</b> Họ nhận ra những hành động mới, kích hoạt các sự kiện Dolibarr (công ty mới thành lập, xác nhận hóa đơn, ...).
TriggerDisabledByName=Gây ra trong tập tin này đang bị vô hiệu hóa bởi các hậu tố <b>-NORUN</b> trong tên của họ.
-TriggerDisabledAsModuleDisabled=Gây ra trong tập tin này bị vô hiệu hóa như <b>mô-đun% s</b> bị vô hiệu hóa.
+TriggerDisabledAsModuleDisabled=Gây ra trong tập tin này bị vô hiệu hóa như <b>mô-đun%s</b> bị vô hiệu hóa.
TriggerAlwaysActive=Gây ra trong tập tin này luôn hoạt động, nào là các mô-đun Dolibarr kích hoạt.
-TriggerActiveAsModuleActive=Triggers trong tập tin này đang hoạt động như <b>mô-đun% s</b> được kích hoạt.
+TriggerActiveAsModuleActive=Triggers trong tập tin này đang hoạt động như <b>mô-đun%s</b> được kích hoạt.
GeneratedPasswordDesc=Xác định đây mà cai trị mà bạn muốn sử dụng để tạo mật khẩu mới nếu bạn hỏi có tự động tạo ra mật khẩu
DictionaryDesc=Xác định đây tất cả dữ liệu ngay tài liệu tham khảo. Bạn có thể hoàn thành được xác định trước giá trị với bạn.
ConstDesc=Trang này cho phép bạn chỉnh sửa tất cả các thông số khác không có sẵn trong các trang trước đó. Họ được dành riêng cho các nhà phát triển các thông số cao cấp hoặc cho troubleshouting.
@@ -990,11 +987,11 @@ RestoreDesc=Để khôi phục lại một bản sao lưu Dolibarr, bạn phải
RestoreDesc2=* Khôi phục tập tin lưu trữ (file zip ví dụ) các tài liệu thư mục để trích xuất các tập tin trong cây thư mục tài liệu của một cài đặt Dolibarr mới hoặc vào văn bản hiện hành này directoy <b>(% s).</b>
RestoreDesc3=* Khôi phục dữ liệu từ một tập tin dump sao lưu, vào cơ sở dữ liệu cài đặt Dolibarr mới hoặc vào cơ sở dữ liệu cài đặt hiện tại này. Cảnh báo, một khi khôi phục xong, bạn phải sử dụng một tên đăng nhập / mật khẩu, đã tồn tại khi sao lưu đã được thực hiện, để kết nối lại. Để khôi phục lại cơ sở dữ liệu sao lưu vào cài đặt hiện tại, bạn có thể làm theo trợ lý này.
RestoreMySQL=MySQL nhập khẩu
-ForcedToByAModule= Quy luật này buộc <b>phải% s</b> bởi một mô-đun kích hoạt
+ForcedToByAModule= Quy luật này buộc <b>phải%s</b> bởi một mô-đun kích hoạt
PreviousDumpFiles=Sao lưu cơ sở dữ liệu tập tin dump có sẵn
WeekStartOnDay=Ngày đầu tiên của tuần
-RunningUpdateProcessMayBeRequired=Chạy quá trình nâng cấp dường như được yêu cầu (Chương trình phiên bản% s khác với phiên bản cơ sở dữ liệu% s)
-YouMustRunCommandFromCommandLineAfterLoginToUser=Bạn phải chạy lệnh này từ dòng lệnh sau khi đăng nhập vào một vỏ với người sử <b>dụng% s</b> hoặc bạn phải thêm tùy chọn -W ở cuối dòng lệnh để cung <b>cấp% s</b> mật khẩu.
+RunningUpdateProcessMayBeRequired=Chạy quá trình nâng cấp dường như được yêu cầu (Chương trình phiên bản%s khác với phiên bản cơ sở dữ liệu%s)
+YouMustRunCommandFromCommandLineAfterLoginToUser=Bạn phải chạy lệnh này từ dòng lệnh sau khi đăng nhập vào một vỏ với người sử <b>dụng%s</b> hoặc bạn phải thêm tùy chọn -W ở cuối dòng lệnh để cung <b>cấp%s</b> mật khẩu.
YourPHPDoesNotHaveSSLSupport=Chức năng SSL không có sẵn trong chương trình PHP
DownloadMoreSkins=Nhiều giao diện để tải về
SimpleNumRefModelDesc=Trả về số tài liệu tham khảo với các định dạng% syymm-nnnn nơi yyyy là năm, mm là tháng và NNNN là một chuỗi không có lỗ và không có thiết lập lại
@@ -1012,7 +1009,7 @@ MAIN_PROXY_HOST=Tên / Địa chỉ của máy chủ proxy
MAIN_PROXY_PORT=Cổng của máy chủ proxy
MAIN_PROXY_USER=Đăng nhập để sử dụng máy chủ proxy
MAIN_PROXY_PASS=Mật khẩu để sử dụng máy chủ proxy
-DefineHereComplementaryAttributes=Xác định đây tất cả các thuộc tính, không phải đã có sẵn theo mặc định, và bạn muốn được hỗ trợ cho% s.
+DefineHereComplementaryAttributes=Xác định đây tất cả các thuộc tính, không phải đã có sẵn theo mặc định, và bạn muốn được hỗ trợ cho%s.
ExtraFields=Thuộc tính bổ sung
ExtraFieldsLines=Thuộc tính bổ sung (dòng)
ExtraFieldsThirdParties=Thuộc tính bổ sung (của bên thứ ba)
@@ -1025,7 +1022,7 @@ ExtraFieldsSupplierOrders=Thuộc tính bổ sung (đơn đặt hàng)
ExtraFieldsSupplierInvoices=Thuộc tính bổ sung (hoá đơn)
ExtraFieldsProject=Thuộc tính bổ sung (dự án)
ExtraFieldsProjectTask=Thuộc tính bổ sung (nhiệm vụ)
-ExtraFieldHasWrongValue=Thuộc tính% s có giá trị sai.
+ExtraFieldHasWrongValue=Thuộc tính%s có giá trị sai.
AlphaNumOnlyCharsAndNoSpace=chỉ alphanumericals ký tự không có không gian
AlphaNumOnlyLowerCharsAndNoSpace=chỉ alphanumericals và ký tự chữ thường không có không gian
SendingMailSetup=Thiết lập sendings qua email
@@ -1035,25 +1032,24 @@ PathDirectory=Thư mục
SendmailOptionMayHurtBuggedMTA=Tính năng gửi mail sử dụng phương pháp "PHP thư trực tiếp" sẽ tạo ra một tin nhắn qua thư có thể được phân tích cú pháp không chính xác bởi một số máy chủ email nhận được. Kết quả là một số mail không thể được đọc bởi những người tổ chức bởi thoose nền tảng nghe trộm. Đó là trường hợp đối với một số nhà cung cấp Internet (Ví dụ: Orange tại Pháp). Đây không phải là một vấn đề vào Dolibarr cũng không vào PHP nhưng nhận được vào máy chủ mail. Tuy nhiên bạn có thể thêm tùy chọn MAIN_FIX_FOR_BUGGED_MTA tới 1 vào thiết lập - khác để sửa đổi Dolibarr để tránh điều này. Tuy nhiên, bạn có thể gặp vấn đề với các máy chủ khác mà triệt để tôn trọng các tiêu chuẩn SMTP. Các giải pháp khác (recommanded) là sử dụng phương pháp "ổ cắm SMTP thư viện" mà không có nhược điểm.
TranslationSetup=Cấu hình de la Traduction
TranslationDesc=Lựa chọn ngôn ngữ hiển thị trên màn hình có thể được chỉnh sửa: <br> * Trên toàn cầu từ menu <strong>Home - Cài đặt - Hiển thị</strong> <br> * Đối với người dùng chỉ từ tab <strong>hiển thị tài khoản</strong> của người sử dụng thẻ (click vào đăng nhập trên đầu trang của màn hình).
-TotalNumberOfActivatedModules=Tổng số các module tính năng kích <b>hoạt:% s</b>
+TotalNumberOfActivatedModules=Tổng số các module tính năng kích hoạt: <b>%s</b>
YouMustEnableOneModule=Bạn phải có ít nhất 1 mô-đun cho phép
-ClassNotFoundIntoPathWarning=Lớp% s không tìm thấy con đường vào PHP
+ClassNotFoundIntoPathWarning=Lớp%s không tìm thấy con đường vào PHP
YesInSummer=Có trong mùa hè
OnlyFollowingModulesAreOpenedToExternalUsers=Lưu ý, các mô-đun chỉ sau đây được mở cho người dùng bên ngoài (bất cứ điều gì là sự cho phép của người dùng như vậy):
SuhosinSessionEncrypt=Lưu trữ phiên mã hóa bằng Suhosin
-ConditionIsCurrently=Điều kiện hiện nay là% s
-TestNotPossibleWithCurrentBrowsers=Tự động phát hiện không thể
-YouUseBestDriver=Bạn sử dụng trình điều khiển% s đó là điều khiển tốt nhất có sẵn hiện nay.
-YouDoNotUseBestDriver=Bạn sử dụng ổ đĩa% s% s, nhưng lái xe được khuyến khích.
-NbOfProductIsLowerThanNoPb=Bạn chỉ có% s sản phẩm / dịch vụ vào cơ sở dữ liệu. Điều này không yêu cầu bất kỳ tối ưu hóa đặc biệt.
+ConditionIsCurrently=Điều kiện hiện nay là %s
+YouUseBestDriver=Bạn sử dụng trình điều khiển%s đó là điều khiển tốt nhất có sẵn hiện nay.
+YouDoNotUseBestDriver=Bạn sử dụng ổ đĩa%s%s, nhưng lái xe được khuyến khích.
+NbOfProductIsLowerThanNoPb=Bạn chỉ có%s sản phẩm / dịch vụ vào cơ sở dữ liệu. Điều này không yêu cầu bất kỳ tối ưu hóa đặc biệt.
SearchOptim=Tối ưu hóa tìm kiếm
-YouHaveXProductUseSearchOptim=Bạn có sản phẩm% s vào cơ sở dữ liệu. Bạn nên thêm PRODUCT_DONOTSEARCH_ANYWHERE liên tục tới 1 vào Home-Setup khác, bạn giới hạn tìm kiếm với đầu dây làm cho cơ sở dữ liệu có thể sử dụng chỉ số và bạn sẽ nhận được một phản ứng ngay lập tức.
-BrowserIsOK=Bạn đang sử dụng trình duyệt web% s. Trình duyệt này là ok cho bảo mật và hiệu suất.
-BrowserIsKO=Bạn đang sử dụng trình duyệt web% s. Trình duyệt này được biết đến là một lựa chọn tốt cho bảo mật, hiệu suất và độ tin cậy. Chúng tôi recommand bạn sử dụng Firefox, Chrome, Opera hay Safari.
+YouHaveXProductUseSearchOptim=Bạn có sản phẩm%s vào cơ sở dữ liệu. Bạn nên thêm PRODUCT_DONOTSEARCH_ANYWHERE liên tục tới 1 vào Home-Setup khác, bạn giới hạn tìm kiếm với đầu dây làm cho cơ sở dữ liệu có thể sử dụng chỉ số và bạn sẽ nhận được một phản ứng ngay lập tức.
+BrowserIsOK=Bạn đang sử dụng trình duyệt web%s. Trình duyệt này là ok cho bảo mật và hiệu suất.
+BrowserIsKO=Bạn đang sử dụng trình duyệt web%s. Trình duyệt này được biết đến là một lựa chọn tốt cho bảo mật, hiệu suất và độ tin cậy. Chúng tôi recommand bạn sử dụng Firefox, Chrome, Opera hay Safari.
XDebugInstalled=XDebug được tải.
XCacheInstalled=XCache được tải.
AddRefInList=Hiển thị khách hàng / nhà cung cấp ref vào danh sách (chọn danh sách hoặc combobox) và hầu hết các siêu liên kết
-FieldEdition=Edition của trường% s
+FieldEdition=Edition của trường%s
FixTZ=Sửa chữa TimeZone
FillThisOnlyIfRequired=Ví dụ: 2 (chỉ điền nếu múi giờ bù đắp vấn đề có nhiều kinh nghiệm)
GetBarCode=Nhận mã vạch
@@ -1074,11 +1070,11 @@ UserMailRequired=Email cần thiết để tạo một người dùng mới
CompanySetup=Thiết lập các công ty mô-đun
CompanyCodeChecker=Module cho thế hệ thứ ba bên mã và kiểm tra (khách hàng hoặc nhà cung cấp)
AccountCodeManager=Module cho hệ mã kế toán (khách hàng hoặc nhà cung cấp)
-ModuleCompanyCodeAquarium=Quay trở lại một mã số kế toán được xây dựng bởi: <br> % S tiếp theo là mã nhà cung cấp bên thứ ba cho một mã nhà cung cấp kế toán, <br> % S tiếp theo là mã khách hàng của bên thứ ba cho một mã số kế toán của khách hàng.
+ModuleCompanyCodeAquarium=Quay trở lại một mã số kế toán được xây dựng bởi: <br>%s tiếp theo là mã nhà cung cấp bên thứ ba cho một mã nhà cung cấp kế toán, <br>%s tiếp theo là mã khách hàng của bên thứ ba cho một mã số kế toán của khách hàng.
ModuleCompanyCodePanicum=Trả lại một mã kế toán sản phẩm nào.
ModuleCompanyCodeDigitaria=Kế toán đang phụ thuộc vào mã của bên thứ ba. Các mã được bao gồm các ký tự "C" ở vị trí đầu tiên theo sau là 5 ký tự đầu tiên của mã của bên thứ ba.
UseNotifications=Sử dụng thông báo
-NotificationsDesc=Email thông báo tính năng cho phép bạn để âm thầm gửi thư tự động, đối với một số sự kiện Dolibarr, cho bên thứ ba (khách hàng hoặc nhà cung cấp) được cấu hình để. Lựa chọn các địa chỉ liên lạc thông báo và mục tiêu hoạt động được thực hiện một bên thứ ba lúc.
+NotificationsDesc=Email thông báo tính năng cho phép bạn để âm thầm gửi mail tự động, cho một số sự kiện Dolibarr. Mục tiêu của thông báo có thể được định nghĩa: <br> * Mỗi các bên thứ ba liên hệ (khách hàng hoặc nhà cung cấp), một bên thứ ba tại thời gian. <br> * Hoặc bằng cách thiết lập một địa chỉ email mục tiêu toàn cầu về trang thiết lập mô-đun.
ModelModules=Tài liệu mẫu
DocumentModelOdt=Tạo tài liệu từ OpenDocuments mẫu (.odt hoặc .ods tập tin cho OpenOffice, KOffice, TextEdit, ...)
WatermarkOnDraft=Watermark vào dự thảo văn bản
@@ -1100,9 +1096,9 @@ WebCalServer=Máy chủ cơ sở dữ liệu lưu trữ lịch
WebCalDatabaseName=Tên cơ sở dữ liệu
WebCalUser=Người sử dụng cơ sở dữ liệu truy cập
WebCalSetupSaved=Thiết lập Webcalendar lưu thành công.
-WebCalTestOk=Kết nối với máy chủ '% s' vào cơ sở dữ liệu '% s' với người sử dụng '% s' thành công.
-WebCalTestKo1=Kết nối với máy chủ '% s' thành công nhưng cơ sở dữ liệu '% s' không thể đạt được.
-WebCalTestKo2=Kết nối với máy chủ '% s' với người dùng% s 'thất bại.
+WebCalTestOk=Kết nối với máy chủ '%s' vào cơ sở dữ liệu '%s' với người sử dụng '%s' thành công.
+WebCalTestKo1=Kết nối với máy chủ '%s' thành công nhưng cơ sở dữ liệu '%s' không thể đạt được.
+WebCalTestKo2=Kết nối với máy chủ '%s' với người dùng '%s' thất bại.
WebCalErrorConnectOkButWrongDatabase=Kết nối cơ sở dữ liệu thành công nhưng không nhìn được một cơ sở dữ liệu Webcalendar.
WebCalAddEventOnCreateActions=Thêm sự kiện lịch về các hoạt động tạo ra
WebCalAddEventOnCreateCompany=Thêm sự kiện lịch trên các công ty tạo ra
@@ -1110,7 +1106,7 @@ WebCalAddEventOnStatusPropal=Thêm sự kiện lịch trên đề xuất thươn
WebCalAddEventOnStatusContract=Thêm sự kiện lịch trên hợp đồng thay đổi trạng thái
WebCalAddEventOnStatusBill=Thêm sự kiện lịch trên hóa đơn thay đổi trạng thái
WebCalAddEventOnStatusMember=Thêm sự kiện lịch trên các thành viên thay đổi trạng thái
-WebCalUrlForVCalExport=Một liên kết xuất khẩu sang định <b>dạng% s</b> có sẵn tại liên kết sau đây:% s
+WebCalUrlForVCalExport=Một liên kết xuất khẩu sang định dạng <b>%s</b> có sẵn tại liên kết sau đây: %s
WebCalCheckWebcalSetup=Có thể thiết lập mô-đun Webcal là không đúng.
##### Invoices #####
BillsSetup=Thiết lập mô-đun hóa đơn
@@ -1142,14 +1138,16 @@ AddDeliveryAddressAbility=Thêm khả năng ngày giao hàng
UseOptionLineIfNoQuantity=Một dòng sản phẩm / dịch vụ với một số lượng không được coi là một lựa chọn
FreeLegalTextOnProposal=Miễn phí văn bản trên đề xuất thương mại
WatermarkOnDraftProposal=Watermark về dự thảo đề xuất thương mại (nếu không có sản phẩm nào)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
-OrdersSetup=Thiết lập trật tự quản lý
-OrdersNumberingModules=Đơn đặt hàng đánh số mô hình
-OrdersModelModule=Tài liệu để mô hình
+OrdersSetup=Thiết lập quản lý đơn hàng
+OrdersNumberingModules=Mô hình đánh số đơn hàng
+OrdersModelModule=Mô hình tài liệu về đơn hàng
HideTreadedOrders=Ẩn các đơn đặt hàng được xử lý hoặc hủy bỏ trong danh sách
ValidOrderAfterPropalClosed=Để xác nhận đơn đặt hàng sau khi đề xuất gần hơn, làm cho nó có thể không bước theo lệnh tạm thời
FreeLegalTextOnOrders=Miễn phí văn bản trên đơn đặt hàng
WatermarkOnDraftOrders=Watermark về dự thảo đơn đặt hàng (nếu không có sản phẩm nào)
+ShippableOrderIconInList=Thêm một biểu tượng trong danh sách đơn đặt hàng lớn cho biết nếu thứ tự là shippable
##### Clicktodial #####
ClickToDialSetup=Nhấn vào đây để quay số thiết lập mô-đun
ClickToDialUrlDesc=Url gọi khi một nhấp chuột trên điện thoại Picto được thực hiện. Trong URL, bạn có thể sử dụng các thẻ <br> <b>__PHONETO__</b> Sẽ được thay thế bằng số điện thoại của người gọi <br> <b>__PHONEFROM__</b> Sẽ được thay thế bằng số điện thoại của người gọi (của bạn) <br> <b>__LOGIN__</b> Sẽ được thay thế bằng đăng nhập clicktodial của bạn (xác định trên thẻ người dùng của bạn) <br> <b>__PASS__</b> Sẽ được thay thế bằng mật khẩu clicktodial của bạn (xác định trên thẻ người dùng của bạn).
@@ -1162,7 +1160,7 @@ FicheinterNumberingModules=Mô hình can thiệp đánh số
TemplatePDFInterventions=Tài liệu mô hình can thiệp thẻ
WatermarkOnDraftInterventionCards=Watermark vào tài liệu thẻ can thiệp (nếu không có sản phẩm nào)
##### Contracts #####
-ContractsSetup=Thiết lập hợp đồng mô-đun
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=Hợp đồng đánh số module
TemplatePDFContracts=Hợp đồng tài liệu mô hình
FreeLegalTextOnContracts=Miễn phí văn bản về hợp đồng
@@ -1239,14 +1237,14 @@ LDAPTestSearch= Kiểm tra một tìm kiếm LDAP
LDAPSynchroOK=Kiểm tra đồng bộ thành công
LDAPSynchroKO=Kiểm tra đồng bộ hóa thất bại
LDAPSynchroKOMayBePermissions=Kiểm tra đồng bộ hóa thất bại. Kiểm tra xem xui đến máy chủ được cấu hình đúng và cho phép udpates LDAP
-LDAPTCPConnectOK=TCP kết nối với máy chủ LDAP thành công (Server =% s, Port =% s)
-LDAPTCPConnectKO=TCP kết nối với máy chủ LDAP thất bại (Server =% s, Port =% s)
-LDAPBindOK=Kết nối / Authentificate đến máy chủ LDAP thành công (Server =% s, Port =% s, Admin =% s, mật khẩu =% s)
-LDAPBindKO=Kết nối / Authentificate đến máy chủ LDAP thất bại (Server =% s, Port =% s, Admin =% s, mật khẩu =% s)
+LDAPTCPConnectOK=TCP kết nối với máy chủ LDAP thành công (Server =%s, Port =%s)
+LDAPTCPConnectKO=TCP kết nối với máy chủ LDAP thất bại (Server =%s, Port =%s)
+LDAPBindOK=Kết nối / Authentificate đến máy chủ LDAP thành công (Server =%s, Port =%s, Admin =%s, mật khẩu =%s)
+LDAPBindKO=Kết nối / Authentificate đến máy chủ LDAP thất bại (Server =%s, Port =%s, Admin =%s, mật khẩu =%s)
LDAPUnbindSuccessfull=Ngắt kết nối thành công
LDAPUnbindFailed=Ngắt kết nối thất bại
-LDAPConnectToDNSuccessfull=Kết nối với DN (% s) thành công
-LDAPConnectToDNFailed=Kết nối với DN (% s) không thành công
+LDAPConnectToDNSuccessfull=Kết nối với DN (%s) thành công
+LDAPConnectToDNFailed=Kết nối với DN (%s) không thành công
LDAPSetupForVersion3=Máy chủ LDAP cấu hình cho phiên bản 3
LDAPSetupForVersion2=Máy chủ LDAP cấu hình của phiên bản 2
LDAPDolibarrMapping=Dolibarr bản đồ
@@ -1254,7 +1252,7 @@ LDAPLdapMapping=LDAP bản đồ
LDAPFieldLoginUnix=Đăng nhập (Unix)
LDAPFieldLoginExample=Ví dụ: uid
LDAPFilterConnection=Bộ lọc tìm kiếm
-LDAPFilterConnectionExample=Ví dụ: & (objectClass = inetOrgPerson)
+LDAPFilterConnectionExample=Ví dụ: &(objectClass = inetOrgPerson)
LDAPFieldLoginSamba=Đăng nhập (samba, ActiveDirectory)
LDAPFieldLoginSambaExample=Ví dụ: sAMAccountName
LDAPFieldFullname=Họ và tên
@@ -1319,18 +1317,18 @@ MemcachedAvailableAndSetup=Memcached mô-đun dành riêng cho sử dụng máy
OPCodeCache=Bộ nhớ cache opcode
NoOPCodeCacheFound=Không có bộ nhớ cache opcode được tìm thấy. Có thể là bạn sử dụng một bộ nhớ cache opcode hơn XCache hoặc eAccelerator (tốt), có thể bạn không có bộ nhớ cache opcode (rất xấu).
HTTPCacheStaticResources=Bộ nhớ cache HTTP cho tài nguyên tĩnh (css, img, javascript)
-FilesOfTypeCached=Files of type% s được lưu trữ bởi máy chủ HTTP
-FilesOfTypeNotCached=Files of type% s không được lưu trữ bởi máy chủ HTTP
-FilesOfTypeCompressed=Files of type% s được nén bởi máy chủ HTTP
-FilesOfTypeNotCompressed=Files of type% s không bị nén bởi máy chủ HTTP
+FilesOfTypeCached=Files of type%s được lưu trữ bởi máy chủ HTTP
+FilesOfTypeNotCached=Files of type%s không được lưu trữ bởi máy chủ HTTP
+FilesOfTypeCompressed=Files of type%s được nén bởi máy chủ HTTP
+FilesOfTypeNotCompressed=Files of type%s không bị nén bởi máy chủ HTTP
CacheByServer=Bộ nhớ cache của máy chủ
CacheByClient=Bộ nhớ cache của trình duyệt
CompressionOfResources=Nén các phản hồi HTTP
-TestNotPossibleWithCurrentBrowsers=Tự động phát hiện không thể
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
-ProductSetup=Thiết lập các sản phẩm mô-đun
+ProductSetup=Thiết lập mô-đun sản phẩm
ServiceSetup=Thiết lập mô-đun dịch vụ
-ProductServiceSetup=Sản phẩm và dịch vụ thiết lập các mô-đun
+ProductServiceSetup=Thiết lập mô-đun sản phẩm và dịch vụ
NumberOfProductShowInSelect=Số lượng tối đa của sản phẩm trong danh sách combo chọn (0 = không giới hạn)
ConfirmDeleteProductLineAbility=Xác nhận khi loại bỏ các dòng sản phẩm trong các hình thức
ModifyProductDescAbility=Cá nhân mô tả sản phẩm dưới nhiều hình thức
@@ -1352,7 +1350,7 @@ SyslogLevel=Cấp
SyslogSimpleFile=Tập tin
SyslogFilename=Tên tập tin và đường dẫn
YouCanUseDOL_DATA_ROOT=Bạn có thể sử dụng DOL_DATA_ROOT / dolibarr.log cho một tập tin đăng nhập Dolibarr "tài liệu" thư mục. Bạn có thể thiết lập một con đường khác nhau để lưu trữ các tập tin này.
-ErrorUnknownSyslogConstant=Liên tục% s không phải là một hằng số Syslog biết
+ErrorUnknownSyslogConstant=Liên tục%s không phải là một hằng số Syslog biết
OnlyWindowsLOG_USER=Windows chỉ hỗ trợ LOG_USER
##### Donations #####
DonationsSetup=Thiết lập mô-đun tặng
@@ -1386,9 +1384,10 @@ MailingSetup=Gửi email cài đặt mô-đun
MailingEMailFrom=Tên người gửi thư điện tử (Từ) cho email được gửi bằng cách gửi email mô-đun
MailingEMailError=Quay trở lại thư điện tử (lỗi-to) cho email với các lỗi
##### Notification #####
-NotificationSetup=Bu thông báo thiết lập mô-đun email
+NotificationSetup=Thư điện tử của thiết lập mô-đun thông báo
NotificationEMailFrom=Tên người gửi thư điện tử (Từ) cho các email gửi đi thông báo
-ListOfAvailableNotifications=Danh sách thông báo có sẵn (danh sách này phụ thuộc vào các mô-đun kích hoạt)
+ListOfAvailableNotifications=Danh sách các sự kiện mà bạn có thể thiết lập thông báo trên, cho mỗi của bên thứ ba (đi vào thẻ của bên thứ ba để thiết lập) hoặc bằng cách thiết lập một email cố định (Danh sách phụ thuộc vào mô-đun kích hoạt)
+FixedEmailTarget=Mục tiêu email cố định
##### Sendings #####
SendingsSetup=Gửi thiết lập mô-đun
SendingsReceiptModel=Gửi mô hình nhận
@@ -1411,13 +1410,14 @@ FCKeditorForMailing= WYSIWIG tạo / phiên bản cho eMailings khối (Tools> g
FCKeditorForUserSignature=WYSIWIG tạo / phiên bản của chữ ký người sử dụng
FCKeditorForMail=WYSIWIG tạo / phiên bản cho tất cả thư (trừ Outils-> gửi email)
##### OSCommerce 1 #####
-OSCommerceErrorConnectOkButWrongDatabase=Kết nối cơ sở dữ liệu thành công nhưng không nhìn được một cơ sở dữ liệu osCommerce (% s chính không tìm thấy trong bảng% s).
-OSCommerceTestOk=Kết nối với máy chủ '% s' vào cơ sở dữ liệu '% s' với người sử dụng '% s' thành công.
-OSCommerceTestKo1=Kết nối với máy chủ '% s' thành công nhưng cơ sở dữ liệu '% s' không thể đạt được.
-OSCommerceTestKo2=Kết nối với máy chủ '% s' với người dùng% s 'thất bại.
+OSCommerceErrorConnectOkButWrongDatabase=Kết nối cơ sở dữ liệu thành công nhưng không nhìn được một cơ sở dữ liệu osCommerce (%s chính không tìm thấy trong bảng %s).
+OSCommerceTestOk=Kết nối với máy chủ '%s' vào cơ sở dữ liệu '%s' với người sử dụng '%s' thành công.
+OSCommerceTestKo1=Kết nối với máy chủ '%s' thành công nhưng cơ sở dữ liệu '%s' không thể đạt được.
+OSCommerceTestKo2=Kết nối với máy chủ '%s' với người dùng '%s' thất bại.
##### Stock #####
-StockSetup=Cấu hình chứng khoán mô-đun
-UserWarehouse=Cổ phiếu cá nhân sử dụng người dùng
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=Đơn bị xóa
TreeMenu=Menu cây
@@ -1446,7 +1446,7 @@ DetailTarget=Mục tiêu cho các liên kết (_blank đầu mở một cửa s
DetailLevel=Cấp (-1: menu trên cùng, 0: đơn tiêu đề,> 0 menu và menu phụ)
ModifMenu=Thực đơn thay đổi
DeleteMenu=Xóa mục trình đơn
-ConfirmDeleteMenu=Bạn có chắc chắn muốn xóa mục trình <b>đơn% s?</b>
+ConfirmDeleteMenu=Bạn có chắc chắn muốn xóa mục trình đơn <b>%s</b> ?
DeleteLine=Xóa dòng
ConfirmDeleteLine=Bạn Bạn có chắc chắn muốn xóa dòng này?
##### Tax #####
@@ -1471,8 +1471,8 @@ AccountancyCodeSell=Tài khoản bán hàng. Mã
AccountancyCodeBuy=Mua tài khoản. Mã
##### Agenda #####
AgendaSetup=Sự kiện và thiết lập mô-đun chương trình nghị sự
-PasswordTogetVCalExport=Key cho phép liên kết xuất khẩu
-PastDelayVCalExport=Không xuất sự kiện lớn hơn
+PasswordTogetVCalExport=Key cho phép xuất liên kết
+PastDelayVCalExport=Không xuất dữ liệu sự kiện cũ hơn
AGENDA_USE_EVENT_TYPE=Loại hình sử dụng sự kiện (quản lý vào menu Setup -> từ điển -> Loại sự kiện chương trình)
AGENDA_DEFAULT_FILTER_TYPE=Thiết lập tự động loại sự kiện vào bộ lọc tìm kiếm xem chương trình nghị sự
AGENDA_DEFAULT_FILTER_STATUS=Tự động thiết lập trạng thái này cho các sự kiện vào bộ lọc tìm kiếm xem chương trình nghị sự
@@ -1481,12 +1481,15 @@ AGENDA_DEFAULT_VIEW=Tab mà bạn muốn mở mặc định khi lựa chọn ch
ClickToDialDesc=Module này cho phép để thêm một biểu tượng sau khi số điện thoại. Một nhấp chuột vào biểu tượng này sẽ gọi một máy chủ với một địa chỉ URL đặc biệt bạn xác định dưới đây. Điều này có thể được sử dụng để gọi một hệ thống trung tâm cuộc gọi từ Dolibarr có thể gọi số điện thoại trên một hệ thống SIP ví dụ.
##### Point Of Sales (CashDesk) #####
CashDesk=Điểm bán hàng
-CashDeskSetup=Quan điểm của thiết lập mô-đun bán hàng
-CashDeskThirdPartyForSell=Bên thứ ba chung để sử dụng cho bán
+CashDeskSetup=Thiết lập mô-đun Điểm bán hàng
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Tài khoản mặc định để sử dụng để nhận thanh toán bằng tiền mặt
CashDeskBankAccountForCheque= Tài khoản mặc định để sử dụng để nhận thanh toán bằng séc
CashDeskBankAccountForCB= Tài khoản mặc định để sử dụng để nhận thanh toán bằng thẻ tín dụng
-CashDeskIdWareHouse=Kho để sử dụng cho bán
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Thiết lập mô-đun Bookmark
BookmarkDesc=Module này cho phép bạn quản lý bookmark. Bạn cũng có thể thêm các phím tắt cho bất kỳ trang Dolibarr hoặc các trang web externale trên menu bên trái của bạn.
@@ -1515,8 +1518,8 @@ SuppliersInvoiceNumberingModel=Nhà cung cấp hoá đơn đánh số mô hình
GeoIPMaxmindSetup=Thiết lập mô-đun GeoIP MaxMind
PathToGeoIPMaxmindCountryDataFile=Đường dẫn đến tập tin có chứa MaxMind ip dịch nước. <br> Ví dụ: <br> /usr/local/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoIP.dat
NoteOnPathLocation=Lưu ý rằng chỉ IP của bạn để đất nước tập tin dữ liệu phải được bên trong một thư mục PHP của bạn có thể đọc (Kiểm tra PHP open_basedir cho phép cài đặt và hệ thống tập tin).
-YouCanDownloadFreeDatFileTo=Bạn có thể tải về một <b>phiên bản demo miễn phí</b> của tập tin nước MaxMind GeoIP tại% s.
-YouCanDownloadAdvancedDatFileTo=Bạn cũng có thể tải về một <b>phiên bản hoàn thiện hơn, với bản cập nhật,</b> các tập tin nước MaxMind GeoIP tại% s.
+YouCanDownloadFreeDatFileTo=Bạn có thể tải về một <b>phiên bản demo miễn phí</b> của tập tin nước MaxMind GeoIP tại%s.
+YouCanDownloadAdvancedDatFileTo=Bạn cũng có thể tải về một <b>phiên bản hoàn thiện hơn, với bản cập nhật,</b> các tập tin nước MaxMind GeoIP tại%s.
TestGeoIPResult=Thử nghiệm của một IP chuyển đổi -> nước
##### Projects #####
ProjectsNumberingModules=Dự án đánh số mô-đun
@@ -1539,6 +1542,14 @@ DeleteFiscalYear=Xóa năm tài chính
ConfirmDeleteFiscalYear=Bạn chắc chắn muốn xóa năm tài chính này?
Opened=Mở
Closed=Đóng
-
+AlwaysEditable=Luôn luôn có thể được chỉnh sửa
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
Format=Định dạng
TypePaymentDesc=0: Loại khách hàng thanh toán 1: Nhà cung cấp phương thức thanh toán, 2: Cả hai khách hàng và nhà cung cấp loại hình thanh toán
diff --git a/htdocs/langs/vi_VN/agenda.lang b/htdocs/langs/vi_VN/agenda.lang
index aa55936b5ec00177d6441bffa88bc59c277ac965..3f6a2a0afa0b853501eff1391cdfcc46c6b8b010 100644
--- a/htdocs/langs/vi_VN/agenda.lang
+++ b/htdocs/langs/vi_VN/agenda.lang
@@ -2,12 +2,12 @@
IdAgenda=ID sự kiện
Actions=Sự kiện
ActionsArea=Khu vực sự kiện (hành động và nhiệm vụ)
-Agenda=Chương trình nghị sự
-Agendas=Chương trình nghị sự
+Agenda=Lịch làm việc
+Agendas=Lịch làm việc
Calendar=Lịch
Calendars=Lịch
LocalAgenda=Lịch nội bộ
-ActionsOwnedBy=Event owned by
+ActionsOwnedBy=Tổ chức sự kiện thuộc sở hữu của
AffectedTo=Giao cho
DoneBy=Thực hiện bằng cách
Event=Sự kiện
@@ -41,26 +41,24 @@ AutoActions= Tự động điền
AgendaAutoActionDesc= Xác định đây sự kiện mà bạn muốn Dolibarr để tạo ra tự động một sự kiện trong chương trình nghị sự. Nếu không có gì được kiểm tra (theo mặc định), chỉ có hành động thủ công sẽ được đưa vào chương trình nghị sự.
AgendaSetupOtherDesc= Trang này cung cấp tùy chọn để cho phép xuất khẩu các sự kiện Dolibarr của bạn thành một lịch bên ngoài (thunderbird, google lịch, ...)
AgendaExtSitesDesc=Trang này cho phép khai báo các nguồn bên ngoài lịch để xem các sự kiện của họ vào chương trình nghị sự Dolibarr.
-ActionsEvents= Sự kiện mà Dolibarr sẽ tạo ra một hành động trong chương trình nghị sự tự động
-PropalValidatedInDolibarr= Đề nghị xác nhận% s
-InvoiceValidatedInDolibarr= Hoá đơn% s xác nhận
-InvoiceBackToDraftInDolibarr=Hoá đơn% s trở lại trạng thái soạn thảo
-InvoiceDeleteDolibarr=Hoá đơn% s bị xóa
-OrderValidatedInDolibarr= Thứ tự% s xác nhận
-OrderApprovedInDolibarr=Thứ tự% s đã được phê duyệt
-OrderRefusedInDolibarr=Thứ tự% s từ chối
-OrderBackToDraftInDolibarr=Thứ tự% s trở lại trạng thái soạn thảo
-OrderCanceledInDolibarr=Thứ tự% s hủy bỏ
-InterventionValidatedInDolibarr=Can thiệp% s xác nhận
-ProposalSentByEMail=Đề nghị thương mại% s gửi bằng thư điện tử
-OrderSentByEMail=Đơn đặt hàng% s gửi Thư điện tử
-InvoiceSentByEMail=Hóa đơn của khách hàng% s gửi Thư điện tử
-SupplierOrderSentByEMail=Để nhà cung cấp% s gửi Thư điện tử
-SupplierInvoiceSentByEMail=Nhà cung cấp hóa đơn% s gửi bằng thư điện tử
-ShippingSentByEMail=Vận chuyển% s gửi thư điện tử
-ShippingValidated= Vận chuyển% s xác nhận
-InterventionSentByEMail=Can thiệp% s gửi thư điện tử
-InterventionClassifiedBilled=Can thiệp% s phân loại như Quảng cáo tại
+ActionsEvents=Sự kiện mà Dolibarr sẽ tạo ra một hành động trong chương trình nghị sự tự động
+PropalValidatedInDolibarr=Đề nghị xác nhận %s
+InvoiceValidatedInDolibarr=Hoá đơn %s xác nhận
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceBackToDraftInDolibarr=Hoá đơn %s trở lại trạng thái soạn thảo
+InvoiceDeleteDolibarr=Hoá đơn %s bị xóa
+OrderValidatedInDolibarr= Thứ tự %s xác nhận
+OrderApprovedInDolibarr=Thứ tự %s đã được phê duyệt
+OrderRefusedInDolibarr=Thứ tự %s từ chối
+OrderBackToDraftInDolibarr=Thứ tự %s trở lại trạng thái soạn thảo
+OrderCanceledInDolibarr=Thứ tự %s hủy bỏ
+ProposalSentByEMail=Đề nghị thương mại%s gửi bằng thư điện tử
+OrderSentByEMail=Đơn đặt hàng %s gửi Thư điện tử
+InvoiceSentByEMail=Hóa đơn của khách hàng %s gửi Thư điện tử
+SupplierOrderSentByEMail=Để nhà cung cấp %s gửi Thư điện tử
+SupplierInvoiceSentByEMail=Nhà cung cấp hóa đơn %s gửi bằng thư điện tử
+ShippingSentByEMail=Vận chuyển %s gửi thư điện tử
+ShippingValidated= Vận chuyển %s xác nhận
NewCompanyToDolibarr= Bên thứ ba tạo ra
DateActionPlannedStart= Ngày bắt đầu lên kế hoạch
DateActionPlannedEnd= Ngày kết thúc kế hoạch
@@ -69,10 +67,10 @@ DateActionDoneEnd= Bất ngày cuối
DateActionStart= Ngày bắt đầu
DateActionEnd= Ngày kết thúc
AgendaUrlOptions1=Bạn cũng có thể thêm các thông số sau đây để lọc đầu ra:
-AgendaUrlOptions2=<b>login =% s</b> để hạn chế sản lượng để hành động được tạo ra bởi, phân định hoặc thực hiện bằng cách sử <b>dụng% s.</b>
-AgendaUrlOptions3=<b>Logina =% s</b> để hạn chế sản lượng để hành động được tạo ra bởi người sử <b>dụng% s.</b>
-AgendaUrlOptions4=<b>logint =% s</b> để hạn chế sản lượng để hành động được gán cho người <b>dùng% s.</b>
-AgendaUrlOptions5=<b>logind =% s</b> để hạn chế sản lượng để hành động thực hiện bằng cách sử <b>dụng% s.</b>
+AgendaUrlOptions2=<b>login =%s</b> để hạn chế sản lượng để hành động được tạo ra bởi, phân định hoặc thực hiện bằng cách sử dụng <b>%s</b>.
+AgendaUrlOptions3=<b>Logina =%s</b> để hạn chế sản lượng để hành động thuộc sở hữu của một người dùng <b>%s</b>.
+AgendaUrlOptions4=<b>logint =%s</b> để hạn chế sản lượng để hành động được gán cho người dùng <b>%s</b>.
+AgendaUrlOptionsProject=<b>dự án = PROJECT_ID</b> để hạn chế sản lượng để hành động liên quan đến dự án <b>PROJECT_ID.</b>
AgendaShowBirthdayEvents=Hiển thị địa chỉ liên lạc sinh nhật
AgendaHideBirthdayEvents=Giấu địa chỉ liên lạc sinh nhật
Busy=Bận
@@ -84,10 +82,10 @@ ExportCal=Lịch xuất khẩu
ExtSites=Nhập lịch bên ngoài
ExtSitesEnableThisTool=Hiển thị lịch bên ngoài (được định nghĩa vào thiết lập toàn cầu) vào chương trình nghị sự. Không ảnh hưởng đến lịch bên ngoài được xác định bởi người sử dụng.
ExtSitesNbOfAgenda=Số lịch
-AgendaExtNb=Lịch nb% s
+AgendaExtNb=Lịch nb %s
ExtSiteUrlAgenda=URL để truy cập tập tin .ical
ExtSiteNoLabel=Không có Mô tả
WorkingTimeRange=Phạm vi thời gian làm việc
WorkingDaysRange=Ngày làm việc trong khoảng
-AddEvent=Add event
-MyAvailability=My availability
+AddEvent=Tạo sự kiện
+MyAvailability=Sẵn có của tôi
diff --git a/htdocs/langs/vi_VN/banks.lang b/htdocs/langs/vi_VN/banks.lang
index c8f914a802ac7c12d87928887c6f1f1c75e20ab3..5a05d8f4b62968e87c0772e663fafbe8bf614e4e 100644
--- a/htdocs/langs/vi_VN/banks.lang
+++ b/htdocs/langs/vi_VN/banks.lang
@@ -74,7 +74,7 @@ Account=Tài khoản
ByCategories=By loại
ByRubriques=By loại
BankTransactionByCategories=Giao dịch ngân hàng theo danh mục
-BankTransactionForCategory=Giao dịch ngân hàng cho thể <b>loại% s</b>
+BankTransactionForCategory=Giao dịch ngân hàng cho thể loại <b>%s</b>
RemoveFromRubrique=Hủy bỏ liên kết với thể loại
RemoveFromRubriqueConfirm=Bạn Bạn có chắc chắn muốn xóa liên kết giữa các giao dịch và danh mục?
ListBankTransactions=Danh sách các giao dịch ngân hàng
@@ -115,7 +115,7 @@ BankTransfers=Chuyển khoản ngân hàng
TransferDesc=Chuyển từ một tài khoản với nhau, Dolibarr sẽ viết hai bản ghi (ghi nợ trong tài khoản nguồn và tín dụng trong tài khoản mục tiêu, số tiền tương tự. Cùng một nhãn và ngày sẽ được sử dụng cho giao dịch này)
TransferFrom=Từ
TransferTo=Để
-TransferFromToDone=Việc chuyển giao <b>từ% s đến% s trong% s% s</b> đã được ghi nhận.
+TransferFromToDone=Việc chuyển giao từ <b>%s</b> đến <b>%s</b> của <b>%s</b> %s đã được ghi nhận.
CheckTransmitter=Transmitter
ValidateCheckReceipt=Xác nhận việc kiểm tra này?
ConfirmValidateCheckReceipt=Bạn có chắc chắn bạn muốn xác nhận việc kiểm tra này, không có thay đổi sẽ có thể một lần này được thực hiện?
diff --git a/htdocs/langs/vi_VN/bills.lang b/htdocs/langs/vi_VN/bills.lang
index a2b13f31f0d59bc10ada40109fdf070e33ca4fb3..ec7882a6bf02e1c69a02d13f862113742d60efef 100644
--- a/htdocs/langs/vi_VN/bills.lang
+++ b/htdocs/langs/vi_VN/bills.lang
@@ -5,9 +5,9 @@ BillsCustomers=Hoá đơn của khách hàng
BillsCustomer=Hóa đơn của khách hàng
BillsSuppliers=Hoá đơn của nhà cung cấp
BillsCustomersUnpaid=Hoá đơn chưa thanh toán của khách hàng
-BillsCustomersUnpaidForCompany=Hoá đơn chưa thanh toán của khách hàng cho% s
+BillsCustomersUnpaidForCompany=Hoá đơn chưa thanh toán của khách hàng cho %s
BillsSuppliersUnpaid=Hoá đơn chưa thanh toán của nhà cung cấp
-BillsSuppliersUnpaidForCompany=Hoá đơn chưa thanh toán của nhà cung cấp cho% s
+BillsSuppliersUnpaidForCompany=Hoá đơn chưa thanh toán của nhà cung cấp cho %s
BillsLate=Khoản thanh toán trễ
BillsStatistics=Hoá đơn số liệu thống kê của khách hàng
BillsStatisticsSuppliers=Hoá đơn của nhà cung cấp số liệu thống kê
@@ -24,19 +24,19 @@ InvoiceProFormaDesc=<b>Proforma hóa đơn</b> là một hình ảnh của một
InvoiceReplacement=Thay thế hóa đơn
InvoiceReplacementAsk=Thay thế hóa đơn cho hóa đơn
InvoiceReplacementDesc=<b>Thay thế hóa đơn</b> được sử dụng để hủy bỏ và thay thế hoàn toàn một hóa đơn không có thanh toán đã nhận được. <br><br> Lưu ý: Chỉ có hoá đơn không có thanh toán trên nó có thể được thay thế. Nếu bạn thay thế hóa đơn chưa khép kín, nó sẽ được tự động đóng cửa để 'bỏ rơi'.
-InvoiceAvoir=Lưu ý tín dụng
-InvoiceAvoirAsk=Lưu ý tín dụng cho hóa đơn đúng
-InvoiceAvoirDesc=Những <b>lưu ý tín dụng</b> là một hóa đơn tiêu cực được sử dụng để giải quyết thực tế là một hóa đơn có số tiền đó khác hơn so với số tiền thực sự trả tiền (do khách hàng trả tiền quá nhiều bởi lỗi, hoặc sẽ không được thanh toán hoàn toàn kể từ khi ông quay trở lại một số sản phẩm chẳng hạn).
-invoiceAvoirWithLines=Tạo tín dụng Lưu ý với dòng từ hoá đơn nguồn gốc
-invoiceAvoirWithPaymentRestAmount=Tạo tín dụng Lưu ý với số lượng hồ có nguồn gốc hóa đơn thanh toán của
-invoiceAvoirLineWithPaymentRestAmount=Lượng tín dụng Ghi chú của hồ hóa đơn thanh toán của
-ReplaceInvoice=Thay thế hóa đơn% s
+InvoiceAvoir=Ghi nợ
+InvoiceAvoirAsk=Ghi nợ cho hóa đơn đúng
+InvoiceAvoirDesc=Những <b>lưu ý ghi nợ</b> là một hóa đơn tiêu cực được sử dụng để giải quyết thực tế là một hóa đơn có số tiền đó khác hơn so với số tiền thực sự trả tiền (do khách hàng trả tiền quá nhiều bởi lỗi, hoặc sẽ không được thanh toán hoàn toàn kể từ khi ông quay trở lại một số sản phẩm chẳng hạn).
+invoiceAvoirWithLines=Tạo phiếu ghi nợ với dòng từ hoá đơn nguồn gốc
+invoiceAvoirWithPaymentRestAmount=Tạo phiếu ghi nợ với còn lại chưa thanh toán của hóa đơn gốc
+invoiceAvoirLineWithPaymentRestAmount=Lưu ý cho ghi nợ còn lại chưa thanh toán tiền
+ReplaceInvoice=Thay thế hóa đơn %s
ReplacementInvoice=Thay thế hóa đơn
-ReplacedByInvoice=Thay thế bằng hóa đơn% s
+ReplacedByInvoice=Thay thế bằng hóa đơn %s
ReplacementByInvoice=Thay thế bằng hóa đơn
-CorrectInvoice=Hóa đơn đúng% s
+CorrectInvoice=Hóa đơn đúng %s
CorrectionInvoice=Chỉnh hóa đơn
-UsedByInvoice=Được sử dụng để thanh toán hoá đơn% s
+UsedByInvoice=Được sử dụng để thanh toán hoá đơn %s
ConsumedBy=Tiêu thụ
NotConsumed=Không tiêu thụ
NoReplacableInvoice=Không có hoá đơn replacable
@@ -68,7 +68,7 @@ ReceivedPayments=Khoản tiền nhận được
ReceivedCustomersPayments=Khoản tiền nhận được từ khách hàng
PayedSuppliersPayments=Thanh toán payed để nhà cung cấp
ReceivedCustomersPaymentsToValid=Nhận được khoản thanh toán cho khách hàng để xác nhận
-PaymentsReportsForYear=Báo cáo thanh toán cho% s
+PaymentsReportsForYear=Báo cáo thanh toán cho%s
PaymentsReports=Thanh toán báo cáo
PaymentsAlreadyDone=Thanh toán đã được thực hiện
PaymentsBackAlreadyDone=Thanh toán đã được thực hiện trở lại
@@ -87,19 +87,19 @@ ClassifyCanceled=Phân loại 'bỏ rơi'
ClassifyClosed=Phân loại 'Đóng'
ClassifyUnBilled=Phân loại 'chưa lập hoá đơn'
CreateBill=Tạo hóa đơn
-AddBill=Thêm hóa đơn hoặc tín dụng lưu ý
+AddBill=Tạo hóa đơn hoặc ghi nợ lưu ý
AddToDraftInvoices=Thêm vào dự thảo hóa đơn
DeleteBill=Xóa hóa đơn
SearchACustomerInvoice=Tìm kiếm một hóa đơn của khách hàng
SearchASupplierInvoice=Tìm kiếm một nhà cung cấp hóa đơn
CancelBill=Hủy bỏ một hóa đơn
SendRemindByMail=Gửi lời nhắc nhở bằng thư điện tử
-DoPayment=Do thanh toán
-DoPaymentBack=Do thanh toán lại
+DoPayment=Thực hiện thanh toán
+DoPaymentBack=Thực hiện thanh toán lại
ConvertToReduc=Chuyển đổi thành giảm giá trong tương lai
EnterPaymentReceivedFromCustomer=Nhập thanh toán nhận được từ khách hàng
EnterPaymentDueToCustomer=Thực hiện thanh toán do khách hàng
-DisabledBecauseRemainderToPayIsZero=Vô hiệu hóa vì còn phải trả là số không
+DisabledBecauseRemainderToPayIsZero=Vô hiệu hóa bởi vì còn lại chưa thanh toán là số không
Amount=Số tiền
PriceBase=Giá cơ sở
BillStatus=Tình trạng hóa đơn
@@ -127,8 +127,8 @@ PaymentStatusToValidShort=Để xác nhận
ErrorVATIntraNotConfigured=Số thuế GTGT Intracommunautary chưa được xác định
ErrorNoPaiementModeConfigured=Không có phương thức thanh toán mặc định được xác định. Tới hóa đơn thiết lập mô-đun để sửa lỗi này.
ErrorCreateBankAccount=Tạo một tài khoản ngân hàng, sau đó đi vào bảng cài đặt của mô-đun hóa đơn để xác định phương thức thanh toán
-ErrorBillNotFound=Hoá đơn% s không tồn tại
-ErrorInvoiceAlreadyReplaced=Lỗi, bạn cố gắng để xác nhận một hóa đơn để thay thế hóa đơn% s. Nhưng điều này đã được thay thế bằng hóa đơn% s.
+ErrorBillNotFound=Hoá đơn %s không tồn tại
+ErrorInvoiceAlreadyReplaced=Lỗi, bạn cố gắng để xác nhận một hóa đơn để thay thế hóa đơn%s. Nhưng điều này đã được thay thế bằng hóa đơn%s.
ErrorDiscountAlreadyUsed=Lỗi, giảm giá đã được sử dụng
ErrorInvoiceAvoirMustBeNegative=Lỗi, hóa đơn đúng phải có một số tiêu cực
ErrorInvoiceOfThisTypeMustBePositive=Lỗi, loại hóa đơn phải có một số lượng tích cực
@@ -137,11 +137,9 @@ BillFrom=Từ
BillTo=Để
ActionsOnBill=Hoạt động trên hoá đơn
NewBill=Hóa đơn mới
-Prélèvements=Lệnh chuyển tiền định
-Prélèvements=Lệnh chuyển tiền định
-LastBills=Hoá đơn cuối% s
+LastBills=Hoá đơn cuối %s
LastCustomersBills=Cuối% của hoá đơn cho khách hàng
-LastSuppliersBills=Cuối% s nhà cung cấp hoá đơn
+LastSuppliersBills=Cuối%s nhà cung cấp hoá đơn
AllBills=Tất cả hóa đơn
OtherBills=Hoá đơn khác
DraftBills=Dự thảo hoá đơn
@@ -149,17 +147,17 @@ CustomersDraftInvoices=Khách hàng soạn thảo hoá đơn
SuppliersDraftInvoices=Nhà cung cấp dự thảo hoá đơn
Unpaid=Chưa thanh toán
ConfirmDeleteBill=Bạn Bạn có chắc chắn muốn xóa hóa đơn này?
-ConfirmValidateBill=Bạn có chắc chắn bạn muốn xác nhận hóa đơn này với tham <b>chiếu% s?</b>
-ConfirmUnvalidateBill=Bạn có chắc chắn bạn muốn thay đổi hóa <b>đơn% s</b> để soạn thảo trạng thái?
-ConfirmClassifyPaidBill=Bạn có chắc chắn bạn muốn thay đổi hóa <b>đơn% s</b> đến tình trạng thanh toán?
-ConfirmCancelBill=Bạn có chắc chắn bạn muốn hủy bỏ hóa <b>đơn% s?</b>
+ConfirmValidateBill=Bạn có chắc chắn bạn muốn xác nhận hóa đơn này với tham chiếu <b>%s</b> ?
+ConfirmUnvalidateBill=Bạn có chắc chắn bạn muốn thay đổi hóa đơn <b>%s</b> để soạn thảo trạng thái?
+ConfirmClassifyPaidBill=Bạn có chắc chắn bạn muốn thay đổi hóa đơn <b>%s</b> đến tình trạng thanh toán?
+ConfirmCancelBill=Bạn có chắc chắn bạn muốn hủy bỏ hóa đơn <b>%s</b> ?
ConfirmCancelBillQuestion=Tại sao bạn muốn để phân loại hóa đơn này 'bỏ rơi'?
-ConfirmClassifyPaidPartially=Bạn có chắc chắn bạn muốn thay đổi hóa <b>đơn% s</b> đến tình trạng thanh toán?
+ConfirmClassifyPaidPartially=Bạn có chắc chắn bạn muốn thay đổi hóa đơn <b>%s</b> đến tình trạng thanh toán?
ConfirmClassifyPaidPartiallyQuestion=Hoá đơn này chưa được thanh toán hoàn toàn. Lý do để bạn có thể đóng hóa đơn này là gì?
-ConfirmClassifyPaidPartiallyReasonAvoir=Phần còn lại phải trả <b>(% s% s)</b> là giảm giá cấp vì thanh toán đã được thực hiện trước thời hạn. Tôi bị quy tắc thuế GTGT với một lưu ý tín dụng.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Phần còn lại phải trả <b>(% s% s)</b> là giảm giá cấp vì thanh toán đã được thực hiện trước thời hạn. Tôi chấp nhận để mất thuế GTGT giảm giá này.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Phần còn lại phải trả <b>(% s% s)</b> là giảm giá cấp vì thanh toán đã được thực hiện trước thời hạn. Tôi khôi phục lại thuế GTGT giảm giá này mà không có một ghi chú tín dụng.
-ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad khách hàng
+ConfirmClassifyPaidPartiallyReasonAvoir=Còn lại chưa thanh toán <b>(%s %s)</b> là giảm giá cấp vì khoản thanh toán đã được thực hiện trước thời hạn. Tôi làm đúng luật thuế GTGT với một ghi chú ghi nợ.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Còn lại chưa thanh toán <b>(%s %s)</b> là giảm giá cấp vì thanh toán đã được thực hiện trước thời hạn. Tôi chấp nhận để mất thuế GTGT đối với giảm giá này.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Còn lại chưa thanh toán <b>(%s %s)</b> là giảm giá cấp vì thanh toán đã được thực hiện trước thời hạn. Tôi thu hồi thuế GTGT đối với giảm giá này mà không có một ghi chú ghi nợ.
+ConfirmClassifyPaidPartiallyReasonBadCustomer=Khách hàng xấu
ConfirmClassifyPaidPartiallyReasonProductReturned=Sản phẩm trả lại một phần
ConfirmClassifyPaidPartiallyReasonOther=Số tiền bị bỏ rơi vì lý do khác
ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Sự lựa chọn này là có thể nếu hóa đơn của bạn đã được cung cấp với bình luận phù hợp. (Ví dụ «Chỉ có thuế tương ứng với mức giá mà đã được thực tế phải trả cho quyền khấu trừ»)
@@ -167,11 +165,11 @@ ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Ở một số nước, sự l
ConfirmClassifyPaidPartiallyReasonAvoirDesc=Sử dụng lựa chọn này nếu tất cả các khác không phù hợp với
ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Một <b>khách hàng xấu</b> là một khách hàng mà từ chối trả nợ của mình.
ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Lựa chọn này được sử dụng khi thanh toán không đầy đủ vì một số sản phẩm đã được trả lại
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Sử dụng lựa chọn này nếu tất cả các khác không phù hợp, ví dụ như trong tình huống sau đây: <br> - Thanh toán không hoàn thành vì một số sản phẩm được vận chuyển trở lại <br> - Số tiền đòi quá quan trọng bởi vì giảm giá bị lãng quên <br> Trong mọi trường hợp, số tiền trên, tuyên bố phải được sửa chữa trong hệ thống kế toán bằng cách tạo ra một lưu ý tín dụng.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Sử dụng lựa chọn này nếu tất cả các khác không phù hợp, ví dụ như trong tình huống sau đây: <br> - Thanh toán không hoàn thành vì một số sản phẩm được vận chuyển trở lại <br> - Số tiền đòi quá quan trọng bởi vì giảm giá bị lãng quên <br> Trong mọi trường hợp, số tiền trên, tuyên bố phải được sửa chữa trong hệ thống kế toán bằng cách tạo ra một lưu ý ghi nợ.
ConfirmClassifyAbandonReasonOther=Khác
ConfirmClassifyAbandonReasonOtherDesc=Lựa chọn này sẽ được sử dụng trong tất cả các trường hợp khác. Ví dụ bởi vì bạn có kế hoạch để tạo ra một hóa đơn thay thế.
-ConfirmCustomerPayment=Bạn có xác nhận đầu vào thanh toán này <b>cho% s% s?</b>
-ConfirmSupplierPayment=Bạn có xác nhận đầu vào thanh toán này <b>cho% s% s?</b>
+ConfirmCustomerPayment=Bạn có xác nhận đầu vào thanh toán này cho <b>%s</b> %s ?
+ConfirmSupplierPayment=Bạn có xác nhận đầu vào thanh toán này cho <b>%s</b> %s ?
ConfirmValidatePayment=Bạn có chắc chắn bạn muốn xác nhận thanh toán này? Không có thay đổi có thể được thực hiện một lần thanh toán được xác nhận.
ValidateBill=Xác nhận hóa đơn
UnvalidateBill=Hóa đơn Unvalidate
@@ -183,23 +181,23 @@ ShowSocialContribution=Hiển thị đóng góp xã hội
ShowBill=Hiện hóa đơn
ShowInvoice=Hiện hóa đơn
ShowInvoiceReplace=Hiển thị thay thế hóa đơn
-ShowInvoiceAvoir=Xem tin tín dụng
+ShowInvoiceAvoir=Xem tin ghi nợ
ShowInvoiceDeposit=Hiện tiền gửi hóa đơn
ShowPayment=Hiện thanh toán
File=Tập tin
AlreadyPaid=Đã thanh toán
AlreadyPaidBack=Đã thanh toán lại
-AlreadyPaidNoCreditNotesNoDeposits=Đã thanh toán (không có ghi chú tín dụng và tiền gửi)
+AlreadyPaidNoCreditNotesNoDeposits=Đã thanh toán (không có ghi chú ghi nợ và tiền gửi)
Abandoned=Bị bỏ rơi
-RemainderToPay=Phần còn lại phải trả
-RemainderToTake=Phần còn lại để có
-RemainderToPayBack=Phần còn lại để trả lại
+RemainderToPay=Còn lại chưa thanh toán
+RemainderToTake=Số tiền còn lại để mất
+RemainderToPayBack=Số tiền còn lại để trả lại
Rest=Cấp phát
AmountExpected=Số tiền tuyên bố
ExcessReceived=Dư thừa đã nhận
EscompteOffered=Giảm giá cung cấp (thanh toán trước hạn)
-SendBillRef=Trình hóa đơn% s
-SendReminderBillRef=Trình hóa đơn% s (nhắc nhở)
+SendBillRef=Trình hóa đơn%s
+SendReminderBillRef=Trình hóa đơn%s (nhắc nhở)
StandingOrders=Đứng đơn đặt hàng
StandingOrder=Lệnh chuyển tiền định
NoDraftBills=Không có dự thảo hoá đơn
@@ -219,19 +217,18 @@ NoInvoice=Không có hoá đơn
ClassifyBill=Phân loại hóa đơn
SupplierBillsToPay=Nhà cung cấp hoá đơn thanh toán
CustomerBillsUnpaid=Hóa đơn khách hàng chưa thanh toán
-DispenseMontantLettres=Dự luật này được soạn thảo bởi mechanographical được miễn thứ tự chữ
-DispenseMontantLettres=Dự luật này được soạn thảo bởi mechanographical được miễn thứ tự chữ
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=Không thể thu hồi
SetConditions=Thiết lập các điều khoản thanh toán
SetMode=Đặt chế độ thanh toán
Billed=Hóa đơn
-RepeatableInvoice=Được xác định trước hóa đơn
-RepeatableInvoices=Hoá đơn được xác định trước
-Repeatable=Được xác định trước
-Repeatables=Được xác định trước
-ChangeIntoRepeatableInvoice=Chuyển đổi thành được xác định trước
-CreateRepeatableInvoice=Tạo được xác định trước hóa đơn
-CreateFromRepeatableInvoice=Tạo từ được xác định trước hóa đơn
+RepeatableInvoice=Hóa đơn mẫu
+RepeatableInvoices=Hoá đơn mẫu
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Chuyển đổi thành mẫu hóa đơn
+CreateRepeatableInvoice=Tạo mẫu hóa đơn
+CreateFromRepeatableInvoice=Tạo ra từ mẫu hóa đơn
CustomersInvoicesAndInvoiceLines=Hoá đơn của khách hàng và dòng hóa đơn của
CustomersInvoicesAndPayments=Hoá đơn và các khoản thanh toán của khách hàng
ExportDataset_invoice_1=Hóa đơn khách hàng danh sách và đường hóa đơn của
@@ -248,19 +245,19 @@ AddRelativeDiscount=Tạo giảm giá tương đối
EditRelativeDiscount=Chỉnh sửa giảm giá tương đối
AddGlobalDiscount=Tạo giảm tuyệt đối
EditGlobalDiscounts=Chỉnh sửa giảm giá tuyệt đối
-AddCreditNote=Tạo ghi chú tín dụng
+AddCreditNote=Tạo ghi chú ghi nợ
ShowDiscount=Hiện giảm giá
ShowReduc=Các khấu trừ
RelativeDiscount=Giảm tương đối
GlobalDiscount=Giảm giá toàn cầu
-CreditNote=Lưu ý tín dụng
-CreditNotes=Ghi chú tín dụng
+CreditNote=Ghi nợ
+CreditNotes=Ghi nợ
Deposit=Tiền đặt cọc
Deposits=Tiền gửi
-DiscountFromCreditNote=Giảm giá từ giấy báo% s
-DiscountFromDeposit=Thanh toán từ hóa đơn tiền gửi% s
-AbsoluteDiscountUse=Đây là loại tín dụng có thể được sử dụng trên hóa đơn trước khi xác nhận nó
-CreditNoteDepositUse=Hóa đơn phải được xác nhận để sử dụng vị vua này tín dụng
+DiscountFromCreditNote=Giảm giá từ giấy báo %s
+DiscountFromDeposit=Thanh toán từ hóa đơn tiền gửi %s
+AbsoluteDiscountUse=Đây là loại ghi nợ có thể được sử dụng trên hóa đơn trước khi xác nhận nó
+CreditNoteDepositUse=Hóa đơn phải được xác nhận để sử dụng vị vua này ghi nợ
NewGlobalDiscount=Giảm giá mới tuyệt đối
NewRelativeDiscount=Giảm giá mới tương đối
NoteReason=Lưu ý / Lý do
@@ -284,13 +281,13 @@ PaymentNumber=Số thanh toán
RemoveDiscount=Hủy bỏ giảm giá
WatermarkOnDraftBill=Watermark về dự thảo hoá đơn (không có gì nếu trống)
InvoiceNotChecked=Không có hoá đơn được lựa chọn
-CloneInvoice=Hóa đơn Clone
-ConfirmCloneInvoice=Bạn có chắc chắn bạn muốn nhân bản hóa đơn <b>này% s?</b>
+CloneInvoice=Hóa đơn sao chép
+ConfirmCloneInvoice=Bạn có chắc chắn bạn muốn nhân bản hóa đơn này <b>%s</b> ?
DisabledBecauseReplacedInvoice=Hành động vô hiệu hóa vì hóa đơn đã được thay thế
DescTaxAndDividendsArea=Khu vực này trình bày một bản tóm tắt của tất cả các khoản thanh toán cho các chi phí đặc biệt. Hồ sơ chỉ với thanh toán trong năm cố định được bao gồm ở đây.
NbOfPayments=Nb thanh toán
SplitDiscount=Tách chiết khấu trong hai
-ConfirmSplitDiscount=Bạn có chắc chắn bạn muốn chia giảm giá này <b>của% s% s</b> thành 2 giảm giá thấp hơn?
+ConfirmSplitDiscount=Bạn có chắc chắn bạn muốn chia giảm giá này của <b>%s</b> %s thành 2 giảm giá thấp hơn?
TypeAmountOfEachNewDiscount=Số lượng đầu vào cho mỗi hai phần:
TotalOfTwoDiscountMustEqualsOriginal=Tổng của hai giảm giá mới phải bằng số tiền giảm giá ban đầu.
ConfirmRemoveDiscount=Bạn có chắc là bạn muốn loại bỏ giảm giá này?
@@ -315,7 +312,7 @@ PaymentConditionPT_DELIVERY=Ngày giao hàng
PaymentConditionShortPT_ORDER=Theo lệnh
PaymentConditionPT_ORDER=Theo lệnh
PaymentConditionShortPT_5050=50-50
-PaymentConditionPT_5050=50 %% trước, 50 %% khi giao hàng
+PaymentConditionPT_5050=50%% trước, 50%% khi giao hàng
FixAmount=Số tiền sửa chữa
VarAmount=Số lượng biến (%% tot.)
# PaymentType
@@ -325,8 +322,8 @@ PaymentTypePRE=Để Ngân hàng
PaymentTypeShortPRE=Để Ngân hàng
PaymentTypeLIQ=Tiền
PaymentTypeShortLIQ=Tiền
-PaymentTypeCB=Thẻ tín dụng
-PaymentTypeShortCB=Thẻ tín dụng
+PaymentTypeCB=Thẻ ghi nợ
+PaymentTypeShortCB=Thẻ ghi nợ
PaymentTypeCHQ=Kiểm tra
PaymentTypeShortCHQ=Kiểm tra
PaymentTypeTIP=TIP
@@ -357,7 +354,7 @@ FullPhoneNumber=Điện thoại
TeleFax=Fax
PrettyLittleSentence=Chấp nhận tiền thanh toán bằng séc do ban hành trong tên của tôi là một thành viên của một hiệp hội kế toán được chấp thuận của Cục Quản lý tài chính.
IntracommunityVATNumber=Intracommunity số thuế GTGT
-PaymentByChequeOrderedTo=Kiểm tra thanh toán (bao gồm thuế) được trả cho% s gửi đến
+PaymentByChequeOrderedTo=Kiểm tra thanh toán (bao gồm thuế) được trả cho%s gửi đến
PaymentByChequeOrderedToShort=Kiểm tra thanh toán (bao gồm thuế) được trả cho
SendTo=gửi đến
PaymentByTransferOnThisBankAccount=Thanh toán bằng chuyển khoản vào tài khoản ngân hàng sau
@@ -369,8 +366,8 @@ LawApplicationPart4=giá của họ.
LimitedLiabilityCompanyCapital=SARL có vốn đầu tư của
UseLine=Áp dụng
UseDiscount=Sử dụng giảm giá
-UseCredit=Sử dụng tín dụng
-UseCreditNoteInInvoicePayment=Giảm số tiền thanh toán bằng tín dụng này
+UseCredit=Sử dụng ghi nợ
+UseCreditNoteInInvoicePayment=Giảm số tiền thanh toán bằng ghi nợ này
MenuChequeDeposits=Tiền gửi kiểm tra
MenuCheques=Kiểm tra
MenuChequesReceipts=Kiểm tra biên lai
@@ -379,11 +376,11 @@ ChequesReceipts=Kiểm tra biên lai
ChequesArea=Khu vực tiền gửi kiểm tra
ChequeDeposits=Tiền gửi kiểm tra
Cheques=Kiểm tra
-CreditNoteConvertedIntoDiscount=Lưu ý tín dụng này hoặc hóa đơn tiền gửi đã được chuyển đổi thành% s
+CreditNoteConvertedIntoDiscount=Ghi nợ này hoặc hóa đơn tiền gửi đã được chuyển đổi thành%s
UsBillingContactAsIncoiveRecipientIfExist=Sử dụng địa chỉ liên lạc của khách hàng thanh toán thay vì địa chỉ của bên thứ ba là người nhận hoá đơn
ShowUnpaidAll=Hiển thị tất cả các hoá đơn chưa thanh toán
ShowUnpaidLateOnly=Hiện hoá đơn chưa thanh toán cuối chỉ
-PaymentInvoiceRef=Thanh toán hóa đơn% s
+PaymentInvoiceRef=Thanh toán hóa đơn%s
ValidateInvoice=Xác nhận hóa đơn
Cash=Tiền
Reported=Bị trì hoãn
@@ -392,7 +389,7 @@ CantRemovePaymentWithOneInvoicePaid=Không thể loại bỏ thanh toán kể t
ExpectedToPay=Thanh toán dự kiến
PayedByThisPayment=Thanh toán thanh toán này
ClosePaidInvoicesAutomatically=Phân loại "Đã thanh toán" tất cả các hóa đơn tiêu chuẩn hoặc thay thế hoàn toàn thanh toán.
-ClosePaidCreditNotesAutomatically=Phân loại các "Đã thanh toán" tất cả các ghi chú tín dụng hoàn toàn trả lại.
+ClosePaidCreditNotesAutomatically=Phân loại các "Đã thanh toán" tất cả các ghi chú ghi nợ hoàn toàn trả lại.
AllCompletelyPayedInvoiceWillBeClosed=Tất cả hóa đơn không còn phải trả sẽ được tự động đóng cửa để trạng thái "Đã thanh toán".
ToMakePayment=Trả
ToMakePaymentBack=Trả lại
@@ -401,8 +398,8 @@ NoteListOfYourUnpaidInvoices=Lưu ý: Danh sách này chỉ chứa các hoá đ
RevenueStamp=Đóng dấu doanh thu
YouMustCreateInvoiceFromThird=Tùy chọn này chỉ có sẵn khi tạo hóa đơn từ tab "khách hàng" của của bên thứ ba
PDFCrabeDescription=Hóa đơn mẫu PDF Crabe. Một mẫu hóa đơn đầy đủ (mẫu đề nghị)
-TerreNumRefModelDesc1=Quay trở lại với số lượng định dạng syymm-nnnn cho hóa đơn tiêu chuẩn và% syymm-nnnn cho các ghi chú tín dụng mà yyyy là năm%, mm là tháng và NNNN là một chuỗi không có nghỉ ngơi và không trở lại 0
-MarsNumRefModelDesc1=Quay trở lại với số lượng định dạng syymm-nnnn cho hóa đơn tiêu chuẩn%,% syymm-nnnn cho hoá đơn thay thế,% syymm-nnnn cho các ghi chú tín dụng và% syymm-nnnn cho các ghi chú tín dụng mà yyyy là năm, mm là tháng và NNNN là một chuỗi không có phá vỡ và không trở về 0
+TerreNumRefModelDesc1=Quay trở lại với số lượng định dạng syymm-nnnn cho hóa đơn tiêu chuẩn và% syymm-nnnn cho các ghi chú ghi nợ mà yyyy là năm%, mm là tháng và NNNN là một chuỗi không có nghỉ ngơi và không trở lại 0
+MarsNumRefModelDesc1=Quay trở lại với số lượng định dạng syymm-nnnn cho hóa đơn tiêu chuẩn%,% syymm-nnnn cho hoá đơn thay thế,% syymm-nnnn cho các ghi chú ghi nợ và% syymm-nnnn cho các ghi chú ghi nợ mà yyyy là năm, mm là tháng và NNNN là một chuỗi không có phá vỡ và không trở về 0
TerreNumRefModelError=Một dự luật bắt đầu với $ syymm đã tồn tại và không tương thích với mô hình này của chuỗi. Loại bỏ nó hoặc đổi tên nó để kích hoạt module này.
##### Types de contacts #####
TypeContact_facture_internal_SALESREPFOLL=Đại diện sau lên hóa đơn của khách hàng
diff --git a/htdocs/langs/vi_VN/boxes.lang b/htdocs/langs/vi_VN/boxes.lang
index a734b1a3d6954413fc8cd09f0b06fd3ca7187360..622461f3da69ac93975c2064aeb5e3542fa05d3a 100644
--- a/htdocs/langs/vi_VN/boxes.lang
+++ b/htdocs/langs/vi_VN/boxes.lang
@@ -1,17 +1,18 @@
# Dolibarr language file - Source file is en_US - boxes
BoxLastRssInfos=Thông tin Rss
-BoxLastProducts=Cuối% của sản phẩm / dịch vụ
+BoxLastProducts=Cuối %s của sản phẩm / dịch vụ
BoxProductsAlertStock=Sản phẩm trong kho cảnh báo
-BoxLastProductsInContract=Cuối% s hợp đồng sản phẩm / dịch vụ
+BoxLastProductsInContract=Cuối %s hợp đồng sản phẩm / dịch vụ
BoxLastSupplierBills=Nhà cung cấp hoá đơn cuối cùng của
BoxLastCustomerBills=Hoá đơn của khách hàng trước
BoxOldestUnpaidCustomerBills=Hoá đơn chưa thanh toán của khách hàng lâu đời nhất
BoxOldestUnpaidSupplierBills=Hoá đơn chưa thanh toán lâu đời nhất của nhà cung cấp
BoxLastProposals=Cuối cùng đề nghị thương mại
-BoxLastProspects=Triển vọng biến đổi cuối cùng
-BoxLastCustomers=Khách hàng biến đổi cuối cùng
-BoxLastSuppliers=Các nhà cung cấp biến đổi cuối cùng
+BoxLastProspects=Triển vọng đã sửa cuối cùng
+BoxLastCustomers=Khách hàng đã sửa cuối cùng
+BoxLastSuppliers=Các nhà cung cấp đã sửa cuối cùng
BoxLastCustomerOrders=Đơn đặt hàng cuối cùng
+BoxLastValidatedCustomerOrders=Đơn đặt hàng của khách hàng xác nhận cuối cùng
BoxLastBooks=Cuốn sách cuối cùng
BoxLastActions=Hành động cuối cùng
BoxLastContracts=Hợp đồng cuối cùng
@@ -22,41 +23,44 @@ BoxCurrentAccounts=Mở tài khoản ngoại
BoxSalesTurnover=Doanh thu bán hàng
BoxTotalUnpaidCustomerBills=Tổng số khách hàng chưa thanh toán hoá đơn của
BoxTotalUnpaidSuppliersBills=Tổng số nhà cung cấp hoá đơn chưa thanh toán của
-BoxTitleLastBooks=Sách ghi cuối% s
+BoxTitleLastBooks=Sách ghi cuối %s
BoxTitleNbOfCustomers=Số lượng khách hàng
-BoxTitleLastRssInfos=Cuối% s tin tức từ% s
-BoxTitleLastProducts=Cuối% s sửa đổi sản phẩm / dịch vụ
+BoxTitleLastRssInfos=Cuối %s tin tức từ %s
+BoxTitleLastProducts=Cuối %s sửa đổi sản phẩm / dịch vụ
BoxTitleProductsAlertStock=Sản phẩm trong kho cảnh báo
-BoxTitleLastCustomerOrders=Đơn đặt hàng của khách hàng biến đổi cuối cùng% s
-BoxTitleLastSuppliers=Các nhà cung cấp ghi cuối% s
-BoxTitleLastCustomers=Cuối% s ghi nhận khách hàng
-BoxTitleLastModifiedSuppliers=Các nhà cung cấp biến đổi cuối cùng% s
-BoxTitleLastModifiedCustomers=Khách hàng biến đổi cuối cùng% s
-BoxTitleLastCustomersOrProspects=Cuối% s sửa đổi khách hàng hoặc khách hàng tiềm năng
-BoxTitleLastPropals=Cuối% s ghi nhận đề xuất
-BoxTitleLastCustomerBills=Hoá đơn cuối% s khách hàng
-BoxTitleLastSupplierBills=Hoá đơn cuối% s nhà cung cấp
-BoxTitleLastProspects=Cuối% s ghi nhận triển vọng
-BoxTitleLastModifiedProspects=Triển vọng biến đổi cuối cùng% s
+BoxTitleLastCustomerOrders=Đơn đặt hàng của khách hàng cuối %s
+BoxTitleLastModifiedCustomerOrders=Đơn đặt hàng của khách hàng đã sửa %s cuối cùng
+BoxTitleLastSuppliers=Các nhà cung cấp ghi cuối %s
+BoxTitleLastCustomers=Cuối %s ghi nhận khách hàng
+BoxTitleLastModifiedSuppliers=Các nhà cung cấp đã sửa cuối cùng %s
+BoxTitleLastModifiedCustomers=Khách hàng đã sửa cuối cùng %s
+BoxTitleLastCustomersOrProspects=Cuối %s khách hàng hoặc khách hàng tiềm năng
+BoxTitleLastPropals=Cuối %s đề xuất
+BoxTitleLastModifiedPropals=Đề xuất sửa đổi lần cuối %s
+BoxTitleLastCustomerBills=Hoá đơn cuối %s khách hàng
+BoxTitleLastModifiedCustomerBills=Hóa đơn của khách hàng đã sửa %s cuối cùng
+BoxTitleLastSupplierBills=Hoá đơn cuối %s nhà cung cấp
+BoxTitleLastModifiedSupplierBills=Hóa đơn của nhà cung cấp đã sửa %s cuối cùng
+BoxTitleLastModifiedProspects=Triển vọng đã sửa cuối cùng %s
BoxTitleLastProductsInContract=Cuối% của sản phẩm / dịch vụ trong hợp đồng
-BoxTitleLastModifiedMembers=Các thành viên biến đổi cuối cùng% s
-BoxTitleLastFicheInter=Can thiệp biến đổi cuối cùng% s
-BoxTitleOldestUnpaidCustomerBills=Hoá đơn lâu đời nhất% s chưa thanh toán của khách hàng
-BoxTitleOldestUnpaidSupplierBills=Hoá đơn lâu đời nhất% s chưa thanh toán của nhà cung cấp
+BoxTitleLastModifiedMembers=Thành viên cuối %s
+BoxTitleLastFicheInter=Can thiệp đã sửa cuối cùng %s
+BoxTitleOldestUnpaidCustomerBills=Hoá đơn chưa thanh toán của khách hàng lâu đời nhất %s
+BoxTitleOldestUnpaidSupplierBills=Cũ nhất%s nhà cung cấp hoá đơn chưa thanh toán
BoxTitleCurrentAccounts=Số dư tài khoản mở của
BoxTitleSalesTurnover=Doanh thu bán hàng
-BoxTitleTotalUnpaidCustomerBills=Hoá đơn chưa thanh toán của khách hàng
-BoxTitleTotalUnpaidSuppliersBills=Hoá đơn chưa thanh toán của nhà cung cấp
-BoxTitleLastModifiedContacts=Cuối% s sửa đổi địa chỉ liên lạc / địa chỉ
-BoxMyLastBookmarks=% Cuối cùng của tôi s bookmark
+BoxTitleTotalUnpaidCustomerBills=Hóa đơn khách hàng chưa thanh toán
+BoxTitleTotalUnpaidSuppliersBills=Nhà cung cấp hoá đơn chưa thanh toán
+BoxTitleLastModifiedContacts=Cuối%s sửa đổi địa chỉ liên lạc / địa chỉ
+BoxMyLastBookmarks=Bookmark %s cuối cùng của tôi
BoxOldestExpiredServices=Dịch vụ lâu đời nhất đã hết hạn hoạt động
-BoxLastExpiredServices=Cuối% s liên hệ lâu đời nhất với các dịch vụ đã hết hạn hoạt động
-BoxTitleLastActionsToDo=Hành động cuối% s để làm
-BoxTitleLastContracts=Hợp đồng cuối% s
-BoxTitleLastModifiedDonations=Cuối% s đóng góp sửa đổi
-BoxTitleLastModifiedExpenses=Chi phí biến đổi cuối cùng% s
+BoxLastExpiredServices=Cuối %s liên hệ lâu đời nhất với các dịch vụ đã hết hạn hoạt động
+BoxTitleLastActionsToDo=Hành động cuối %s để làm
+BoxTitleLastContracts=Hợp đồng cuối %s
+BoxTitleLastModifiedDonations=Cuối %s đóng góp sửa đổi
+BoxTitleLastModifiedExpenses=Chi phí đã sửa cuối cùng %s
BoxGlobalActivity=Hoạt động toàn cầu (hoá đơn, đề xuất, đơn đặt hàng)
-FailedToRefreshDataInfoNotUpToDate=Không thể làm mới RSS thông. Cuối ngày làm mới thành công:% s
+FailedToRefreshDataInfoNotUpToDate=Không thể làm mới RSS thông. Cuối ngày làm mới thành công: %s
LastRefreshDate=Cuối ngày làm mới
NoRecordedBookmarks=Không có dấu xác định.
ClickToAdd=Nhấn vào đây để thêm.
@@ -76,7 +80,8 @@ NoContractedProducts=Không có sản phẩm / dịch vụ ký hợp đồng
NoRecordedContracts=Không có hợp đồng thu âm
NoRecordedInterventions=Không có biện pháp can thiệp ghi
BoxLatestSupplierOrders=Đơn đặt hàng nhà cung cấp mới nhất
-BoxTitleLatestSupplierOrders=% Của các đơn đặt hàng nhà cung cấp mới nhất
+BoxTitleLatestSupplierOrders=Đơn đặt hàng nhà cung cấp cuối%s
+BoxTitleLatestModifiedSupplierOrders=Đơn hàng nhà cung cấp đã sửa %s cuối cùng
NoSupplierOrder=Không có nhà cung cấp để ghi lại
BoxCustomersInvoicesPerMonth=Hoá đơn của khách hàng mỗi tháng
BoxSuppliersInvoicesPerMonth=Nhà cung cấp hoá đơn mỗi tháng
@@ -85,7 +90,7 @@ BoxSuppliersOrdersPerMonth=Đơn đặt hàng nhà cung cấp mỗi tháng
BoxProposalsPerMonth=Đề xuất mỗi tháng
NoTooLowStockProducts=Không có sản phẩm trong giới hạn cổ phiếu thấp
BoxProductDistribution=Sản phẩm / Dịch vụ phân phối
-BoxProductDistributionFor=Phân phối% s cho% s
+BoxProductDistributionFor=Phân phối %s cho %s
ForCustomersInvoices=Khách hàng hoá đơn
ForCustomersOrders=Khách hàng đặt hàng
ForProposals=Đề xuất
diff --git a/htdocs/langs/vi_VN/cashdesk.lang b/htdocs/langs/vi_VN/cashdesk.lang
index b26bf057ca2e76031b36fd9a7beb220b7b394952..fb5a7b99c2a1401ec606c2132607bd5b68430d2d 100644
--- a/htdocs/langs/vi_VN/cashdesk.lang
+++ b/htdocs/langs/vi_VN/cashdesk.lang
@@ -9,7 +9,7 @@ CashDeskBankCheque=Tài khoản ngân hàng (kiểm tra)
CashDeskWarehouse=Kho
CashdeskShowServices=Dịch vụ bán hàng
CashDeskProducts=Sản phẩm
-CashDeskStock=Cổ
+CashDeskStock=Tồn kho
CashDeskOn=trên
CashDeskThirdParty=Bên thứ ba
CashdeskDashboard=Điểm truy cập bán
diff --git a/htdocs/langs/vi_VN/categories.lang b/htdocs/langs/vi_VN/categories.lang
index 6f08b8ab53966bff2ec50dc9e2d56b5bb425b338..70049b183540e359bda91865484256bd68586bd2 100644
--- a/htdocs/langs/vi_VN/categories.lang
+++ b/htdocs/langs/vi_VN/categories.lang
@@ -42,9 +42,9 @@ ErrCatAlreadyExists=Tên này đã được sử dụng
AddProductToCat=Thêm sản phẩm này vào một danh mục?
ImpossibleAddCat=Không thể thêm các loại
ImpossibleAssociateCategory=Không thể kết hợp các thể loại để
-WasAddedSuccessfully=<b>% S</b> đã được thêm thành công.
+WasAddedSuccessfully=<b>%s</b> đã được thêm thành công.
ObjectAlreadyLinkedToCategory=Yếu tố đã được liên kết với thể loại này.
-CategorySuccessfullyCreated=Thể loại này% s đã được thêm thành công.
+CategorySuccessfullyCreated=Thể loại này %s đã được thêm thành công.
ProductIsInCategories=Sản phẩm / dịch vụ để sở hữu loại sau
SupplierIsInCategories=Sở hữu của bên thứ ba để cung cấp các loại sau đây
CompanyIsInCustomersCategories=Bên thứ ba này sở hữu để sau khách hàng / khách hàng tiềm năng loại
@@ -101,9 +101,6 @@ CatSupLinks=Liên kết giữa nhà cung cấp và các loại
CatCusLinks=Mối liên hệ giữa khách hàng / khách hàng tiềm năng và các loại
CatProdLinks=Liên kết giữa các sản phẩm / dịch vụ và các loại
CatMemberLinks=Liên kết giữa các thành viên và các loại
-CatProdLinks=Liên kết giữa các sản phẩm / dịch vụ và các loại
-CatCusLinks=Mối liên hệ giữa khách hàng / khách hàng tiềm năng và các loại
-CatSupLinks=Liên kết giữa nhà cung cấp và các loại
DeleteFromCat=Di chuyển từ mục
DeletePicture=Ảnh xóa
ConfirmDeletePicture=Xác nhận xoá hình ảnh?
@@ -111,4 +108,5 @@ ExtraFieldsCategories=Thuộc tính bổ sung
CategoriesSetup=Loại thiết lập
CategorieRecursiv=Liên kết với các chủ đề chính tự động
CategorieRecursivHelp=Nếu được kích hoạt, sản phẩm này cũng sẽ liên quan đến chủ đề chính khi thêm vào một tiểu thể loại
-AddProductServiceIntoCategory=Add the following product/service
+AddProductServiceIntoCategory=Thêm sản phẩm / dịch vụ sau đây
+ShowCategory=Show category
diff --git a/htdocs/langs/vi_VN/commercial.lang b/htdocs/langs/vi_VN/commercial.lang
index 46c7b8d170a528c8f3f61cdb2c26ef8ca21189b8..438fc7048a397ff67fd4eba68c1705e5471703ab 100644
--- a/htdocs/langs/vi_VN/commercial.lang
+++ b/htdocs/langs/vi_VN/commercial.lang
@@ -7,20 +7,20 @@ Customer=Khách hàng
Customers=Khách hàng
Prospect=Triển vọng
Prospects=Triển vọng
-DeleteAction=Xóa một sự kiện / nhiệm vụ
-NewAction=Sự kiện mới / nhiệm vụ
-AddAction=Thêm sự kiện / nhiệm vụ
-AddAnAction=Thêm một sự kiện / nhiệm vụ
-AddActionRendezVous=Thêm một sự kiện Rendez-vous
+DeleteAction=Xóa một sự kiện / tác vụ
+NewAction=Sự kiện mới / tác vụ
+AddAction=Tạo sự kiện / tác vụ
+AddAnAction=Tạo một sự kiện / tác vụ
+AddActionRendezVous=Tạo một sự kiện Rendez-vous
Rendez-Vous=Rendezvous
-ConfirmDeleteAction=Bạn có chắc chắn muốn xóa sự kiện này / nhiệm vụ?
+ConfirmDeleteAction=Bạn có chắc chắn muốn xóa sự kiện này / tác vụ?
CardAction=Thẻ sự kiện
PercentDone=Tỷ lệ hoàn thành
-ActionOnCompany=Nhiệm vụ về công ty
-ActionOnContact=Nhiệm vụ về liên hệ
+ActionOnCompany=Tác vụ về công ty
+ActionOnContact=Tác vụ về liên hệ
TaskRDV=Các cuộc họp
-TaskRDVWith=Gặp gỡ với% s
-ShowTask=Hiện nhiệm vụ
+TaskRDVWith=Gặp gỡ với %s
+ShowTask=Hiện tác vụ
ShowAction=Hiện sự kiện
ActionsReport=Sự kiện báo cáo
ThirdPartiesOfSaleRepresentative=Thirdparties với đại diện bán hàng
@@ -35,17 +35,17 @@ ShowCustomer=Hiện khách hàng
ShowProspect=Hiện khách hàng tiềm năng
ListOfProspects=Danh sách khách hàng tiềm năng
ListOfCustomers=Danh sách khách hàng
-LastDoneTasks=Hoàn thành nhiệm vụ cuối% s
-LastRecordedTasks=Nhiệm vụ ghi lại cuối cùng
-LastActionsToDo=Hoạt động lâu đời nhất cuối% s không hoàn thành
-DoneAndToDoActionsFor=Sự kiện hoàn thành và Để làm cho% s
+LastDoneTasks=Hoàn thành tác vụ cuối %s
+LastRecordedTasks=Tác vụ ghi lại cuối cùng
+LastActionsToDo=Hoạt động lâu đời nhất cuối %s không hoàn thành
+DoneAndToDoActionsFor=Sự kiện hoàn thành và Để làm cho %s
DoneAndToDoActions=Để hoàn thành và làm sự kiện
DoneActions=Sự kiện hoàn thành
-DoneActionsFor=Sự kiện hoàn thành% s
+DoneActionsFor=Sự kiện hoàn thành %s
ToDoActions=Sự kiện không đầy đủ
-ToDoActionsFor=Sự kiện không đầy đủ cho% s
-SendPropalRef=Nộp đề xuất thương mại% s
-SendOrderRef=Trình tự% s
+ToDoActionsFor=Sự kiện không đầy đủ cho %s
+SendPropalRef=Nộp đề xuất thương mại %s
+SendOrderRef=Đệ trình đơn hàng %s
StatusNotApplicable=Không áp dụng
StatusActionToDo=Để làm
StatusActionDone=Hoàn thành
@@ -66,7 +66,7 @@ ActionAffectedTo=Tổ chức sự kiện thuộc sở hữu của
ActionDoneBy=Sự kiện được thực hiện bởi
ActionUserAsk=Báo cáo của
ErrorStatusCantBeZeroIfStarted=Nếu trường <b>'ngày thực hiện</b> "được làm đầy, hành động được bắt đầu (hoặc hoàn thành), do đó lĩnh vực' <b>Trạng thái</b> 'không thể là 0 %%.
-ActionAC_TEL=Gọi điện thoại
+ActionAC_TEL=Cuộc gọi
ActionAC_FAX=Gửi fax
ActionAC_PROP=Gửi đề nghị qua đường bưu điện
ActionAC_EMAIL=Gởi thư
@@ -86,7 +86,7 @@ ActionAC_MANUAL=Sự kiện chèn bằng tay
ActionAC_AUTO=Sự kiện tự động chèn
Stats=Thống kê doanh số bán hàng
CAOrder=Khối lượng bán hàng (đơn đặt hàng xác nhận)
-FromTo=từ% s đến% s
+FromTo=từ %s đến %s
MargeOrder=Tỷ suất lợi nhuận (đơn đặt hàng xác nhận)
RecapAnnee=Tóm tắt các năm
NoData=Không có dữ liệu
diff --git a/htdocs/langs/vi_VN/companies.lang b/htdocs/langs/vi_VN/companies.lang
index 6717f473870a43cfcff2aad50f7be38411e82e42..c63934a0536a4c350932d0ac76a63c239bf65948 100644
--- a/htdocs/langs/vi_VN/companies.lang
+++ b/htdocs/langs/vi_VN/companies.lang
@@ -1,6 +1,6 @@
# Dolibarr language file - Source file is en_US - companies
-ErrorCompanyNameAlreadyExists=Tên công ty% s đã tồn tại. Chọn một số khác.
-ErrorPrefixAlreadyExists=Tiền tố% s đã tồn tại. Chọn một số khác.
+ErrorCompanyNameAlreadyExists=Tên công ty %s đã tồn tại. Chọn một số khác.
+ErrorPrefixAlreadyExists=Tiền tố %s đã tồn tại. Chọn một số khác.
ErrorSetACountryFirst=Thiết lập đầu tiên của đất nước
SelectThirdParty=Chọn một bên thứ ba
DeleteThirdParty=Xóa một bên thứ ba
@@ -40,7 +40,7 @@ ThirdPartyProspects=Triển vọng
ThirdPartyProspectsStats=Triển vọng
ThirdPartyCustomers=Khách hàng
ThirdPartyCustomersStats=Khách hàng
-ThirdPartyCustomersWithIdProf12=Khách hàng có% s hay% s
+ThirdPartyCustomersWithIdProf12=Khách hàng có%s hay%s
ThirdPartySuppliers=Nhà cung cấp
ThirdPartyType=Loại bên thứ ba
Company/Fundation=Công ty / cơ sở
@@ -94,7 +94,7 @@ LocalTax2ES=IRPF
TypeLocaltax1ES=Loại RE
TypeLocaltax2ES=IRPF Loại
TypeES=Loại
-ThirdPartyEMail=% S
+ThirdPartyEMail=%s
WrongCustomerCode=Mã khách hàng không hợp lệ
WrongSupplierCode=Mã nhà cung cấp không hợp lệ
CustomerCodeModel=Mô hình mã khách hàng
@@ -247,10 +247,10 @@ CustomerRelativeDiscount=Giảm giá của khách hàng liên quan
CustomerAbsoluteDiscount=Giảm giá khách hàng tuyệt đối
CustomerRelativeDiscountShort=Giảm tương đối
CustomerAbsoluteDiscountShort=Giảm giá tuyệt đối
-CompanyHasRelativeDiscount=Khách hàng này có giảm giá mặc định <b>của% s %%</b>
+CompanyHasRelativeDiscount=Khách hàng này có giảm giá mặc định của <b>%s%%</b>
CompanyHasNoRelativeDiscount=Khách hàng này không có giảm giá tương đối theo mặc định
-CompanyHasAbsoluteDiscount=Khách hàng này vẫn có các khoản tín dụng giảm giá hoặc tiền đặt cọc <b>cho% s% s</b>
-CompanyHasCreditNote=Khách hàng này vẫn có giấy báo <b>cho% s% s</b>
+CompanyHasAbsoluteDiscount=Khách hàng này vẫn có các khoản tín dụng giảm giá hoặc tiền đặt cọc cho <b>%s</b> %s
+CompanyHasCreditNote=Khách hàng này vẫn có giấy báo cho <b>%s</b> %s
CompanyHasNoAbsoluteDiscount=Khách hàng này không có tín dụng giảm giá có sẵn
CustomerAbsoluteDiscountAllUsers=Giảm giá tuyệt đối (do tất cả người dùng)
CustomerAbsoluteDiscountMy=Giảm giá tuyệt đối (do chính mình)
@@ -259,8 +259,8 @@ AvailableGlobalDiscounts=Giảm giá tuyệt đối có sẵn
DiscountNone=Không
Supplier=Nhà cung cấp
CompanyList=Danh sách của công ty
-AddContact=Thêm số liên lạc
-AddContactAddress=Thêm số liên lạc / địa chỉ
+AddContact=Tạo liên hệ
+AddContactAddress=Tạo liên hệ / địa chỉ
EditContact=Sửa liên lạc
EditContactAddress=Sửa liên lạc / địa chỉ
Contact=Liên hệ
@@ -268,8 +268,8 @@ ContactsAddresses=Liên hệ / địa chỉ
NoContactDefinedForThirdParty=Không liên lạc được xác định cho bên thứ ba này
NoContactDefined=Không liên lạc được xác định
DefaultContact=Mặc định liên lạc / địa chỉ
-AddCompany=Thêm công ty
-AddThirdParty=Thêm bên thứ ba
+AddCompany=Tạo công ty
+AddThirdParty=Tạo bên thứ ba
DeleteACompany=Xóa một công ty
PersonalInformations=Dữ liệu cá nhân
AccountancyCode=Đang kế toán
@@ -285,7 +285,7 @@ ValidityControledByModule=Hiệu lực điều khiển bởi mô-đun
ThisIsModuleRules=Đây là quy tắc cho các mô-đun này
LastProspect=Cuối
ProspectToContact=Khách hàng tiềm năng để liên hệ
-CompanyDeleted=Công ty "% s" sẽ bị xóa khỏi cơ sở dữ liệu.
+CompanyDeleted=Công ty "%s" sẽ bị xóa khỏi cơ sở dữ liệu.
ListOfContacts=Danh sách địa chỉ liên lạc / địa chỉ
ListOfContactsAddresses=Danh sách địa chỉ liên lạc / adresses
ListOfProspectsContacts=Danh sách liên hệ khách hàng tiềm năng
@@ -311,12 +311,12 @@ LastContacts=Địa chỉ liên lạc cuối cùng
MyContacts=Địa chỉ liên lạc của tôi
Phones=Điện thoại
Capital=Vốn
-CapitalOf=Thủ đô của% s
+CapitalOf=Vốn của%s
EditCompany=Chỉnh sửa công ty
EditDeliveryAddress=Chỉnh sửa địa chỉ giao hàng
ThisUserIsNot=Thành viên này không phải là một khách hàng tiềm năng, khách hàng cũng không phải nhà cung cấp
VATIntraCheck=Kiểm tra
-VATIntraCheckDesc=Các liên <b>kết% s</b> cho phép yêu cầu các dịch vụ kiểm tra thuế GTGT châu Âu. Một truy cập internet từ máy chủ bên ngoài là cần thiết cho dịch vụ này để làm việc.
+VATIntraCheckDesc=Các liên kết <b>%s</b> cho phép yêu cầu các dịch vụ kiểm tra thuế GTGT châu Âu. Một truy cập internet từ máy chủ bên ngoài là cần thiết cho dịch vụ này để làm việc.
VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
VATIntraCheckableOnEUSite=Kiểm tra Intracomunnautary thuế GTGT trên trang web của hoa hồng Châu Âu
VATIntraManualCheck=Bạn cũng có thể kiểm tra bằng tay từ châu Âu trang web <a href="%s" target="_blank">% s</a>
@@ -379,8 +379,8 @@ DeliveryAddressLabel=Giao hàng tận nơi nhãn địa chỉ
DeleteDeliveryAddress=Xóa một địa chỉ giao hàng
ConfirmDeleteDeliveryAddress=Bạn Bạn có chắc chắn muốn xóa địa chỉ giao hàng này?
NewDeliveryAddress=Địa chỉ giao hàng mới
-AddDeliveryAddress=Thêm địa chỉ
-AddAddress=Thêm địa chỉ
+AddDeliveryAddress=Tạo địa chỉ
+AddAddress=Tạo địa chỉ
NoOtherDeliveryAddress=Không có địa chỉ giao hàng thay thế được xác định
SupplierCategory=Loại nhà cung cấp
JuridicalStatus200=Độc lập
@@ -397,18 +397,18 @@ YouMustCreateContactFirst=Bạn phải tạo ra các email liên lạc cho bên
ListSuppliersShort=Danh sách nhà cung cấp
ListProspectsShort=Danh sách khách hàng tiềm năng
ListCustomersShort=Danh sách khách hàng
-ThirdPartiesArea=Third parties and contact area
-LastModifiedThirdParties=Các bên thứ ba cuối% s sửa đổi
+ThirdPartiesArea=Bên thứ ba và các khu vực liên hệ
+LastModifiedThirdParties=Các bên thứ ba cuối%s sửa đổi
UniqueThirdParties=Tổng số của bên thứ ba độc đáo
InActivity=Mở
ActivityCeased=Đóng
ActivityStateFilter=Tình trạng hoạt động
-ProductsIntoElements=Danh sách sản phẩm vào% s
+ProductsIntoElements=Danh sách sản phẩm vào%s
CurrentOutstandingBill=Hóa đơn đang lưu hành
OutstandingBill=Max. cho hóa đơn xuất sắc
OutstandingBillReached=Đạt tối đa. cho hóa đơn xuất sắc
MonkeyNumRefModelDesc=Quay trở lại với các định dạng numero syymm-nnnn cho mã khách hàng và% syymm-nnnn cho mã nhà cung cấp nơi yyyy là năm%, mm là tháng và NNNN là một chuỗi không có nghỉ ngơi và không trở lại 0.
LeopardNumRefModelDesc=Mã này là miễn phí. Mã này có thể được sửa đổi bất cứ lúc nào.
ManagingDirectors=Quản lý (các) tên (Giám đốc điều hành, giám đốc, chủ tịch ...)
-SearchThirdparty=Search thirdparty
-SearchContact=Search contact
+SearchThirdparty=Tìm kiếm của bên thứ ba
+SearchContact=Tìm kiếm liên lạc
diff --git a/htdocs/langs/vi_VN/compta.lang b/htdocs/langs/vi_VN/compta.lang
index b1b6319f082d9ddf6715258e705ec001329c8d23..6894f90a149b32f1b95f5b65447dac34b93b476e 100644
--- a/htdocs/langs/vi_VN/compta.lang
+++ b/htdocs/langs/vi_VN/compta.lang
@@ -104,13 +104,14 @@ SalesTurnoverMinimum=Doanh thu bán hàng tối thiểu
ByThirdParties=Do các bên thứ ba
ByUserAuthorOfInvoice=Của tác giả hóa đơn
AccountancyExport=Kế toán xuất khẩu
-ErrorWrongAccountancyCodeForCompany=Bad đang kế toán của khách hàng cho% s
+ErrorWrongAccountancyCodeForCompany=Bad đang kế toán của khách hàng cho %s
SuppliersProductsSellSalesTurnover=Doanh thu được tạo ra bởi việc bán các sản phẩm của nhà cung cấp.
CheckReceipt=Kiểm tra tiền gửi
CheckReceiptShort=Kiểm tra tiền gửi
+LastCheckReceiptShort=Last %s check receipts
NewCheckReceipt=Giảm giá mới
NewCheckDeposit=Tiền gửi kiểm tra mới
-NewCheckDepositOn=Tạo nhận đối với tiền gửi trên tài khoản:% s
+NewCheckDepositOn=Tạo nhận đối với tiền gửi trên tài khoản: %s
NoWaitingChecks=Không có kiểm tra chờ đợi tiền gửi.
DateChequeReceived=Kiểm tra ngày tiếp nhận
NbOfCheques=Nb kiểm tra
@@ -119,22 +120,22 @@ ConfirmPaySocialContribution=Bạn có chắc chắn bạn muốn phân loại
DeleteSocialContribution=Xóa một đóng góp xã hội
ConfirmDeleteSocialContribution=Bạn Bạn có chắc chắn muốn xóa đóng góp xã hội này?
ExportDataset_tax_1=Đóng góp xã hội và thanh toán
-CalcModeVATDebt=Chế <b>độ% sVAT về kế toán cam kết% s.</b>
-CalcModeVATEngagement=Chế độ <b>sVAT% đối với thu nhập-chi phí% s.</b>
-CalcModeDebt=Chế <b>độ% sClaims-Các khoản nợ% cho</b> biết <b>kế toán cam kết.</b>
-CalcModeEngagement=Chế <b>độ% sIncomes-Chi% cho</b> biết <b>kế toán tiền mặt</b>
-CalcModeLT1= Chế độ <b>SRE% trên hoá đơn của khách hàng - nhà cung cấp hoá đơn% s</b>
-CalcModeLT1Debt=Chế độ <b>SRE% trên hóa đơn khách hàng% s</b>
-CalcModeLT1Rec= Chế <b>độ% SRE các nhà cung cấp hoá đơn% s</b>
-CalcModeLT2= Chế độ <b>sIRPF% trên hoá đơn của khách hàng - nhà cung cấp hóa đơn% s</b>
-CalcModeLT2Debt=Chế độ <b>sIRPF% trên hóa đơn khách hàng% s</b>
-CalcModeLT2Rec= Chế <b>độ% sIRPF các nhà cung cấp hóa đơn% s</b>
+CalcModeVATDebt=Chế độ <b>%sVAT về kế toán cam kết%s</b>.
+CalcModeVATEngagement=Chế độ <b>%sVAT đối với thu nhập-chi phí%s.</b>
+CalcModeDebt=Chế độ <b>%sClaims-Các khoản nợ%s</b> cho biết <b>kế toán cam kết.</b>
+CalcModeEngagement=Chế độ <b>%sIncomes-Chi%s</b> cho biết <b>kế toán tiền mặt</b>
+CalcModeLT1= Chế độ <b>%sRE trên hoá đơn của khách hàng - nhà cung cấp hoá đơn%s</b>
+CalcModeLT1Debt=Chế độ <b>%sRE% trên hóa đơn khách hàng%s</b>
+CalcModeLT1Rec= Chế độ <b>%sRE các nhà cung cấp hoá đơn%s</b>
+CalcModeLT2= Chế độ <b>%sIRPF trên hoá đơn của khách hàng - nhà cung cấp hóa đơn%s</b>
+CalcModeLT2Debt=Chế độ <b>%sIRPF trên hóa đơn khách hàng%s</b>
+CalcModeLT2Rec= Chế độ <b>%sIRPF các nhà cung cấp hóa đơn%s</b>
AnnualSummaryDueDebtMode=Cán cân thu nhập và chi phí, tổng kết hàng năm
AnnualSummaryInputOutputMode=Cán cân thu nhập và chi phí, tổng kết hàng năm
-AnnualByCompaniesDueDebtMode=Cán cân thu nhập và chi phí, chi tiết do các bên thứ ba, chế <b>độ% sClaims-Các khoản nợ% cho</b> biết <b>kế toán cam kết.</b>
-AnnualByCompaniesInputOutputMode=Cán cân thu nhập và chi phí, chi tiết do các bên thứ ba, chế <b>độ% sIncomes-Chi% cho</b> biết <b>kế toán tiền mặt.</b>
-SeeReportInInputOutputMode=Xem báo <b>cáo% sIncomes-Chi% cho</b> biết <b>tiền mặt chiếm</b> một tính toán thanh toán thực tế được thực hiện
-SeeReportInDueDebtMode=Xem báo <b>cáo% sClaims-Các khoản nợ% s</b> cho biết <b>cam kết chiếm</b> một tính toán trên hoá đơn
+AnnualByCompaniesDueDebtMode=Cán cân thu nhập và chi phí, chi tiết do các bên thứ ba, chế độ <b>%sClaims-Các khoản nợ%s</b> biết <b>kế toán cam kết.</b>
+AnnualByCompaniesInputOutputMode=Cán cân thu nhập và chi phí, chi tiết do các bên thứ ba, <b>%sIncomes-Expenses%s</b> cho biết <b>kế toán tiền mặt.</b>
+SeeReportInInputOutputMode=Xem báo <b>cáo %sIncomes-Chi%s</b> cho biết <b>tiền mặt chiếm</b> một tính toán thanh toán thực tế được thực hiện
+SeeReportInDueDebtMode=Xem báo <b>cáo%sClaims-Các khoản nợ%s</b> cho biết <b>cam kết chiếm</b> một tính toán trên hoá đơn
RulesAmountWithTaxIncluded=- Các khoản hiển thị là với tất cả các loại thuế bao gồm
RulesResultDue=- Nó bao gồm hoá đơn xuất sắc, chi phí và thuế GTGT cho dù họ được trả tiền hay không. <br> - Đó là dựa vào ngày xác nhận hóa đơn, thuế GTGT và vào ngày đến hạn cho các chi phí.
RulesResultInOut=- Nó bao gồm các khoản thanh toán thực tế được thực hiện trên hóa đơn, chi phí và thuế GTGT. <br> - Đó là dựa vào ngày thanh toán hoá đơn, chi phí và thuế GTGT.
@@ -152,8 +153,8 @@ LT2ReportByQuartersInInputOutputMode=Báo cáo của tỷ lệ IRPF
VATReportByQuartersInDueDebtMode=Báo cáo của tỷ lệ thuế GTGT thu, nộp
LT1ReportByQuartersInDueDebtMode=Báo cáo của tỷ lệ RE
LT2ReportByQuartersInDueDebtMode=Báo cáo của tỷ lệ IRPF
-SeeVATReportInInputOutputMode=Xem báo <b>cáo% sVAT vỏ bọc% s</b> cho một tính toán tiêu chuẩn
-SeeVATReportInDueDebtMode=Xem báo <b>cáo% sVAT trên dòng% s</b> cho một tính toán với một tùy chọn trên dòng chảy
+SeeVATReportInInputOutputMode=Xem báo cáo <b>%sVAT vỏ bọc%s</b> cho một tính toán tiêu chuẩn
+SeeVATReportInDueDebtMode=Xem báo cáo <b>%sVAT trên dòng%s</b> cho một tính toán với một tùy chọn trên dòng chảy
RulesVATInServices=- Đối với dịch vụ, báo cáo bao gồm các quy định thuế GTGT thực sự nhận được hoặc ban hành trên cơ sở ngày thanh toán.
RulesVATInProducts=- Đối với tài sản vật chất, nó bao gồm các hoá đơn GTGT trên cơ sở ngày hóa đơn.
RulesVATDueServices=- Đối với dịch vụ, báo cáo bao gồm hóa đơn GTGT do, trả tiền hay không, dựa trên ngày hóa đơn.
@@ -164,9 +165,9 @@ NotUsedForGoods=Không được sử dụng đối với hàng hóa
ProposalStats=Thống kê về các đề xuất
OrderStats=Thống kê về đơn đặt hàng
InvoiceStats=Thống kê trên hóa đơn
-Dispatch=Cử
-Dispatched=Cử
-ToDispatch=Cử
+Dispatch=Đang gửi
+Dispatched=Đã gửi
+ToDispatch=Gửi đi
ThirdPartyMustBeEditAsCustomer=Bên thứ ba phải được định nghĩa là một khách hàng
SellsJournal=Tạp chí Kinh doanh
PurchasesJournal=Mua Tạp chí
@@ -187,23 +188,23 @@ AccountancyDashboard=Kế toán tổng hợp
ByProductsAndServices=Các sản phẩm và dịch vụ
RefExt=Ref bên ngoài
ToCreateAPredefinedInvoice=Để tạo ra một hóa đơn được xác định trước, tạo ra một hóa đơn tiêu chuẩn sau đó, mà không cần xác nhận nó, bấm vào nút vào "Chuyển đổi sang hóa đơn được xác định trước".
-LinkedOrder=Link to order
+LinkedOrder=Liên kết để đặt hàng
ReCalculate=Tính toán lại
Mode1=Phương pháp 1
Mode2=Phương pháp 2
-CalculationRuleDesc=Để tính tổng số thuế GTGT, có hai phương pháp: <br> Phương pháp 1 đang đi ngang vat trên mỗi dòng, sau đó tổng hợp chúng. <br> Cách 2 là cách tổng hợp tất cả vat trên mỗi dòng, sau đó làm tròn kết quả. <br> Kết quả cuối cùng có thể khác với vài xu. Chế độ mặc định là chế <b>độ% s.</b>
+CalculationRuleDesc=Để tính tổng số thuế GTGT, có hai phương pháp: <br> Phương pháp 1 đang đi ngang vat trên mỗi dòng, sau đó tổng hợp chúng. <br> Cách 2 là cách tổng hợp tất cả vat trên mỗi dòng, sau đó làm tròn kết quả. <br> Kết quả cuối cùng có thể khác với vài xu. Chế độ mặc định là chế <b>độ%s.</b>
CalculationRuleDescSupplier=theo nhà cung cấp, lựa chọn phương pháp thích hợp để áp dụng quy tắc tính toán tương tự và nhận được cùng một kết quả mong đợi của nhà cung cấp của bạn.
TurnoverPerProductInCommitmentAccountingNotRelevant=Báo cáo doanh thu mỗi sản phẩm, khi sử dụng chế độ <b>kế toán tiền mặt</b> là không có liên quan. Báo cáo này chỉ có sẵn khi sử dụng chế độ <b>kế toán tham gia</b> (xem thiết lập của module kế toán).
CalculationMode=Chế độ tính toán
AccountancyJournal=Đang kế toán tạp chí
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
-ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
-CloneTaxForNextMonth=Clone it for next month
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Mã kế toán mặc định để mua sản phẩm
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Mã kế toán mặc định để bán sản phẩm
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Mã kế toán mặc định để mua dịch vụ
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Mã kế toán mặc định để bán các dịch vụ
+ACCOUNTING_VAT_ACCOUNT=Kế toán mã mặc định cho thu thuế GTGT
+ACCOUNTING_VAT_BUY_ACCOUNT=Kế toán mã mặc định để nộp thuế GTGT
+ACCOUNTING_ACCOUNT_CUSTOMER=Kế toán mã bằng cách mặc định cho khách hàng thirdparties
+ACCOUNTING_ACCOUNT_SUPPLIER=Kế toán mã bằng cách mặc định cho nhà cung cấp thirdparties
+CloneTax=Sao chép một đóng góp xã hội
+ConfirmCloneTax=Xác nhận bản sao của một đóng góp xã hội
+CloneTaxForNextMonth=Sao chép nó vào tháng tới
diff --git a/htdocs/langs/vi_VN/contracts.lang b/htdocs/langs/vi_VN/contracts.lang
index b073df382432f05fdde9e992d0f544d3d2bfdb5a..2cafa5e8b81d98a1baf18b272d99284f443f371c 100644
--- a/htdocs/langs/vi_VN/contracts.lang
+++ b/htdocs/langs/vi_VN/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
-ContractsArea=Diện tích hợp đồng
+ContractsArea=Phạm vi hợp đồng
ListOfContracts=Danh sách các hợp đồng
-LastContracts=Hợp đồng đổi cuối cùng% s
+LastModifiedContracts=Last %s modified contracts
AllContracts=Tất cả các hợp
ContractCard=Thẻ đồng
ContractStatus=Tình trạng hợp đồng
@@ -27,7 +27,7 @@ MenuRunningServices=Dịch vụ đang chạy
MenuExpiredServices=Dịch vụ hết hạn
MenuClosedServices=Dịch vụ khép kín
NewContract=Hợp đồng mới
-AddContract=Thêm hợp đồng
+AddContract=Tạo hợp đồng
SearchAContract=Tìm kiếm một hợp đồng
DeleteAContract=Xóa một hợp đồng
CloseAContract=Đóng một hợp đồng
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=Danh sách các đường chạy hợp đồng
ListOfRunningServices=Danh sách các dịch vụ đang chạy
NotActivatedServices=Dịch vụ không hoạt động (trong hợp đồng xác nhận)
BoardNotActivatedServices=Dịch vụ để kích hoạt các hợp đồng xác nhận
-LastContracts=Hợp đồng đổi cuối cùng% s
+LastContracts=Last % contracts
LastActivatedServices=Dịch vụ kích hoạt cuối% s
LastModifiedServices=Dịch vụ biến đổi cuối cùng% s
EditServiceLine=Dòng Chỉnh sửa dịch vụ
diff --git a/htdocs/langs/vi_VN/cron.lang b/htdocs/langs/vi_VN/cron.lang
index bcece4045b078541f2fd6e4a381c169c312abb48..019e6939edbf4088e04a72f937401e9ab7752969 100644
--- a/htdocs/langs/vi_VN/cron.lang
+++ b/htdocs/langs/vi_VN/cron.lang
@@ -18,9 +18,8 @@ CronExplainHowToRunUnix=Về môi trường Unix bạn nên sử dụng crontab
CronExplainHowToRunWin=Trên Microsoft (tm) Windows environement bạn có thể sử dụng công cụ nhiệm vụ theo lịch trình để chạy dòng lệnh mỗi phút
# Menu
CronJobs=Việc theo lịch trình
-CronListActive= Danh sách các công việc mới
-CronListInactive= Danh sách việc làm người khuyết tật
-CronListActive= Danh sách các công việc mới
+CronListActive=List of active/scheduled jobs
+CronListInactive=Danh sách việc làm người khuyết tật
# Page list
CronDateLastRun=Chạy cuối
CronLastOutput=Bài đầu ra chạy
diff --git a/htdocs/langs/vi_VN/deliveries.lang b/htdocs/langs/vi_VN/deliveries.lang
index c61a321ab88af2865b203715d21f3538fd580599..eaad58cffcbffdbcd3ce32e3a69f1cea7cae472e 100644
--- a/htdocs/langs/vi_VN/deliveries.lang
+++ b/htdocs/langs/vi_VN/deliveries.lang
@@ -12,7 +12,7 @@ SetDeliveryDate=Thiết lập ngày vận chuyển
ValidateDeliveryReceipt=Xác nhận giao hàng
ValidateDeliveryReceiptConfirm=Bạn có chắc chắn bạn muốn xác nhận giao hàng này?
DeleteDeliveryReceipt=Xóa nhận giao hàng
-DeleteDeliveryReceiptConfirm=Bạn Bạn có chắc chắn muốn xóa nhận giao <b>hàng% s?</b>
+DeleteDeliveryReceiptConfirm=Bạn Bạn có chắc chắn muốn xóa nhận giao hàng <b>%s</b> ?
DeliveryMethod=Phương thức vận chuyển
TrackingNumber=Số theo dõi
DeliveryNotValidated=Giao hàng tận nơi không xác nhận
@@ -23,4 +23,6 @@ GoodStatusDeclaration=Đã nhận được hàng hoá trên trong tình trạng
Deliverer=Giao:
Sender=Tên người gửi
Recipient=Người nhận
-ErrorStockIsNotEnough=Không có đủ chứng khoán
+ErrorStockIsNotEnough=Không có đủ tồn kho
+Shippable=Shippable
+NonShippable=Không shippable
diff --git a/htdocs/langs/vi_VN/donations.lang b/htdocs/langs/vi_VN/donations.lang
index 2a0e46704604a1c77fae525d5cb8cd53548dee2f..3fd817258c224bc5e8b9a67712317bf7827b88a6 100644
--- a/htdocs/langs/vi_VN/donations.lang
+++ b/htdocs/langs/vi_VN/donations.lang
@@ -4,7 +4,7 @@ Donations=Tài trợ
DonationRef=Mã tài trợ
Donor=Nhà tài trợ
Donors=Các nhà tài trợ
-AddDonation=Thêm tài trợ
+AddDonation=Create a donation
NewDonation=Thêm tài trợ mới
ShowDonation=Hiển thị tài trợ
DonationPromise=Hứa tài trợ
@@ -31,3 +31,8 @@ DonationRecipient=Người nhận tài trợ
ThankYou=Trân trọng Cảm ơn!
IConfirmDonationReception=Người nhận tuyên bố tiếp nhận, như là một đóng góp, số tiền sau
MinimumAmount=Minimum amount is %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/vi_VN/exports.lang b/htdocs/langs/vi_VN/exports.lang
index b940d63b5a001f03bb905315025b2917efcd195a..e5de485ea108a4f099ace7d1fbef90772bb92e5a 100644
--- a/htdocs/langs/vi_VN/exports.lang
+++ b/htdocs/langs/vi_VN/exports.lang
@@ -1,26 +1,26 @@
# Dolibarr language file - Source file is en_US - exports
-ExportsArea=Khu vực xuất khẩu
-ImportArea=Khu vực nhập khẩu
-NewExport=Xuất khẩu mới
-NewImport=Nhập khẩu mới
-ExportableDatas=Số liệu xuất khẩu
-ImportableDatas=Dữ liệu nhập cảng
-SelectExportDataSet=Chọn dữ liệu bạn muốn xuất khẩu ...
-SelectImportDataSet=Chọn dữ liệu bạn muốn nhập khẩu ...
-SelectExportFields=Chọn lĩnh vực bạn muốn xuất khẩu, hoặc chọn một hồ sơ xuất khẩu được xác định trước
-SelectImportFields=Chọn lĩnh vực nguồn tập tin bạn muốn nhập khẩu và lĩnh vực mục tiêu của họ trong cơ sở dữ liệu bằng cách kéo lên và xuống với neo% s, hoặc chọn một hồ sơ nhập khẩu được xác định trước:
-NotImportedFields=Các lĩnh vực của tập tin nguồn không nhập khẩu
-SaveExportModel=Lưu hồ sơ xuất khẩu này nếu bạn có kế hoạch để sử dụng lại sau ...
-SaveImportModel=Lưu hồ sơ nhập khẩu này nếu bạn có kế hoạch để sử dụng lại sau ...
-ExportModelName=Tên hồ sơ xuất khẩu
-ExportModelSaved=Hồ sơ xuất khẩu được lưu dưới <b>tên% s.</b>
-ExportableFields=Lĩnh vực xuất khẩu
-ExportedFields=Lĩnh vực xuất khẩu
-ImportModelName=Tên hồ sơ nhập khẩu
-ImportModelSaved=Hồ sơ nhập khẩu lưu dưới <b>tên% s.</b>
-ImportableFields=Lĩnh vực nhập cảng
-ImportedFields=Lĩnh vực nhập khẩu
-DatasetToExport=Số liệu để xuất khẩu
+ExportsArea=Khu vực xuất dữ liệu
+ImportArea=Khu vực nhập dữ liệu
+NewExport=Xuất dữ liệu mới
+NewImport=Nhập dữ liệu mới
+ExportableDatas=Số liệu xuất dữ liệu
+ImportableDatas=Dữ liệu nhập
+SelectExportDataSet=Chọn dữ liệu bạn muốn xuất dữ liệu ...
+SelectImportDataSet=Chọn dữ liệu bạn muốn nhập dữ liệu ...
+SelectExportFields=Chọn lĩnh vực bạn muốn xuất dữ liệu, hoặc chọn một hồ sơ xuất dữ liệu được xác định trước
+SelectImportFields=Chọn lĩnh vực nguồn tập tin bạn muốn nhập dữ liệu và lĩnh vực mục tiêu của họ trong cơ sở dữ liệu bằng cách kéo lên và xuống với neo% s, hoặc chọn một hồ sơ nhập dữ liệu được xác định trước:
+NotImportedFields=Các lĩnh vực của tập tin nguồn không nhập dữ liệu
+SaveExportModel=Lưu hồ sơ xuất dữ liệu này nếu bạn có kế hoạch để sử dụng lại sau ...
+SaveImportModel=Lưu hồ sơ nhập dữ liệu này nếu bạn có kế hoạch để sử dụng lại sau ...
+ExportModelName=Tên hồ sơ xuất dữ liệu
+ExportModelSaved=Hồ sơ xuất dữ liệu được lưu dưới <b>tên% s.</b>
+ExportableFields=Lĩnh vực xuất dữ liệu
+ExportedFields=Lĩnh vực xuất dữ liệu
+ImportModelName=Tên hồ sơ nhập dữ liệu
+ImportModelSaved=Hồ sơ nhập dữ liệu lưu dưới <b>tên% s.</b>
+ImportableFields=Lĩnh vực nhập
+ImportedFields=Lĩnh vực nhập dữ liệu
+DatasetToExport=Số liệu để xuất dữ liệu
DatasetToImport=Nhập tập tin vào bộ dữ liệu
NoDiscardedFields=Không có lĩnh vực trong tập tin nguồn sẽ bị loại bỏ
Dataset=Dataset
@@ -30,23 +30,23 @@ FieldsTitle=Các lĩnh vực tiêu đề
FieldOrder=Để lĩnh vực
FieldTitle=Dòng tiêu đề
ChooseExportFormat=Chọn định dạng xuất
-NowClickToGenerateToBuildExportFile=Bây giờ, chọn định dạng tập tin trong combo box và click vào nút "Tạo" để xây dựng tập tin xuất khẩu ...
+NowClickToGenerateToBuildExportFile=Bây giờ, chọn định dạng tập tin trong combo box và click vào nút "Tạo" để xây dựng tập tin xuất dữ liệu ...
AvailableFormats=Định dạng có sẵn
LibraryShort=Thư viện
LibraryUsed=Thư viện sử dụng
LibraryVersion=Phiên bản
Step=Bước
-FormatedImport=Trợ lý nhập khẩu
+FormatedImport=Trợ lý nhập dữ liệu
FormatedImportDesc1=Khu vực này cho phép nhập dữ liệu cá nhân, sử dụng một trợ lý để giúp bạn trong quá trình mà không có kiến thức kỹ thuật.
FormatedImportDesc2=Bước đầu tiên là chọn một vị vua dữ liệu mà bạn muốn tải, sau đó tập tin để tải, sau đó lựa chọn các lĩnh vực mà bạn muốn tải.
-FormatedExport=Trợ xuất khẩu
-FormatedExportDesc1=Khu vực này cho phép xuất khẩu dữ liệu cá nhân, sử dụng một trợ lý để giúp bạn trong quá trình mà không có kiến thức kỹ thuật.
+FormatedExport=Trợ xuất dữ liệu
+FormatedExportDesc1=Khu vực này cho phép xuất dữ liệu dữ liệu cá nhân, sử dụng một trợ lý để giúp bạn trong quá trình mà không có kiến thức kỹ thuật.
FormatedExportDesc2=Bước đầu tiên là chọn một bộ dữ liệu được xác định trước, sau đó lựa chọn các lĩnh vực mà bạn muốn trong các tập tin kết quả của bạn, và có trật tự.
-FormatedExportDesc3=Khi dữ liệu để xuất khẩu được lựa chọn, bạn có thể xác định các định dạng tập tin đầu ra bạn muốn xuất khẩu dữ liệu của bạn.
+FormatedExportDesc3=Khi dữ liệu để xuất dữ liệu được lựa chọn, bạn có thể xác định các định dạng tập tin đầu ra bạn muốn xuất dữ liệu dữ liệu của bạn.
Sheet=Bảng
-NoImportableData=Không có dữ liệu nhập cảng (không có mô-đun với các định nghĩa để cho phép nhập khẩu dữ liệu)
-FileSuccessfullyBuilt=Xuất khẩu tập tin được tạo ra
-SQLUsedForExport=SQL Yêu cầu sử dụng để xây dựng các tập tin xuất khẩu
+NoImportableData=Không có dữ liệu nhập (không có mô-đun với các định nghĩa để cho phép nhập dữ liệu dữ liệu)
+FileSuccessfullyBuilt=Xuất dữ liệu tập tin được tạo ra
+SQLUsedForExport=SQL Yêu cầu sử dụng để xây dựng các tập tin xuất dữ liệu
LineId=Id của dòng
LineDescription=Mô tả dòng
LineUnitPrice=Đơn giá đường
@@ -56,12 +56,12 @@ LineTotalHT=Số tiền đã trừ thuế cho các dòng
LineTotalTTC=Số tiền có thuế đối với dòng
LineTotalVAT=Số tiền thuế GTGT đối với dòng
TypeOfLineServiceOrProduct=Loại đường (0 = sản phẩm, dịch vụ = 1)
-FileWithDataToImport=Tập tin với dữ liệu nhập khẩu
-FileToImport=Tập tin nguồn để nhập khẩu
-FileMustHaveOneOfFollowingFormat=File để nhập khẩu phải có một trong những định dạng sau
+FileWithDataToImport=Tập tin với dữ liệu nhập dữ liệu
+FileToImport=Tập tin nguồn để nhập dữ liệu
+FileMustHaveOneOfFollowingFormat=File để nhập dữ liệu phải có một trong những định dạng sau
DownloadEmptyExample=Tải về ví dụ về tập tin mã nguồn trống
-ChooseFormatOfFileToImport=Chọn định dạng tập tin để sử dụng như là định dạng tập tin nhập khẩu bằng cách nhấp vào Picto% s để chọn nó ...
-ChooseFileToImport=Tải lên tập tin sau đó nhấn vào Picto% s để chọn tập tin như tập tin nguồn nhập khẩu ...
+ChooseFormatOfFileToImport=Chọn định dạng tập tin để sử dụng như là định dạng tập tin nhập dữ liệu bằng cách nhấp vào Picto% s để chọn nó ...
+ChooseFileToImport=Tải lên tập tin sau đó nhấn vào Picto% s để chọn tập tin như tập tin nguồn nhập dữ liệu ...
SourceFileFormat=Định dạng tập tin nguồn
FieldsInSourceFile=Lĩnh vực trong tập tin nguồn
FieldsInTargetDatabase=Lĩnh vực mục tiêu trong cơ sở dữ liệu Dolibarr (đậm = bắt buộc)
@@ -69,9 +69,9 @@ Field=Dòng
NoFields=Không có lĩnh vực
MoveField=Số cột lĩnh vực di chuyển% s
ExampleOfImportFile=Example_of_import_file
-SaveImportProfile=Lưu hồ sơ nhập khẩu này
-ErrorImportDuplicateProfil=Không thể lưu hồ sơ nhập khẩu này với tên này. Một hồ sơ hiện tại đã tồn tại với tên này.
-ImportSummary=Nhập khẩu tóm tắt thiết lập
+SaveImportProfile=Lưu hồ sơ nhập dữ liệu này
+ErrorImportDuplicateProfil=Không thể lưu hồ sơ nhập dữ liệu này với tên này. Một hồ sơ hiện tại đã tồn tại với tên này.
+ImportSummary=Nhập dữ liệu tóm tắt thiết lập
TablesTarget=Bảng mục tiêu
FieldsTarget=Lĩnh vực mục tiêu
TableTarget=Bảng mục tiêu
@@ -79,42 +79,42 @@ FieldTarget=Trường mục tiêu
FieldSource=Lĩnh vực nguồn
DoNotImportFirstLine=Không nhập dòng đầu tiên của tập tin nguồn
NbOfSourceLines=Số dòng trong tập tin nguồn
-NowClickToTestTheImport=Kiểm tra các thông số nhập khẩu bạn đã xác định. Nếu đúng, hãy nhấp vào nút <b>"% s"</b> để khởi động một mô phỏng của quá trình nhập khẩu (không có dữ liệu sẽ được thay đổi trong cơ sở dữ liệu của bạn, nó chỉ là một mô phỏng cho thời điểm này) ...
-RunSimulateImportFile=Khởi động mô phỏng nhập khẩu
+NowClickToTestTheImport=Kiểm tra các thông số nhập dữ liệu bạn đã xác định. Nếu đúng, hãy nhấp vào nút <b>"% s"</b> để khởi động một mô phỏng của quá trình nhập dữ liệu (không có dữ liệu sẽ được thay đổi trong cơ sở dữ liệu của bạn, nó chỉ là một mô phỏng cho thời điểm này) ...
+RunSimulateImportFile=Khởi động mô phỏng nhập dữ liệu
FieldNeedSource=Trường này yêu cầu dữ liệu từ tập tin nguồn
SomeMandatoryFieldHaveNoSource=Một số thông tin bắt buộc không có nguồn từ tập tin dữ liệu
InformationOnSourceFile=Thông tin về các tập tin nguồn
InformationOnTargetTables=Thông tin về các lĩnh vực mục tiêu
-SelectAtLeastOneField=Chuyển ít nhất một lĩnh vực nguồn trong cột của lĩnh vực xuất khẩu
-SelectFormat=Chọn định dạng tập tin nhập khẩu này
-RunImportFile=Nhập khẩu tập tin khởi động
-NowClickToRunTheImport=Kiểm tra kết quả của mô phỏng nhập khẩu. Nếu mọi thứ đều ổn, khởi động nhập khẩu dứt khoát.
-DataLoadedWithId=Tất cả dữ liệu sẽ được nạp với id nhập khẩu sau <b>đây:% s</b>
-ErrorMissingMandatoryValue=Dữ liệu bắt buộc có sản phẩm nào trong tập tin nguồn cho <b>trường% s.</b>
-TooMuchErrors=Hiện vẫn <b>còn% s</b> dòng nguồn khác với các lỗi nhưng sản lượng còn hạn chế.
-TooMuchWarnings=Hiện vẫn <b>còn% s</b> dòng nguồn khác với các cảnh báo nhưng sản lượng còn hạn chế.
+SelectAtLeastOneField=Chuyển ít nhất một lĩnh vực nguồn trong cột của lĩnh vực xuất dữ liệu
+SelectFormat=Chọn định dạng tập tin nhập dữ liệu này
+RunImportFile=Nhập dữ liệu tập tin khởi động
+NowClickToRunTheImport=Kiểm tra kết quả của mô phỏng nhập dữ liệu. Nếu mọi thứ đều ổn, khởi động nhập dữ liệu dứt khoát.
+DataLoadedWithId=Tất cả dữ liệu sẽ được nạp với id nhập dữ liệu sau đây: <b>%s</b>
+ErrorMissingMandatoryValue=Dữ liệu bắt buộc có sản phẩm nào trong tập tin nguồn cho trường <b>%s</b>.
+TooMuchErrors=Hiện vẫn còn <b>%s</b> dòng nguồn khác với các lỗi nhưng sản lượng còn hạn chế.
+TooMuchWarnings=Hiện vẫn còn <b>%s</b> dòng nguồn khác với các cảnh báo nhưng sản lượng còn hạn chế.
EmptyLine=Dòng trống (sẽ bị loại bỏ)
-CorrectErrorBeforeRunningImport=Trước tiên, bạn phải sửa chữa tất cả các lỗi trước khi chạy nhập khẩu dứt khoát.
-FileWasImported=Tập tin được nhập khẩu với <b>số% s.</b>
-YouCanUseImportIdToFindRecord=Bạn có thể tìm thấy tất cả hồ sơ nhập khẩu trong cơ sở dữ liệu của bạn bằng cách lọc trên sân <b>import_key = '% s'.</b>
-NbOfLinesOK=Số dòng không có lỗi và không có cảnh <b>báo:% s.</b>
-NbOfLinesImported=Số dòng nhập thành <b>công:% s.</b>
+CorrectErrorBeforeRunningImport=Trước tiên, bạn phải sửa chữa tất cả các lỗi trước khi chạy nhập dữ liệu dứt khoát.
+FileWasImported=Tập tin được nhập dữ liệu với số <b>%s</b>.
+YouCanUseImportIdToFindRecord=Bạn có thể tìm thấy tất cả hồ sơ nhập dữ liệu trong cơ sở dữ liệu của bạn bằng cách lọc trên sân <b>import_key = '%s'.</b>
+NbOfLinesOK=Số dòng không có lỗi và không có cảnh báo <b>%s</b>.
+NbOfLinesImported=Số dòng nhập thành công <b>%s</b>.
DataComeFromNoWhere=Giá trị để chèn đến từ hư không trong tập tin nguồn.
-DataComeFromFileFieldNb=Giá trị để chèn đến từ số lĩnh <b>vực% s</b> trong tập tin nguồn.
-DataComeFromIdFoundFromRef=Giá trị xuất phát từ số lĩnh <b>vực% s</b> của file gốc sẽ được sử dụng để tìm id của đối tượng phụ huynh để sử dụng (Vì vậy, các <b>Objet% s</b> có ref. Từ tập tin nguồn phải tồn tại vào Dolibarr).
-DataComeFromIdFoundFromCodeId=Mã số đó xuất phát từ số lĩnh <b>vực% s</b> của file gốc sẽ được sử dụng để tìm id của đối tượng phụ huynh để sử dụng (Vì vậy, các mã từ file nguồn phải tồn tại vào từ <b>điển% s).</b> Lưu ý rằng nếu bạn biết id, bạn cũng có thể sử dụng nó vào tập tin nguồn thay vì mã. Nhập khẩu nên hoạt động trong cả hai trường hợp.
+DataComeFromFileFieldNb=Giá trị để chèn đến từ số lĩnh vực <b>%s</b> trong tập tin nguồn.
+DataComeFromIdFoundFromRef=Giá trị xuất phát từ số lĩnh vực <b>%s</b> của file gốc sẽ được sử dụng để tìm id của đối tượng phụ huynh để sử dụng (Vì vậy, các objet <b>%s</b> có ref. Từ tập tin nguồn phải tồn tại vào Dolibarr).
+DataComeFromIdFoundFromCodeId=Mã số đó xuất phát từ số lĩnh vực <b>%s</b> của file gốc sẽ được sử dụng để tìm id của đối tượng phụ huynh để sử dụng (Vì vậy, các mã từ file nguồn phải tồn tại vào từ điển <b>%s</b>). Lưu ý rằng nếu bạn biết id, bạn cũng có thể sử dụng nó vào tập tin nguồn thay vì mã. Nhập dữ liệu nên hoạt động trong cả hai trường hợp.
DataIsInsertedInto=Dữ liệu từ tập tin nguồn sẽ được chèn vào các lĩnh vực sau đây:
DataIDSourceIsInsertedInto=Id của đối tượng phụ huynh tìm thấy bằng cách sử dụng dữ liệu trong tập tin nguồn, sẽ được chèn vào các lĩnh vực sau đây:
DataCodeIDSourceIsInsertedInto=Id của dòng mẹ tìm thấy từ mã, sẽ được đưa vào lĩnh vực sau đây:
SourceRequired=Giá trị dữ liệu là bắt buộc
SourceExample=Ví dụ về giá trị dữ liệu có thể
-ExampleAnyRefFoundIntoElement=Bất kỳ ref tìm thấy cho các phần <b>tử% s</b>
-ExampleAnyCodeOrIdFoundIntoDictionary=Bất kỳ mã (hoặc id) được tìm thấy vào từ <b>điển% s</b>
+ExampleAnyRefFoundIntoElement=Bất kỳ ref tìm thấy cho các phần từ <b>%s</b>.
+ExampleAnyCodeOrIdFoundIntoDictionary=Bất kỳ mã (hoặc id) được tìm thấy vào từ điển <b>%s</b>.
CSVFormatDesc=<b>Comma</b> định dạng tập tin <b>Giá trị Ly</b> (csv). <br> Đây là một định dạng tập tin văn bản mà các lĩnh vực được phân cách bằng dấu phân cách [% s]. Nếu tách được tìm thấy bên trong một lĩnh vực nội dung, lĩnh vực được làm tròn bằng cách nhân vật tròn [% s]. Thoát khỏi nhân vật để thoát khỏi nhân vật tròn là [% s].
Excel95FormatDesc=Định dạng tập tin <b>Excel</b> (xls) <br> Đây là nguồn gốc Excel 95 định dạng (BIFF5).
Excel2007FormatDesc=Định dạng tập tin <b>Excel</b> (xlsx) <br> Đây là nguồn gốc định dạng Excel 2007 (SpreadsheetML).
TsvFormatDesc=<b>Tab Ly</b> định dạng tập tin <b>Giá trị</b> (.tsv) <br> Đây là một định dạng tập tin văn bản mà các lĩnh vực được phân cách bởi một lập bảng [tab].
-ExportFieldAutomaticallyAdded=<b>Dòng% s</b> đã được tự động thêm vào. Nó sẽ tránh bạn phải có dòng tương tự như được coi là bản sao hồ sơ (với lĩnh vực này nói thêm, tất cả các dòng sẽ sở hữu id của riêng mình và sẽ khác nhau).
+ExportFieldAutomaticallyAdded=Dòng <b>%s</b> đã được tự động thêm vào. Nó sẽ tránh bạn phải có dòng tương tự như được coi là bản sao hồ sơ (với lĩnh vực này nói thêm, tất cả các dòng sẽ sở hữu id của riêng mình và sẽ khác nhau).
CsvOptions=Csv Tùy chọn
Separator=Separator
Enclosure=Bao vây
diff --git a/htdocs/langs/vi_VN/externalsite.lang b/htdocs/langs/vi_VN/externalsite.lang
index 4d7ae4de74793a746057010f363f3db8b6fa1380..3c743e21a60de578e300a0cf492791bf4ce47dfa 100644
--- a/htdocs/langs/vi_VN/externalsite.lang
+++ b/htdocs/langs/vi_VN/externalsite.lang
@@ -2,3 +2,4 @@
ExternalSiteSetup=Thiết lập liên kết đến trang web bên ngoài
ExternalSiteURL=Địa chỉ trang bên ngoài
ExternalSiteModuleNotComplete=Mô-đun trang web bên ngoài được cấu hình không đúng.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/vi_VN/holiday.lang b/htdocs/langs/vi_VN/holiday.lang
index f77cc5644732e8d109377ac32abff73f97776b25..78b2efdd9b69e82defde76cbfd1bc5cac381aa78 100644
--- a/htdocs/langs/vi_VN/holiday.lang
+++ b/htdocs/langs/vi_VN/holiday.lang
@@ -1,13 +1,13 @@
# Dolibarr language file - Source file is en_US - holiday
HRM=HRM
-Holidays=Leaves
-CPTitreMenu=Leaves
+Holidays=Nghỉ phép
+CPTitreMenu=Nghỉ phép
MenuReportMonth=Báo cáo hàng tháng
-MenuAddCP=Make a leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
-NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
-NoCPforUser=You don't have any available day.
-AddCP=Make a leave request
+MenuAddCP=Thực hiện một yêu cầu nghỉ phép
+NotActiveModCP=Bạn phải kích hoạt Leaves mô đun để xem trang này.
+NotConfigModCP=Bạn phải cấu hình các module Nghỉ phép để xem trang này. Để làm điều này, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;">nhấn vào đây</a> </ a> <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;">.</a>
+NoCPforUser=Bạn không có bất kỳ ngày nào có sẵn.
+AddCP=Thực hiện một yêu cầu nghỉ phép
Employe=Nhân viên
DateDebCP=Ngày bắt đầu
DateFinCP=Ngày kết thúc
@@ -18,24 +18,24 @@ ApprovedCP=Đã được phê duyệt
CancelCP=Hủy bỏ
RefuseCP=Từ chối
ValidatorCP=Approbator
-ListeCP=List of leaves
+ListeCP=Danh sách nghỉ phép
ReviewedByCP=Sẽ được xem xét bởi
DescCP=Mô tả
-SendRequestCP=Create leave request
-DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Edit balance of leaves
-UpdateAllCP=Update the leaves
-SoldeCPUser=Leaves balance is <b>%s</b> days.
+SendRequestCP=Tạo yêu cầu nghỉ phép
+DelayToRequestCP=Để lại yêu cầu phải được thực hiện vào <b>ngày</b> thứ nhất <b>là% s (s)</b> trước họ.
+MenuConfCP=Sửa cân bằng của nghỉ phép
+UpdateAllCP=Cập nhật các nghỉ phép
+SoldeCPUser=Nghỉ phép số dư <b>là% s</b> ngày.
ErrorEndDateCP=Bạn phải chọn ngày kết thúc lớn hơn ngày bắt đầu.
ErrorSQLCreateCP=Đã xảy ra lỗi SQL trong quá trình tạo:
-ErrorIDFicheCP=An error has occurred, the leave request does not exist.
+ErrorIDFicheCP=Một lỗi đã xảy ra, yêu cầu nghỉ phép không tồn tại.
ReturnCP=Trở lại trang trước
-ErrorUserViewCP=You are not authorized to read this leave request.
-InfosCP=Information of the leave request
+ErrorUserViewCP=Bạn không được cấp phép để xem yêu cầu nghỉ phép này.
+InfosCP=Thông tin về các yêu cầu nghỉ phép
InfosWorkflowCP=Thông tin Quy trình làm việc
RequestByCP=Theo yêu cầu của
-TitreRequestCP=Leave request
-NbUseDaysCP=Number of days of vacation consumed
+TitreRequestCP=Yêu cầu rời
+NbUseDaysCP=Số ngày nghỉ tiêu thụ
EditCP=Chỉnh sửa
DeleteCP=Xóa
ActionValidCP=Xác nhận
@@ -43,26 +43,25 @@ ActionRefuseCP=Từ chối
ActionCancelCP=Hủy bỏ
StatutCP=Tình trạng
SendToValidationCP=Gửi cho xác nhận
-TitleDeleteCP=Delete the leave request
-ConfirmDeleteCP=Confirm the deletion of this leave request?
-ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
-CantCreateCP=You don't have the right to make leave requests.
-InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=Cập nhật
-CantUpdate=You cannot update this leave request.
+TitleDeleteCP=Xóa yêu cầu nghỉ
+ConfirmDeleteCP=Xác nhận việc xóa yêu cầu nghỉ này?
+ErrorCantDeleteCP=Lỗi bạn không có quyền xóa yêu cầu nghỉ phép này.
+CantCreateCP=Bạn không có quyền thực hiện các yêu cầu nghỉ phép.
+InvalidValidatorCP=Bạn phải chọn một approbator để yêu cầu nghỉ phép của bạn.
+CantUpdate=Bạn không thể cập nhật yêu cầu nghỉ phép này.
NoDateDebut=Bạn phải chọn một ngày bắt đầu.
NoDateFin=Bạn phải chọn ngày kết thúc.
-ErrorDureeCP=Yêu cầu của bạn cho các ngày nghỉ không có ngày làm việc.
-TitleValidCP=Thông qua những ngày nghỉ theo yêu cầu
-ConfirmValidCP=Are you sure you want to approve the leave request?
+ErrorDureeCP=Yêu cầu nghỉ phép của bạn không có một ngày làm việc.
+TitleValidCP=Chấp nhận yêu cầu nghỉ
+ConfirmValidCP=Bạn có chắc chắn muốn chấp nhận yêu cầu nghỉ phép?
DateValidCP=Ngày phê duyệt
-TitleToValidCP=Send leave request
-ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Từ chối các yêu cầu ngày lễ
-ConfirmRefuseCP=Are you sure you want to refuse the leave request?
+TitleToValidCP=Gửi yêu cầu nghỉ phép
+ConfirmToValidCP=Bạn có chắc chắn muốn gửi yêu cầu nghỉ phép?
+TitleRefuseCP=Từ chối các yêu cầu nghỉ phép
+ConfirmRefuseCP=Bạn có chắc chắn muốn từ chối các yêu cầu nghỉ phép?
NoMotifRefuseCP=Bạn phải chọn một lý do để từ chối yêu cầu.
-TitleCancelCP=Hủy bỏ những ngày nghỉ theo yêu cầu
-ConfirmCancelCP=Are you sure you want to cancel the leave request?
+TitleCancelCP=Hủy bỏ yêu cầu nghỉ
+ConfirmCancelCP=Bạn có chắc chắn muốn hủy bỏ yêu cầu nghỉ phép?
DetailRefusCP=Lý do từ chối
DateRefusCP=Ngày từ chối
DateCancelCP=Ngày hủy
@@ -72,42 +71,42 @@ MotifCP=Lý do
UserCP=Người sử dụng
ErrorAddEventToUserCP=Đã xảy ra lỗi khi thêm ngày nghỉ đặc biệt.
AddEventToUserOkCP=Việc bổ sung nghỉ đặc biệt đã được hoàn thành.
-MenuLogCP=View logs of leave requests
-LogCP=Log of updates of available vacation days
+MenuLogCP=Xem nhật các yêu cầu nghỉ
+LogCP=Đăng cập nhật ngày nghỉ có sẵn
ActionByCP=Thực hiện bởi
UserUpdateCP=Đối với người sử dụng
PrevSoldeCP=Cân bằng trước
NewSoldeCP=New Balance
-alreadyCPexist=Một yêu cầu cho các ngày nghỉ đã được thực hiện vào thời kỳ này.
+alreadyCPexist=Một yêu cầu nghỉ phép đã được thực hiện vào thời gian này.
UserName=Tên
Employee=Nhân viên
-FirstDayOfHoliday=First day of vacation
-LastDayOfHoliday=Last day of vacation
+FirstDayOfHoliday=Ngày đầu tiên của kỳ nghỉ
+LastDayOfHoliday=Ngày cuối cùng của kỳ nghỉ
HolidaysMonthlyUpdate=Cập nhật hàng tháng
ManualUpdate=Cập nhật thủ công
-HolidaysCancelation=Leave request cancelation
+HolidaysCancelation=Để lại yêu cầu hủy bỏ
## Configuration du Module ##
-ConfCP=Cấu hình của mô-đun lễ
+ConfCP=Cấu hình yêu cầu nghỉ phép mô-đun
DescOptionCP=Mô tả các tùy chọn
ValueOptionCP=Giá trị
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Nhóm có khả năng chấp nhận các yêu cầu nghỉ phép
ConfirmConfigCP=Xác nhận cấu hình
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Cuối cùng tự động cập nhật giao nghỉ phép
UpdateConfCPOK=Cập nhật thành công.
ErrorUpdateConfCP=Đã xảy ra lỗi trong quá trình cập nhật, vui lòng thử lại.
-AddCPforUsers=Xin vui lòng thêm số dư của ngày lễ của người sử dụng bằng <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">cách nhấn vào đây</a> .
-DelayForSubmitCP=Hạn chót nộp hồ cho ngày lễ
-AlertapprobatortorDelayCP=Ngăn chặn các approbator nếu yêu cầu kỳ nghỉ không phù hợp với thời hạn
-AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
-nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
-Module27130Name= Management of leave requests
-Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
-TitleOptionEventCP=Settings of leave requets for events
+AddCPforUsers=Xin vui lòng thêm số dư của nghỉ phép phân bổ của người sử dụng bằng <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">cách nhấn vào đây</a> .
+DelayForSubmitCP=Thời hạn để thực hiện một yêu cầu nghỉ phép
+AlertapprobatortorDelayCP=Ngăn chặn các approbator nếu yêu cầu nghỉ phép không phù hợp với thời hạn
+AlertValidatorDelayCP=Préevent các approbator nếu yêu cầu nghỉ phép quá chậm trễ
+AlertValidorSoldeCP=Ngăn chặn các approbator nếu yêu cầu nghỉ phép vượt quá sự cân bằng
+nbUserCP=Số lượng người dùng được hỗ trợ trong các mô-đun nghỉ phép
+nbHolidayDeductedCP=Số ngày nghỉ phép để được khấu trừ mỗi ngày của kỳ nghỉ thực hiện
+nbHolidayEveryMonthCP=Số ngày nghỉ phép thêm vào mỗi tháng
+Module27130Name= Quản lý các yêu cầu nghỉ
+Module27130Desc= Quản lý các yêu cầu nghỉ phép
+TitleOptionMainCP=Thiết lập chính của yêu cầu nghỉ phép
+TitleOptionEventCP=Cài đặt của requets nghỉ cho các sự kiện
ValidEventCP=Xác nhận
UpdateEventCP=Cập nhật các sự kiện
CreateEventCP=Tạo
@@ -127,23 +126,23 @@ UpdateEventOptionCP=Cập nhật
ErrorMailNotSend=Đã xảy ra lỗi trong khi gửi email:
NoCPforMonth=Không để trong tháng này.
nbJours=Số ngày
-TitleAdminCP=Configuration of Leaves
+TitleAdminCP=Cấu hình của Nghỉ phép
#Messages
Hello=Xin chào
-HolidaysToValidate=Validate leave requests
-HolidaysToValidateBody=Below is a leave request to validate
-HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
-HolidaysValidated=Validated leave requests
-HolidaysValidatedBody=Your leave request for %s to %s has been validated.
-HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled leaved request
-HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
-Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+HolidaysToValidate=Xác nhận yêu cầu nghỉ phép
+HolidaysToValidateBody=Dưới đây là một yêu cầu nghỉ việc để xác nhận
+HolidaysToValidateDelay=Yêu cầu nghỉ phép này sẽ diễn ra trong một thời gian ít hơn% s ngày.
+HolidaysToValidateAlertSolde=Người dùng đã thực hiện điều này để lại reques không có đủ ngày có sẵn.
+HolidaysValidated=Yêu cầu xác nhận nghỉ
+HolidaysValidatedBody=Yêu cầu nghỉ phép của bạn cho% s đến% s đã được xác nhận.
+HolidaysRefused=Yêu cầu bị từ chối
+HolidaysRefusedBody=Yêu cầu nghỉ phép của bạn cho% s đến% s đã bị từ chối vì lý do sau:
+HolidaysCanceled=Yêu cầu hủy bỏ nghỉ phép
+HolidaysCanceledBody=Yêu cầu nghỉ phép của bạn cho% s đến% s đã được hủy bỏ.
+Permission20000=Đọc bạn sở hữu yêu cầu nghỉ
+Permission20001=Tạo / chỉnh sửa các yêu cầu nghỉ phép của bạn
+Permission20002=Tạo / chỉnh sửa các yêu cầu nghỉ phép cho tất cả mọi người
+Permission20003=Xóa yêu cầu nghỉ phép
+Permission20004=Người sử dụng thiết lập ngày nghỉ có sẵn
+Permission20005=Log xét các yêu cầu nghỉ phép biến đổi
+Permission20006=Đọc lại báo cáo hàng tháng
diff --git a/htdocs/langs/vi_VN/install.lang b/htdocs/langs/vi_VN/install.lang
index d238f2485f23b68eec54831821f85e7cf10f2d2f..e59c45f7a1052100e0b57d3bc0fb9d3d2deadb93 100644
--- a/htdocs/langs/vi_VN/install.lang
+++ b/htdocs/langs/vi_VN/install.lang
@@ -2,34 +2,34 @@
InstallEasy=Chỉ cần làm theo các hướng dẫn từng bước.
MiscellaneousChecks=Điều kiện tiên quyết kiểm tra
DolibarrWelcome=Chào mừng bạn đến Dolibarr
-ConfFileExists=Cấu hình tập <b>tin% s</b> tồn tại.
-ConfFileDoesNotExists=Cấu hình tập <b>tin% s</b> không tồn tại!
-ConfFileDoesNotExistsAndCouldNotBeCreated=Cấu hình tập <b>tin% s</b> không tồn tại và không thể được tạo ra!
-ConfFileCouldBeCreated=Cấu hình tập <b>tin% s</b> có thể được tạo ra.
-ConfFileIsNotWritable=Tập tin cấu <b>hình% s</b> là không thể ghi. Kiểm tra quyền truy cập. Đối với lần đầu tiên cài đặt, máy chủ web của bạn phải được cấp để có thể viết vào tập tin này trong quá trình cấu hình ("chmod 666" ví dụ trên Unix như hệ điều hành).
-ConfFileIsWritable=Tập tin cấu <b>hình% s</b> có thể ghi.
+ConfFileExists=Cấu hình tập tin <b>%s</b> tồn tại.
+ConfFileDoesNotExists=Cấu hình tập tin <b>%s</b> không tồn tại!
+ConfFileDoesNotExistsAndCouldNotBeCreated=Cấu hình tập tin <b>%s</b> không tồn tại và không thể được tạo ra!
+ConfFileCouldBeCreated=Cấu hình tập tin <b>%s</b> có thể được tạo ra.
+ConfFileIsNotWritable=Tập tin cấu hình <b>%s</b> là không thể ghi. Kiểm tra quyền truy cập. Đối với lần đầu tiên cài đặt, máy chủ web của bạn phải được cấp để có thể viết vào tập tin này trong quá trình cấu hình ("chmod 666" ví dụ trên Unix như hệ điều hành).
+ConfFileIsWritable=Tập tin cấu hình <b>%s</b> có thể ghi.
ConfFileReload=Cập nhật lại thông tin từ tập tin cấu hình.
PHPSupportSessions=PHP này hỗ trợ phiên.
PHPSupportPOSTGETOk=PHP này hỗ trợ các biến POST và GET.
PHPSupportPOSTGETKo=Có thể thiết lập PHP của bạn không hỗ trợ các biến POST và / hoặc GET. Kiểm tra <b>variables_order</b> tham số của bạn trong php.ini.
PHPSupportGD=Điều này hỗ trợ PHP GD chức năng đồ họa.
PHPSupportUTF8=PHP hỗ trợ chức năng này UTF8.
-PHPMemoryOK=PHP bộ nhớ phiên tối đa của bạn được thiết lập <b>để% s.</b> Điều này là đủ.
-PHPMemoryTooLow=PHP bộ nhớ phiên tối đa của bạn được thiết lập <b>để% s</b> byte. Điều này cần được quá thấp. Thay đổi <b>php.ini</b> của bạn để thiết lập thông số <b>memory_limit</b> ít <b>nhất% s</b> byte.
+PHPMemoryOK=PHP bộ nhớ phiên tối đa của bạn được thiết lập <b>%s</b>. Điều này là đủ.
+PHPMemoryTooLow=PHP bộ nhớ phiên tối đa của bạn được thiết lập <b>%s</b> byte. Điều này cần được quá thấp. Thay đổi <b>php.ini</b> của bạn để thiết lập thông số <b>memory_limit</b> ít nhất <b>%s</b> byte.
Recheck=Nhấn vào đây để kiểm tra significative hơn
ErrorPHPDoesNotSupportSessions=Cài đặt PHP của bạn không hỗ trợ phiên. Tính năng này là cần thiết để làm cho Dolibarr làm việc. Kiểm tra thiết lập PHP của bạn.
ErrorPHPDoesNotSupportGD=Cài đặt PHP của bạn không hỗ trợ chức năng đồ họa GD. Không có đồ thị sẽ có sẵn.
ErrorPHPDoesNotSupportUTF8=Cài đặt PHP của bạn không hỗ trợ chức năng UTF8. Dolibarr không thể làm việc một cách chính xác. Giải quyết này trước khi cài đặt Dolibarr.
-ErrorDirDoesNotExists=Thư mục% s không tồn tại.
+ErrorDirDoesNotExists=Thư mục %s không tồn tại.
ErrorGoBackAndCorrectParameters=Tới lạc hậu và chính xác các thông số sai.
-ErrorWrongValueForParameter=Bạn có thể gõ một giá trị sai cho tham số '% s'.
-ErrorFailedToCreateDatabase=Không thể tạo cơ sở dữ liệu '% s'.
-ErrorFailedToConnectToDatabase=Không thể kết nối với cơ sở dữ liệu '% s'.
-ErrorDatabaseVersionTooLow=Phiên bản cơ sở dữ liệu (% s) quá già. Phiên bản% s hoặc cao hơn là cần thiết.
-ErrorPHPVersionTooLow=PHP phiên bản quá cũ. Phiên bản% s là bắt buộc.
-WarningPHPVersionTooLow=PHP phiên bản quá cũ. Phiên bản% s hoặc nhiều hơn dự kiến. Phiên bản này sẽ cho phép cài đặt nhưng không được hỗ trợ.
-ErrorConnectedButDatabaseNotFound=Kết nối với máy chủ thành công nhưng không tìm thấy cơ sở dữ liệu '% s'.
-ErrorDatabaseAlreadyExists=Cơ sở dữ liệu '% s' đã tồn tại.
+ErrorWrongValueForParameter=Bạn có thể gõ một giá trị sai cho tham số '%s'.
+ErrorFailedToCreateDatabase=Không thể tạo cơ sở dữ liệu '%s'.
+ErrorFailedToConnectToDatabase=Không thể kết nối với cơ sở dữ liệu '%s'.
+ErrorDatabaseVersionTooLow=Phiên bản cơ sở dữ liệu (%s) quá già. Phiên bản %s hoặc cao hơn là cần thiết.
+ErrorPHPVersionTooLow=PHP phiên bản quá cũ. Phiên bản %s là bắt buộc.
+WarningPHPVersionTooLow=PHP phiên bản quá cũ. Phiên bản %s hoặc nhiều hơn dự kiến. Phiên bản này sẽ cho phép cài đặt nhưng không được hỗ trợ.
+ErrorConnectedButDatabaseNotFound=Kết nối với máy chủ thành công nhưng không tìm thấy cơ sở dữ liệu '%s'.
+ErrorDatabaseAlreadyExists=Cơ sở dữ liệu '%s' đã tồn tại.
IfDatabaseNotExistsGoBackAndUncheckCreate=Nếu cơ sở dữ liệu không tồn tại, quay trở lại và kiểm tra tùy chọn "Tạo cơ sở dữ liệu".
IfDatabaseExistsGoBackAndCheckCreate=Nếu cơ sở dữ liệu đã tồn tại, quay trở lại và bỏ chọn "Tạo cơ sở dữ liệu" tùy chọn.
WarningBrowserTooOld=Quá phiên bản cũ của trình duyệt. Nâng cấp trình duyệt của bạn đến một phiên bản mới của trình duyệt Firefox, Chrome hay Opera là rất recommanded.
@@ -75,8 +75,8 @@ UserCreation=Người dùng tạo ra
CreateDatabaseObjects=Cơ sở dữ liệu đối tượng sáng tạo
ReferenceDataLoading=Tài liệu tham khảo dữ liệu tải
TablesAndPrimaryKeysCreation=Bàn phím chính tạo
-CreateTableAndPrimaryKey=Tạo bảng% s
-CreateOtherKeysForTable=Tạo các phím nước ngoài và các chỉ số cho bảng% s
+CreateTableAndPrimaryKey=Tạo bảng %s
+CreateOtherKeysForTable=Tạo các phím nước ngoài và các chỉ số cho bảng %s
OtherKeysCreation=Phím và chỉ số nước ngoài tạo
FunctionsCreation=Chức năng sáng tạo
AdminAccountCreation=Tạo đăng nhập quản trị
@@ -87,7 +87,7 @@ SetupEnd=Kết thúc cài đặt
SystemIsInstalled=Cài đặt này hoàn tất.
SystemIsUpgraded=Dolibarr đã được nâng cấp thành công.
YouNeedToPersonalizeSetup=Bạn cần phải cấu hình cho phù hợp với nhu cầu Dolibarr của bạn (ngoại hình, tính năng, ...). Để làm điều này, hãy làm theo các liên kết dưới đây:
-AdminLoginCreatedSuccessfuly=Dolibarr quản trị viên đăng nhập <b>'% s'</b> tạo ra successfuly.
+AdminLoginCreatedSuccessfuly=Dolibarr quản trị viên đăng nhập '<b>%s</b>' tạo ra successfuly.
GoToDolibarr=Tới Dolibarr
GoToSetupArea=Tới Dolibarr (setup)
MigrationNotFinished=Phiên bản cơ sở dữ liệu của bạn không phải là hoàn toàn cập nhật, vì vậy bạn sẽ phải chạy quá trình nâng cấp một lần nữa.
@@ -97,7 +97,7 @@ WithNoSlashAtTheEnd=Nếu không có các dấu gạch chéo "/" ở cuối
DirectoryRecommendation=Nó được recommanded sử dụng một thư mục bên ngoài thư mục của bạn của trang web của bạn.
LoginAlreadyExists=Đã tồn tại
DolibarrAdminLogin=Dolibarr quản trị đăng nhập
-AdminLoginAlreadyExists=Dolibarr tài khoản quản trị <b>'% s'</b> đã tồn tại. Quay trở lại, nếu bạn muốn tạo một số khác.
+AdminLoginAlreadyExists=Dolibarr tài khoản quản trị '<b>%s</b>' đã tồn tại. Quay trở lại, nếu bạn muốn tạo một số khác.
WarningRemoveInstallDir=Cảnh báo, vì lý do bảo mật, một khi cài đặt hoặc nâng cấp hoàn thành, để tránh sử dụng các công cụ cài đặt một lần nữa, bạn nên thêm một tập tin gọi là <b>install.lock</b> vào thư mục tài liệu Dolibarr, để tránh việc sử dụng độc hại của nó.
ThisPHPDoesNotSupportTypeBase=Hệ thống PHP này không hỗ trợ bất kỳ giao diện để truy cập cơ sở dữ liệu loại% s
FunctionNotAvailableInThisPHP=Không có sẵn trên PHP này
@@ -127,8 +127,8 @@ DBSortingCollation=Nhân vật thứ tự sắp xếp
DBSortingCollationComment=Chọn mã trang xác định thứ tự sắp xếp của nhân vật được sử dụng bởi cơ sở dữ liệu. Thông số này cũng được gọi là "đối chiếu" của một số cơ sở dữ liệu. <br/> Thông số này không thể xác định nếu cơ sở dữ liệu đã tồn tại.
CharacterSetDatabase=Ký tự đặt cho cơ sở dữ liệu
CharacterSetDatabaseComment=Chọn bộ ký tự muốn để tạo cơ sở dữ liệu. <br/> Thông số này không thể xác định nếu cơ sở dữ liệu đã tồn tại.
-YouAskDatabaseCreationSoDolibarrNeedToConnect=Bạn hỏi để tạo ra cơ sở dữ <b>liệu% s,</b> nhưng cho điều này, Dolibarr cần kết nối với máy <b>chủ% s</b> với các điều khoản sử dụng <b>siêu% s.</b>
-YouAskLoginCreationSoDolibarrNeedToConnect=Bạn hỏi để tạo ra cơ sở dữ liệu đăng <b>nhập% s,</b> nhưng cho điều này, Dolibarr cần kết nối với máy <b>chủ% s</b> với các điều khoản sử dụng <b>siêu% s.</b>
+YouAskDatabaseCreationSoDolibarrNeedToConnect=Bạn hỏi để tạo ra cơ sở dữ liệu <b>%s</b>, nhưng cho điều này, Dolibarr cần kết nối với máy chủ <b>%s</b> với quyền super user <b>%s</b>.
+YouAskLoginCreationSoDolibarrNeedToConnect=Bạn hỏi để tạo ra cơ sở dữ liệu đăng nhập <b>%s</b>,</b> nhưng cho điều này, Dolibarr cần kết nối với máy chủ <b>%s</b> với quyền super user <b>%s</b>.
BecauseConnectionFailedParametersMayBeWrong=Khi kết nối thành công, máy chủ hoặc người sử dụng siêu thông số phải là sai.
OrphelinsPaymentsDetectedByMethod=Trẻ em mồ côi thanh toán được phát hiện bằng phương pháp% s
RemoveItManuallyAndPressF5ToContinue=Loại bỏ nó bằng tay và bấm F5 để tiếp tục.
@@ -138,11 +138,11 @@ KeepDefaultValuesMamp=Bạn sử dụng các hướng dẫn cài đặt Dolibarr
KeepDefaultValuesProxmox=Bạn sử dụng các hướng dẫn cài đặt Dolibarr từ một thiết bị ảo Proxmox, vì vậy giá trị đề xuất ở đây đã được tối ưu hóa. Thay đổi chúng chỉ khi bạn biết những gì bạn làm.
FieldRenamed=Dòng đổi tên
IfLoginDoesNotExistsCheckCreateUser=Nếu đăng nhập không tồn tại được nêu ra, bạn phải kiểm tra tùy chọn "Tạo người dùng"
-ErrorConnection=Server <b>"% s",</b> tên cơ sở dữ liệu <b>"% s",</b> đăng nhập <b>"% s",</b> hoặc mật khẩu cơ sở dữ liệu có thể sai hoặc phiên bản client PHP có thể là quá cũ so với phiên bản cơ sở dữ liệu.
-InstallChoiceRecommanded=Đề nghị lựa chọn để cài đặt phiên <b>bản% s</b> từ phiên bản hiện tại của <b>bạn% s</b>
+ErrorConnection=Server "<b>%s</b>" tên cơ sở dữ liệu "<b>%s</b>" đăng nhập "<b>%s</b>" hoặc mật khẩu cơ sở dữ liệu có thể sai hoặc phiên bản client PHP có thể là quá cũ so với phiên bản cơ sở dữ liệu.
+InstallChoiceRecommanded=Đề nghị lựa chọn để cài đặt phiên bản <b>%s</b> từ phiên bản hiện tại của bạn <b>%s</b>
InstallChoiceSuggested=<b>Cài đặt lựa chọn được đề xuất bởi trình cài đặt.</b>
-MigrateIsDoneStepByStep=Phiên bản mục tiêu (% s) có một khoảng cách của một số phiên bản, vì vậy cài đặt chương trình sẽ trở lại với đề nghị di chuyển tiếp theo lần này sẽ được hoàn thành.
-CheckThatDatabasenameIsCorrect=Kiểm tra xem tên <b>"% s"</b> cơ sở dữ liệu là chính xác.
+MigrateIsDoneStepByStep=Phiên bản mục tiêu (%s) có một khoảng cách của một số phiên bản, vì vậy cài đặt chương trình sẽ trở lại với đề nghị di chuyển tiếp theo lần này sẽ được hoàn thành.
+CheckThatDatabasenameIsCorrect=Kiểm tra xem tên "<b>%s</b>" cơ sở dữ liệu là chính xác.
IfAlreadyExistsCheckOption=Nếu tên này là chính xác và cơ sở dữ liệu chưa tồn tại, bạn phải kiểm tra tùy chọn "Tạo cơ sở dữ liệu".
OpenBaseDir=PHP openbasedir tham số
YouAskToCreateDatabaseSoRootRequired=Bạn đã chọn hộp "Tạo cơ sở dữ liệu". Đối với điều này, bạn cần cung cấp tên đăng nhập / mật khẩu của siêu người dùng (dưới cùng của mẫu).
@@ -153,7 +153,7 @@ MigrationShippingDelivery=Nâng cấp lưu trữ vận chuyển
MigrationShippingDelivery2=Nâng cấp lưu trữ vận chuyển 2
MigrationFinished=Di cư đã hoàn thành
LastStepDesc=<strong>Bước cuối cùng:</strong> Xác định đây đăng nhập và mật khẩu bạn có kế hoạch sử dụng để kết nối với phần mềm. Đừng mất này vì nó là tài khoản để quản lý tất cả những người khác.
-ActivateModule=Kích hoạt module% s
+ActivateModule=Kích hoạt module %s
ShowEditTechnicalParameters=Click vào đây để hiển thị các thông số tiên tiến / chỉnh sửa (chế độ chuyên môn)
#########
@@ -166,15 +166,15 @@ MigrationInvoice=Di chuyển dữ liệu cho hóa đơn của khách hàng
MigrationContract=Di chuyển dữ liệu cho các hợp đồng
MigrationSuccessfullUpdate=Nâng cấp thành công
MigrationUpdateFailed=Quá trình nâng cấp thất bại
-MigrationRelationshipTables=Di chuyển dữ liệu cho các bảng mối quan hệ (% s)
+MigrationRelationshipTables=Di chuyển dữ liệu cho các bảng mối quan hệ (%s)
MigrationPaymentsUpdate=Chỉnh sửa dữ liệu thanh toán
-MigrationPaymentsNumberToUpdate=Thanh toán% s (s) để cập nhật
-MigrationProcessPaymentUpdate=Thanh toán Cập nhật (s)% s
+MigrationPaymentsNumberToUpdate=Thanh toán %s (các) để cập nhật
+MigrationProcessPaymentUpdate=Thanh toán Cập nhật (các) %s
MigrationPaymentsNothingToUpdate=Không có những thứ nhiều hơn để làm
MigrationPaymentsNothingUpdatable=Không thanh toán có thể được sửa chữa
MigrationContractsUpdate=Hợp đồng sửa chữa dữ liệu
-MigrationContractsNumberToUpdate=Hợp đồng% s (s) để cập nhật
-MigrationContractsLineCreation=Tạo dòng hợp đồng cho hợp đồng ref% s
+MigrationContractsNumberToUpdate=Hợp đồng %s (các) để cập nhật
+MigrationContractsLineCreation=Tạo dòng hợp đồng cho hợp đồng ref %s
MigrationContractsNothingToUpdate=Không có những thứ nhiều hơn để làm
MigrationContractsFieldDontExist=Dòng fk_facture không tồn tại nữa. Không có gì để làm.
MigrationContractsEmptyDatesUpdate=Hợp đồng sửa chữa ngày rỗng
@@ -182,15 +182,15 @@ MigrationContractsEmptyDatesUpdateSuccess=Hợp đồng sửa chữa ngày emtpy
MigrationContractsEmptyDatesNothingToUpdate=Không có hợp đồng ngày trống để sửa chữa
MigrationContractsEmptyCreationDatesNothingToUpdate=Không có ngày tạo lập hợp đồng để sửa chữa
MigrationContractsInvalidDatesUpdate=Điều chỉnh hợp đồng ngày giá trị xấu
-MigrationContractsInvalidDateFix=Đúng hợp đồng% s (ngày hợp đồng =% s, Bắt đầu từ ngày dịch vụ này min =% s)
-MigrationContractsInvalidDatesNumber=Hợp đồng sửa đổi% s
+MigrationContractsInvalidDateFix=Đúng hợp đồng %s (ngày hợp đồng =%s, Bắt đầu từ ngày dịch vụ này min =%s)
+MigrationContractsInvalidDatesNumber=Hợp đồng sửa đổi %s
MigrationContractsInvalidDatesNothingToUpdate=Không có ngày có giá trị xấu để sửa chữa
MigrationContractsIncoherentCreationDateUpdate=Giá trị Bad chỉnh ngày tạo lập hợp đồng
MigrationContractsIncoherentCreationDateUpdateSuccess=Giá trị Bad chỉnh ngày tạo lập hợp đồng thực hiện succesfuly
MigrationContractsIncoherentCreationDateNothingToUpdate=Không có giá trị tốt cho ngày tạo lập hợp đồng để sửa chữa
MigrationReopeningContracts=Mở hợp đồng đóng cửa do lỗi
-MigrationReopenThisContract=Mở lại hợp đồng% s
-MigrationReopenedContractsNumber=Hợp đồng sửa đổi% s
+MigrationReopenThisContract=Mở lại hợp đồng %s
+MigrationReopenedContractsNumber=Hợp đồng sửa đổi %s
MigrationReopeningContractsNothingToUpdate=Không có hợp đồng đóng mở
MigrationBankTransfertsUpdate=Cập nhật liên kết giữa các giao dịch ngân hàng và chuyển khoản ngân hàng
MigrationBankTransfertsNothingToUpdate=Tất cả các liên kết được cập nhật
diff --git a/htdocs/langs/vi_VN/interventions.lang b/htdocs/langs/vi_VN/interventions.lang
index 7e905bcf958a6dd27eb906f147611e91deb5136e..ca16bedea78495aad37940aca8f879d4d26bbaf1 100644
--- a/htdocs/langs/vi_VN/interventions.lang
+++ b/htdocs/langs/vi_VN/interventions.lang
@@ -3,7 +3,7 @@ Intervention=Can thiệp
Interventions=Các can thiệp
InterventionCard=Thẻ can thiệp
NewIntervention=Can thiệp mới
-AddIntervention=Thêm can thiệp
+AddIntervention=Create intervention
ListOfInterventions=Danh sách can thiệp
EditIntervention=Sửa can thiệp
ActionsOnFicheInter=Hành động can thiệp vào
@@ -30,6 +30,15 @@ StatusInterInvoiced=Hóa đơn
RelatedInterventions=Can thiệp liên quan
ShowIntervention=Hiện can thiệp
SendInterventionRef=Nộp can thiệp% s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Đại diện theo dõi can thiệp
TypeContact_fichinter_internal_INTERVENING=Can thiệp
diff --git a/htdocs/langs/vi_VN/mails.lang b/htdocs/langs/vi_VN/mails.lang
index 1183ab808545e418674b9856d2a432f59fadea17..89dd796dbf0253103abe5515c011ce967083b6fe 100644
--- a/htdocs/langs/vi_VN/mails.lang
+++ b/htdocs/langs/vi_VN/mails.lang
@@ -71,19 +71,19 @@ CloneContent=Nhắn Clone
CloneReceivers=Người nhận Cloner
DateLastSend=Ngày cuối cùng gửi
DateSending=Ngày gửi
-SentTo=Gửi <b>đến% s</b>
+SentTo=Gửi đến <b>%s</b>
MailingStatusRead=Đọc
CheckRead=Đọc nhận
-YourMailUnsubcribeOK=<b>Email% s</b> là đúng unsubcribe từ danh sách gửi thư
+YourMailUnsubcribeOK=Email <b>%s</b> là đúng unsubcribe từ danh sách gửi thư
MailtoEMail=Siêu liên kết email
ActivateCheckRead=Cho phép sử dụng "Unsubcribe" liên kết
ActivateCheckReadKey=Sử dụng chìa khóa để sử dụng mã hóa URL cho "Đọc Tiếp nhận" và "Unsubcribe" tính năng
-EMailSentToNRecipients=Thư điện tử gửi đến người nhận% s.
-XTargetsAdded=Người <b>nhận% s</b> thêm vào danh sách mục tiêu
+EMailSentToNRecipients=Thư điện tử gửi đến người nhận %s.
+XTargetsAdded=Người nhận <b>%s</b> thêm vào danh sách mục tiêu
EachInvoiceWillBeAttachedToEmail=Một tài liệu mặc định sử dụng hóa đơn mẫu tài liệu sẽ được tạo ra và gắn liền với mỗi email.
-MailTopicSendRemindUnpaidInvoices=Nhắc nhở các hóa đơn% s (% s)
+MailTopicSendRemindUnpaidInvoices=Nhắc nhở các hóa đơn %s (%s)
SendRemind=Gửi lời nhắc nhở bằng email
-RemindSent=Nhắc nhở% s (s) gửi
+RemindSent=Nhắc nhở %s (các) gửi
AllRecipientSelectedForRemind=Tất cả thirdparties chọn, và nếu một email được thiết lập (lưu ý rằng một email cho mỗi hóa đơn sẽ được gửi)
NoRemindSent=Không có lời nhắc nhở gửi thư điện tử
ResultOfMassSending=Kết quả của khối lượng thư điện tử gửi nhắc nhở
@@ -100,11 +100,11 @@ MailingModuleDescContactsByCompanyCategory=Liên hệ / địa chỉ của các
MailingModuleDescContactsByCategory=Liên hệ / địa chỉ của các bên thứ ba theo thể loại
MailingModuleDescMembersCategories=Thành viên sáng lập (theo loại)
MailingModuleDescContactsByFunction=Liên hệ / địa chỉ của các bên thứ ba (bởi vị trí / chức năng)
-LineInFile=Dòng% s trong tập tin
+LineInFile=Dòng %s trong tập tin
RecipientSelectionModules=Yêu cầu xác định cho lựa chọn của người nhận
MailSelectedRecipients=Người nhận lựa chọn
MailingArea=Khu vực EMailings
-LastMailings=Cuối% s emailings
+LastMailings=Cuối %s emailings
TargetsStatistics=Mục tiêu thống kê
NbOfCompaniesContacts=Địa chỉ liên lạc duy nhất / địa chỉ
MailNoChangePossible=Người nhận các thư điện tử xác nhận không thể thay đổi
@@ -115,7 +115,7 @@ SentBy=Gửi
MailingNeedCommand=Vì lý do an ninh, gửi các thư điện tử là tốt hơn khi thực hiện từ dòng lệnh. Nếu bạn có một, yêu cầu quản trị máy chủ của bạn để khởi động các lệnh sau đây để gửi các thư điện tử cho tất cả người nhận:
MailingNeedCommand2=Tuy nhiên bạn có thể gửi trực tuyến bằng cách thêm tham số MAILING_LIMIT_SENDBYWEB với giá trị của số lượng tối đa của các email mà bạn muốn gửi bởi phiên. Đối với điều này, hãy vào Trang chủ - Cài đặt - Loại khác.
ConfirmSendingEmailing=Nếu bạn không thể hoặc muốn gởi kèm với trình duyệt www của bạn, vui lòng xác nhận bạn có chắc bạn muốn gửi email tại từ trình duyệt của bạn?
-LimitSendingEmailing=Lưu ý: Trên dòng gửi emailings được giới hạn vì lý do an ninh và thời gian chờ đến người <b>nhận% s</b> bằng cách gửi phiên.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=Xóa danh sách
ToClearAllRecipientsClickHere=Click vào đây để xóa danh sách người nhận các thư điện tử này
ToAddRecipientsChooseHere=Thêm người nhận bằng cách chọn từ danh sách
@@ -132,7 +132,10 @@ TagMailtoEmail=Người nhận thư điện tử
Notifications=Thông báo
NoNotificationsWillBeSent=Không có thông báo email được lên kế hoạch cho sự kiện này và công ty
ANotificationsWillBeSent=1 thông báo sẽ được gửi qua email
-SomeNotificationsWillBeSent=Thông báo% s sẽ được gửi qua email
-AddNewNotification=Kích hoạt một yêu cầu thông báo email mới
-ListOfActiveNotifications=Liệt kê tất cả các yêu cầu hoạt động thông báo qua email
+SomeNotificationsWillBeSent=Thông báo %s sẽ được gửi qua email
+AddNewNotification=Kích hoạt một mục tiêu thông báo email mới
+ListOfActiveNotifications=Liệt kê tất cả các mục tiêu email thông báo hoạt động
ListOfNotificationsDone=Liệt kê tất cả các thông báo email gửi
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang
index aa14bfa53ee6966be17eeefaaa5799c3ea7c969f..e4f8cd666221b76652f8a277992922f785a74c87 100644
--- a/htdocs/langs/vi_VN/main.lang
+++ b/htdocs/langs/vi_VN/main.lang
@@ -7,7 +7,7 @@ DIRECTION=ltr
FONTFORPDF=Helvetica
FONTSIZEFORPDF=10
SeparatorDecimal=.
-SeparatorThousand=None
+SeparatorThousand=,
FormatDateShort=%m/%d/%Y
FormatDateShortInput=%m/%d/%Y
FormatDateShortJava=MM/dd/yyyy
@@ -27,19 +27,19 @@ NoTranslation=Không có bản dịch
NoRecordFound=Không có hồ sơ tìm thấy
NoError=Không có lỗi
Error=Lỗi
-ErrorFieldRequired=Dòng '% s' được yêu cầu
-ErrorFieldFormat=Dòng '% s' có một giá trị xấu
-ErrorFileDoesNotExists=Tập tin% s không tồn tại
-ErrorFailedToOpenFile=Không thể mở tập tin% s
-ErrorCanNotCreateDir=Không thể tạo thư mục% s
-ErrorCanNotReadDir=Không thể đọc thư mục% s
+ErrorFieldRequired=Dòng '%s' được yêu cầu
+ErrorFieldFormat=Dòng '%s' có một giá trị xấu
+ErrorFileDoesNotExists=Tập tin %s không tồn tại
+ErrorFailedToOpenFile=Không thể mở tập tin %s
+ErrorCanNotCreateDir=Không thể tạo thư mục %s
+ErrorCanNotReadDir=Không thể đọc thư mục %s
ErrorConstantNotDefined=Thông số% s chưa được xác định
ErrorUnknown=Lỗi không xác định
ErrorSQL=Lỗi SQL
ErrorLogoFileNotFound=Logo tập tin '% s' không được tìm thấy
ErrorGoToGlobalSetup=Đi đến 'Công ty / cơ sở "thiết lập để sửa lỗi này
ErrorGoToModuleSetup=Tới Học phần thiết lập để sửa lỗi này
-ErrorFailedToSendMail=Không thể gửi thư (người gửi =% s, thu =% s)
+ErrorFailedToSendMail=Không thể gửi thư (người gửi =%s, thu =%s)
ErrorAttachedFilesDisabled=Tập tin đính bị vô hiệu hóa trên máy chủ này
ErrorFileNotUploaded=Tập tin không được tải lên. Kiểm tra kích thước không vượt quá tối đa cho phép, không gian miễn phí có sẵn trên đĩa và không có đã là một tập tin có cùng tên trong thư mục này.
ErrorInternalErrorDetected=Lỗi được phát hiện
@@ -48,22 +48,22 @@ ErrorWrongHostParameter=Tham số máy chủ sai
ErrorYourCountryIsNotDefined=Đất nước các bạn không được xác định. Đi đến Trang chủ-Setup-Chỉnh sửa và đăng lại hình thức.
ErrorRecordIsUsedByChild=Không thể xóa hồ sơ này. Kỷ lục này được sử dụng bởi ít nhất một hồ sơ trẻ em.
ErrorWrongValue=Giá trị sai
-ErrorWrongValueForParameterX=Giá trị sai cho tham số% s
+ErrorWrongValueForParameterX=Giá trị sai cho tham số %s
ErrorNoRequestInError=Không yêu cầu trong báo lỗi
ErrorServiceUnavailableTryLater=Dịch vụ không sẵn sàng cho thời điểm này. Hãy thử lại sau.
ErrorDuplicateField=Giá trị nhân bản trong một lĩnh vực duy nhất
ErrorSomeErrorWereFoundRollbackIsDone=Một số lỗi đã được tìm thấy. Chúng tôi rollback thay đổi.
-ErrorConfigParameterNotDefined=Thông <b>số% s</b> không được định nghĩa trong tập tin cấu hình Dolibarr <b>conf.php.</b>
-ErrorCantLoadUserFromDolibarrDatabase=Không thể tìm thấy người <b>dùng% s</b> trong cơ sở dữ liệu Dolibarr.
-ErrorNoVATRateDefinedForSellerCountry=Lỗi, không có giá vat xác định cho đất nước '% s'.
-ErrorNoSocialContributionForSellerCountry=Lỗi, không có loại đóng góp xã hội được xác định cho đất nước '% s'.
+ErrorConfigParameterNotDefined=Thông số <b>%s</b> không được định nghĩa trong tập tin cấu hình Dolibarr <b>conf.php</b>.
+ErrorCantLoadUserFromDolibarrDatabase=Không thể tìm thấy người dùng <b>%s</b> trong cơ sở dữ liệu Dolibarr.
+ErrorNoVATRateDefinedForSellerCountry=Lỗi, không có giá vat xác định cho đất nước '%s'.
+ErrorNoSocialContributionForSellerCountry=Lỗi, không có loại đóng góp xã hội được xác định cho đất nước '%s'.
ErrorFailedToSaveFile=Lỗi, không lưu tập tin.
-ErrorOnlyPngJpgSupported=Lỗi, chỉ Png và .jpg tập tin định dạng hình ảnh được hỗ trợ.
-ErrorImageFormatNotSupported=PHP của bạn không hỗ trợ chức năng để chuyển đổi hình ảnh của định dạng này.
SetDate=Thiết lập ngày
SelectDate=Chọn một ngày
-SeeAlso=Xem thêm% s
+SeeAlso=Xem thêm %s
BackgroundColorByDefault=Màu mặc định nền
+FileNotUploaded=Các tập tin không được tải lên
+FileUploaded=Các tập tin được tải lên thành công
FileWasNotUploaded=Một tập tin được lựa chọn để đính kèm nhưng vẫn chưa được tải lên. Bấm vào nút "Đính kèm tập tin" cho việc này.
NbOfEntries=Nb các mục
GoToWikiHelpPage=Đọc trợ giúp trực tuyến (cần truy cập Internet)
@@ -74,7 +74,7 @@ LevelOfFeature=Mức độ tính năng
NotDefined=Không xác định
DefinedAndHasThisValue=Xác định và giá trị
IsNotDefined=không xác định
-DolibarrInHttpAuthenticationSoPasswordUseless=Chế độ xác thực Dolibarr được thiết lập <b>để% s</b> trong tập tin cấu hình <b>conf.php.</b> <br> Điều này có nghĩa rằng cơ sở dữ liệu mật khẩu là ở ngoài để Dolibarr, vì vậy thay đổi lĩnh vực này có thể không có tác dụng.
+DolibarrInHttpAuthenticationSoPasswordUseless=Chế độ xác thực Dolibarr được thiết lập để <b>%s</b> trong tập tin cấu hình <b>conf.php</b>.<br> Điều này có nghĩa rằng cơ sở dữ liệu mật khẩu là ở ngoài để Dolibarr, vì vậy thay đổi lĩnh vực này có thể không có tác dụng.
Administrator=Quản trị viên
Undefined=Không xác định
PasswordForgotten=Mật khẩu đã quên?
@@ -97,7 +97,7 @@ MoreInformation=Thông tin chi tiết
TechnicalInformation=Thông tin kỹ thuật
NotePublic=Lưu ý (công cộng)
NotePrivate=Lưu ý (tư nhân)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr đã được thiết lập để hạn chế độ chính xác của các đơn giá <b>cho% s</b> thập phân.
+PrecisionUnitIsLimitedToXDecimals=Dolibarr đã được thiết lập để hạn chế độ chính xác của các đơn giá cho <b>%s</b> thập phân.
DoTest=Kiểm tra
ToFilter=Lọc
WarningYouHaveAtLeastOneTaskLate=Cảnh báo, bạn có ít nhất một yếu tố đó đã vượt quá sự chậm trễ khoan dung.
@@ -131,7 +131,7 @@ AddActionDone=Thêm sự kiện thực hiện
Close=Đóng
Close2=Đóng
Confirm=Xác nhận
-ConfirmSendCardByMail=Bạn có thực sự muốn gửi nội dung của thẻ này qua đường bưu điện <b>đến% s?</b>
+ConfirmSendCardByMail=Bạn có thực sự muốn gửi nội dung của thẻ này qua đường bưu điện đến <b>%s</b> ?
Delete=Xóa
Remove=Hủy bỏ
Resiliate=Resiliate
@@ -206,7 +206,7 @@ Limit=Giới hạn
Limits=Giới hạn
DevelopmentTeam=Nhóm phát triển
Logout=Đăng xuất
-NoLogoutProcessWithAuthMode=Không có tính năng ngắt kết nối applicative với chế độ xác <b>thực% s</b>
+NoLogoutProcessWithAuthMode=Không có tính năng ngắt kết nối applicative với chế độ xác thực <b>%s</b>
Connection=Kết nối
Setup=Thiết lập
Alert=Báo
@@ -266,6 +266,7 @@ Afternoon=Chiều
Quadri=Quadri
MonthOfDay=Tháng ngày
HourShort=H
+MinuteShort=mn
Rate=Tỷ giá
UseLocalTax=Bao gồm thuế
Bytes=Bytes
@@ -340,6 +341,7 @@ FullList=Danh mục đầy đủ
Statistics=Thống kê
OtherStatistics=Số liệu thống kê khác
Status=Tình trạng
+Favorite=Yêu thích
ShortInfo=Thông tin.
Ref=Tài liệu tham khảo.
RefSupplier=Tài liệu tham khảo. nhà cung cấp
@@ -365,6 +367,7 @@ ActionsOnCompany=Sự kiện về bên thứ ba này
ActionsOnMember=Sự kiện về thành viên này
NActions=Sự kiện% s
NActionsLate=% S cuối
+RequestAlreadyDone=Request already recorded
Filter=Lọc
RemoveFilter=Bỏ bộ lọc
ChartGenerated=Biểu đồ được tạo ra
@@ -498,7 +501,7 @@ File=Tập tin
Files=Tập tin
NotAllowed=Không được phép
ReadPermissionNotAllowed=Cho phép đọc không được phép
-AmountInCurrency=Số tiền tệ trong% s
+AmountInCurrency=Số tiền tệ trong %s
Example=Ví dụ
Examples=Ví dụ
NoExample=Không có ví dụ
@@ -510,7 +513,7 @@ NbOfObjects=Số đối tượng
NbOfReferers=Số referrers
Referers=Đề cập đối tượng
TotalQuantity=Tổng số lượng
-DateFromTo=Từ% s đến% s
+DateFromTo=Từ %s đến %s
DateFrom=Từ% s
DateUntil=Cho đến% s
Check=Kiểm tra
@@ -562,11 +565,11 @@ GoBack=Quay trở lại
CanBeModifiedIfOk=Có thể được sửa đổi nếu hợp lệ
CanBeModifiedIfKo=Có thể được sửa đổi nếu không hợp lệ
RecordModifiedSuccessfully=Ghi lại đổi thành công
-RecordsModified=Hồ sơ% s sửa đổi
+RecordsModified=Hồ sơ %s sửa đổi
AutomaticCode=Mã tự động
NotManaged=Không quản lý
FeatureDisabled=Tính năng bị vô hiệu hóa
-MoveBox=Di chuyển hộp% s
+MoveBox=Di chuyển hộp %s
Offered=Cung cấp
NotEnoughPermissions=Bạn không có quyền cho hành động này
SessionName=Tên phiên
@@ -581,7 +584,7 @@ Canceled=Hủy bỏ
YouCanChangeValuesForThisListFromDictionarySetup=Bạn có thể thay đổi giá trị cho danh sách này từ trình đơn thiết lập - từ điển
Color=Màu
Documents=Tập tin liên kết
-DocumentsNb=Các tập tin liên kết (% s)
+DocumentsNb=Các tập tin liên kết (%s)
Documents2=Tài liệu
BuildDocuments=Các tài liệu được tạo ra
UploadDisabled=Tải khuyết tật
@@ -589,7 +592,7 @@ MenuECM=Tài liệu
MenuAWStats=AWStats
MenuMembers=Thành viên
MenuAgendaGoogle=Chương trình nghị sự của Google
-ThisLimitIsDefinedInSetup=Hạn Dolibarr (Menu nhà thiết lập bảo mật):% s Kb, PHP giới hạn:% s Kb
+ThisLimitIsDefinedInSetup=Hạn Dolibarr (Menu nhà thiết lập bảo mật): %s Kb, PHP giới hạn: %s Kb
NoFileFound=Không có tài liệu được lưu trong thư mục này
CurrentUserLanguage=Ngôn ngữ hiện tại
CurrentTheme=Chủ đề hiện tại
@@ -615,12 +618,12 @@ Merge=Hợp nhất
PrintContentArea=Hiển thị trang in khu vực nội dung chính
MenuManager=Quản lý đơn
NoMenu=Không có trình đơn phụ
-WarningYouAreInMaintenanceMode=Cảnh báo, bạn đang ở trong một chế độ bảo trì, vì vậy chỉ đăng <b>nhập% s</b> được phép sử dụng ứng dụng tại thời điểm này.
+WarningYouAreInMaintenanceMode=Cảnh báo, bạn đang ở trong một chế độ bảo trì, vì vậy chỉ đăng nhập <b>%s</b> được phép sử dụng ứng dụng tại thời điểm này.
CoreErrorTitle=Lỗi hệ thống
CoreErrorMessage=Xin lỗi, đã xảy ra lỗi. Kiểm tra các bản ghi hoặc liên hệ với quản trị hệ thống của bạn.
CreditCard=Thẻ tín dụng
-FieldsWithAreMandatory=Các lĩnh vực <b>với% s</b> là bắt buộc
-FieldsWithIsForPublic=Các lĩnh vực <b>với% s</b> được hiển thị trên danh sách công khai của các thành viên. Nếu bạn không muốn điều này, đánh dấu vào hộp "công cộng".
+FieldsWithAreMandatory=Các lĩnh vực với <b>%s</b> là bắt buộc
+FieldsWithIsForPublic=Các lĩnh vực với <b>%s</b> được hiển thị trên danh sách công khai của các thành viên. Nếu bạn không muốn điều này, đánh dấu vào hộp "công cộng".
AccordingToGeoIPDatabase=(Theo GeoIP chuyển đổi)
Line=Dòng
NotSupported=Không được hỗ trợ
@@ -670,16 +673,16 @@ from=từ
toward=hướng
Access=Truy cập
HelpCopyToClipboard=Sử dụng tổ hợp phím Ctrl + C để copy vào clipboard
-SaveUploadedFileWithMask=Lưu tập tin trên máy chủ với tên <strong>"% s"</strong> (nếu không "% s")
+SaveUploadedFileWithMask=Lưu tập tin trên máy chủ với tên <strong>"%s"</strong> (nếu không "%s")
OriginFileName=Tên tập tin gốc
SetDemandReason=Bộ nguồn
SetBankAccount=Xác định tài khoản ngân hàng
AccountCurrency=Tài khoản ngoại tệ
ViewPrivateNote=Xem ghi chú
-XMoreLines=Dòng% s (s) ẩn
+XMoreLines=Dòng (các) %s ẩn
PublicUrl=URL công cộng
AddBox=Thêm vào hộp
-
+SelectElementAndClickRefresh=Chọn một phần tử và nhấn Refresh
# Week day
Monday=Thứ hai
Tuesday=Thứ ba
diff --git a/htdocs/langs/vi_VN/margins.lang b/htdocs/langs/vi_VN/margins.lang
index 1b5d917f82fd4222ef2b76071abc333127d32199..0ae04d128e2c1042af982e93a73619c89d0395f5 100644
--- a/htdocs/langs/vi_VN/margins.lang
+++ b/htdocs/langs/vi_VN/margins.lang
@@ -1,21 +1,21 @@
# Dolibarr language file - Source file is en_US - marges
-Margin=Margin
-Margins=Lợi nhuận
+Margin=Biên lợi nhuận
+Margins=Biên lợi nhuận
TotalMargin=Tổng biên
-MarginOnProducts=Tỷ suất lợi nhuận / Sản phẩm
-MarginOnServices=Tỷ suất lợi nhuận / Dịch vụ
-MarginRate=Tỷ lệ Margin
+MarginOnProducts=Tỷ suất biên lợi nhuận / Sản phẩm
+MarginOnServices=Tỷ suất biên lợi nhuận / Dịch vụ
+MarginRate=Tỷ lệ Biên lợi nhuận
MarkRate=Đánh dấu tỷ lệ
-DisplayMarginRates=Tỷ lệ lợi nhuận hiển thị
+DisplayMarginRates=Tỷ lệ biên lợi nhuận hiển thị
DisplayMarkRates=Giá đánh dấu hiển thị
InputPrice=Giá đầu vào
-margin=Quản lý lợi nhuận
-margesSetup=Lợi nhuận thiết lập quản lý
-MarginDetails=Chi tiết Margin
-ProductMargins=Lợi nhuận sản phẩm
-CustomerMargins=Lợi nhuận của khách hàng
-SalesRepresentativeMargins=Lợi nhuận đại diện bán hàng
+margin=Quản lý biên lợi nhuận
+margesSetup=Biên lợi nhuận thiết lập quản lý
+MarginDetails=Chi tiết Biên lợi nhuận
+ProductMargins=Biên lợi nhuận sản phẩm
+CustomerMargins=Biên lợi nhuận của khách hàng
+SalesRepresentativeMargins=Biên lợi nhuận đại diện bán hàng
ProductService=Sản phẩm hoặc dịch vụ
AllProducts=Tất cả các sản phẩm và dịch vụ
ChooseProduct/Service=Chọn sản phẩm hoặc dịch vụ
@@ -23,19 +23,22 @@ StartDate=Ngày bắt đầu
EndDate=Ngày kết thúc
Launch=Bắt đầu
ForceBuyingPriceIfNull=Giá mua vũ lực nếu rỗng
-ForceBuyingPriceIfNullDetails=nếu "ON", lợi nhuận sẽ bằng không trên đường (giá mua = giá bán), nếu không ("OFF"), Marge sẽ bằng giá bán (giá mua = 0)
+ForceBuyingPriceIfNullDetails=nếu "ON", biên lợi nhuận sẽ bằng không trên đường (giá mua = giá bán), nếu không ("OFF"), Marge sẽ bằng giá bán (giá mua = 0)
MARGIN_METHODE_FOR_DISCOUNT=Phương pháp biên giảm giá toàn cầu
UseDiscountAsProduct=Là một sản phẩm
UseDiscountAsService=Là một dịch vụ
UseDiscountOnTotal=Trên tổng số phụ
-MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Xác định nếu giảm giá toàn cầu được coi là một sản phẩm, một dịch vụ, hoặc chỉ trên tổng số phụ để tính tỷ suất lợi nhuận.
+MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Xác định nếu giảm giá toàn cầu được coi là một sản phẩm, một dịch vụ, hoặc chỉ trên tổng số phụ để tính tỷ suất biên lợi nhuận.
MARGIN_TYPE=Loại biên
MargeBrute=Biên liệu
-MargeNette=Tỷ suất lợi nhuận
-MARGIN_TYPE_DETAILS=Biên liệu: Giá bán - giá mua <br/> Tỷ suất lợi nhuận: Giá bán - Giá vốn
+MargeNette=Tỷ suất biên lợi nhuận
+MARGIN_TYPE_DETAILS=Biên liệu: Giá bán - giá mua <br/> Tỷ suất biên lợi nhuận: Giá bán - Giá vốn
CostPrice=Giá thành
BuyingCost=Giá thành
UnitCharges=Chi phí đơn vị
Charges=Phí
AgentContactType=Loại liên hệ đại lý thương mại
-AgentContactTypeDetails=Xác định những gì liên lạc loại (liên kết trên hóa đơn) sẽ được sử dụng cho báo cáo lợi nhuận của các đại lý thương mại
+AgentContactTypeDetails=Xác định những gì liên lạc loại (liên kết trên hóa đơn) sẽ được sử dụng cho các báo cáo biên lợi nhuận cho mỗi đại diện bán hàng
+rateMustBeNumeric=Tỷ giá phải là một giá trị số
+markRateShouldBeLesserThan100=Đánh dấu suất phải thấp hơn 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/vi_VN/orders.lang b/htdocs/langs/vi_VN/orders.lang
index 98b00ee5c6d5cc805040a4d97845149b8988daca..37da0e7191f8d1c2dae332035ae593ea00993359 100644
--- a/htdocs/langs/vi_VN/orders.lang
+++ b/htdocs/langs/vi_VN/orders.lang
@@ -1,20 +1,20 @@
# Dolibarr language file - Source file is en_US - orders
-OrdersArea=Khách hàng đặt hàng khu vực
-SuppliersOrdersArea=Nhà cung cấp đơn đặt hàng khu vực
-OrderCard=Thẻ thứ tự
-OrderId=Id thứ tự
-Order=Trật tự
+OrdersArea=Khu vực đơn hàng của khách hàng
+SuppliersOrdersArea=Khu vực đơn đặt hàng của nhà cung cấp
+OrderCard=Thẻ đơn hàng
+OrderId=Mã đơn hàng
+Order=Đơn đặt hàng
Orders=Đơn đặt hàng
OrderLine=Dòng thứ tự
OrderFollow=Theo dõi
OrderDate=Ngày đặt hàng
OrderToProcess=Để xử lý
-NewOrder=Trật tự mới
-ToOrder=Làm cho trật tự
-MakeOrder=Làm cho trật tự
+NewOrder=Đơn đặt hàng mới
+ToOrder=Tạo đơn đặt hàng
+MakeOrder=Tạo đơn đặt hàng
SupplierOrder=Để nhà cung cấp
SuppliersOrders=Nhà cung cấp đơn đặt hàng
-SuppliersOrdersRunning=Các nhà cung cấp hiện tại đơn đặt hàng
+SuppliersOrdersRunning=Đơn đặt hàng của các nhà cung cấp hiện tại
CustomerOrder=Đơn đặt hàng
CustomersOrders=Đơn đặt hàng của khách hàng
CustomersOrdersRunning=Đơn đặt hàng của khách hàng hiện tại của
@@ -30,106 +30,106 @@ StatusOrderValidatedShort=Xác nhận
StatusOrderSentShort=Trong quá trình
StatusOrderSent=Lô hàng trong quá trình
StatusOrderOnProcessShort=Tiếp nhận
-StatusOrderProcessedShort=Xử lý
-StatusOrderToBillShort=Giao
-StatusOrderToBill2Short=Vào hóa đơn
-StatusOrderApprovedShort=Đã được phê duyệt
-StatusOrderRefusedShort=Từ chối
-StatusOrderToProcessShort=Để xử lý
-StatusOrderReceivedPartiallyShort=Một phần nhận
-StatusOrderReceivedAllShort=Tất cả mọi thứ được
-StatusOrderCanceled=Hủy bỏ
-StatusOrderDraft=Dự thảo (cần phải được xác nhận)
+StatusOrderProcessedShort=Đã xử lý
+StatusOrderToBillShort=Đã giao hàng
+StatusOrderToBill2Short=Thanh toán
+StatusOrderApprovedShort=Đã được duyệt
+StatusOrderRefusedShort=Đã bị từ chối
+StatusOrderToProcessShort=Đang xử lý
+StatusOrderReceivedPartiallyShort=Đã nhận một phần
+StatusOrderReceivedAllShort=Đã nhận đủ
+StatusOrderCanceled=Đã bị hủy
+StatusOrderDraft=Nháp (cần phải được xác nhận)
StatusOrderValidated=Xác nhận
-StatusOrderOnProcess=Chờ đợi để nhận được
-StatusOrderProcessed=Xử lý
-StatusOrderToBill=Giao
-StatusOrderToBill2=Vào hóa đơn
-StatusOrderApproved=Đã được phê duyệt
-StatusOrderRefused=Từ chối
-StatusOrderReceivedPartially=Một phần nhận
-StatusOrderReceivedAll=Tất cả mọi thứ được
-ShippingExist=Một lô hàng tồn
-DraftOrWaitingApproved=Dự thảo đã được phê duyệt chưa đặt hàng
-DraftOrWaitingShipped=Dự thảo hoặc xác nhận chưa vận chuyển
-MenuOrdersToBill=Đơn đặt hàng cung cấp
-MenuOrdersToBill2=Đơn đặt hàng vào hóa đơn
-SearchOrder=Để tìm kiếm
+StatusOrderOnProcess=Đang chờ nhận
+StatusOrderProcessed=Đã xử lý
+StatusOrderToBill=Đã giao hàng
+StatusOrderToBill2=Thanh toán
+StatusOrderApproved=Đã được duyệt
+StatusOrderRefused=Đã bị từ chối
+StatusOrderReceivedPartially=Đã nhận một phần
+StatusOrderReceivedAll=Đã nhận đầy đủ
+ShippingExist=A shipment exists
+DraftOrWaitingApproved=Nháp hoặc đã được phê duyệt nhưng chưa đặt hàng
+DraftOrWaitingShipped=Nháp hoặc đã xác nhận nhưng chưa vận chuyển
+MenuOrdersToBill=Đơn hàng đã giao
+MenuOrdersToBill2=Billable orders
+SearchOrder=Tìm kiếm đơn hàng
SearchACustomerOrder=Tìm kiếm một đơn đặt hàng
-ShipProduct=Sản phẩm tàu
+ShipProduct=Ship product
Discount=Giảm giá
-CreateOrder=Tạo thứ tự
-RefuseOrder=Từ chối để
-ApproveOrder=Chấp nhận đặt hàng
+CreateOrder=Tạo đơn hàng
+RefuseOrder=Từ chối đơn hàng
+ApproveOrder=Chấp nhận đơn hàng
ValidateOrder=Xác nhận đặt hàng
-UnvalidateOrder=Để Unvalidate
-DeleteOrder=Xóa để
-CancelOrder=Hủy lệnh
-AddOrder=Thêm để
+UnvalidateOrder=Đơn hàng chưa xác nhận
+DeleteOrder=Xóa đơn hàng
+CancelOrder=Hủy đơn hàng
+AddOrder=Tạo đơn hàng
AddToMyOrders=Thêm vào đơn đặt hàng của tôi
AddToOtherOrders=Thêm vào đơn đặt hàng khác
-AddToDraftOrders=Thêm vào dự thảo để
-ShowOrder=Hiển thị thứ tự
-NoOpenedOrders=Không có đơn đặt hàng mở
-NoOtherOpenedOrders=Không có đơn đặt hàng mở khác
+AddToDraftOrders=Thêm vào đơn hàng nháp
+ShowOrder=Hiển thị đơn đặt hàng
+NoOpenedOrders=Không có đơn hàng được mở
+NoOtherOpenedOrders=Không có đơn hàng được mở khác
NoDraftOrders=Không có đơn hàng nháp
OtherOrders=Đơn đặt hàng khác
-LastOrders=Đơn đặt hàng cuối% s
-LastModifiedOrders=Đơn đặt hàng biến đổi cuối cùng% s
-LastClosedOrders=Cuối% s đóng đơn đặt hàng
-AllOrders=Mọi đơn đặt hàng
+LastOrders=Đơn đặt hàng cuối %s
+LastModifiedOrders=Đơn đặt hàng đã điều chỉnh cuối cùng %s
+LastClosedOrders=Đơn hàng đã đóng cuối cùng %s
+AllOrders=Tất cả đơn đặt hàng
NbOfOrders=Số đơn đặt hàng
-OrdersStatistics=Thống kê thứ tự của
+OrdersStatistics=Thống kê đơn đặt hàng
OrdersStatisticsSuppliers=Số liệu thống kê để nhà cung cấp
NumberOfOrdersByMonth=Số đơn đặt hàng theo tháng
AmountOfOrdersByMonthHT=Số lượng đơn đặt hàng theo tháng (sau thuế)
ListOfOrders=Danh sách đơn đặt hàng
-CloseOrder=Đóng cửa để
-ConfirmCloseOrder=Bạn có chắc là bạn muốn thiết lập trật tự này để deliverd? Khi một đơn hàng được giao, nó có thể được thiết lập để tính tiền.
-ConfirmCloseOrderIfSending=Bạn có chắc là bạn muốn đóng theo thứ tự này? Bạn phải đóng lệnh chỉ khi tất cả vận chuyển được thực hiện.
-ConfirmDeleteOrder=Bạn Bạn có chắc chắn muốn xóa lệnh này?
-ConfirmValidateOrder=Bạn có chắc chắn bạn muốn xác nhận thứ tự này dưới <b>tên% s?</b>
-ConfirmUnvalidateOrder=Bạn Bạn có chắc chắn muốn lập lại trật <b>tự% s</b> để soạn thảo trạng thái?
-ConfirmCancelOrder=Bạn có chắc chắn bạn muốn hủy bỏ lệnh này?
-ConfirmMakeOrder=Bạn có chắc chắn bạn muốn xác nhận bạn đã thực hiện lệnh này <b>vào% s?</b>
+CloseOrder=Đóng đơn đặt hàng
+ConfirmCloseOrder=Bạn có chắc là bạn muốn thiết lập đơn đạt hàng này để giao? Khi một đơn hàng được giao, nó có thể được thiết lập để tính tiền.
+ConfirmCloseOrderIfSending=Bạn có chắc là bạn muốn đóng theo đơn đặt hàng này? Bạn phải đóng đơn đặt hàng chỉ khi tất cả vận chuyển được thực hiện.
+ConfirmDeleteOrder=Bạn Bạn có chắc chắn muốn xóa đơn đặt hàng này?
+ConfirmValidateOrder=Bạn có chắc chắn bạn muốn xác nhận đơn đặt hàng này dưới tên <b>%s</b> ?
+ConfirmUnvalidateOrder=Bạn Bạn có chắc chắn muốn chuyển lại đơn đặt hàng <b>%s</b> về trạng thái soạn thảo?
+ConfirmCancelOrder=Bạn có chắc chắn bạn muốn hủy bỏ đơn đặt hàng này?
+ConfirmMakeOrder=Bạn có chắc chắn bạn muốn xác nhận bạn đã thực hiện lệnh này vào <b>%s</b> ?
GenerateBill=Tạo hóa đơn
-ClassifyShipped=Phân loại giao
+ClassifyShipped=Phân loại giao hàng
ClassifyBilled=Phân loại hóa đơn
ComptaCard=Thẻ kế toán
DraftOrders=Dự thảo đơn đặt hàng
RelatedOrders=Đơn đặt hàng liên quan
OnProcessOrders=Trong quá trình các đơn đặt hàng
-RefOrder=Tài liệu tham khảo. để
-RefCustomerOrder=Tài liệu tham khảo. đơn đặt hàng
-RefCustomerOrderShort=Tài liệu tham khảo. cust. để
-SendOrderByMail=Gửi đơn qua đường bưu điện
-ActionsOnOrder=Sự kiện về trật tự
+RefOrder=Số tham chiếu đơn hàng
+RefCustomerOrder=Số tham chiếu đơn đặt hàng của khách hàng
+RefCustomerOrderShort=Số tham chiếu đơn đặt hàng của khách hàng
+SendOrderByMail=Gửi đơn đặt hàng qua đường bưu điện
+ActionsOnOrder=Sự kiện về đơn đặt hàng
NoArticleOfTypeProduct=Không có bài viết của loại 'sản phẩm' như vậy không có bài viết shippable về đơn hàng này
-OrderMode=Phương pháp thứ tự
+OrderMode=Phương pháp đơn hàng
AuthorRequest=Yêu cầu tác giả
UseCustomerContactAsOrderRecipientIfExist=Sử dụng địa chỉ liên lạc của khách hàng nếu được xác định thay vì địa chỉ của bên thứ ba như là địa chỉ để người nhận
-RunningOrders=Đơn đặt hàng về quy trình
+RunningOrders=Đơn đặt hàng đang được xử lý
UserWithApproveOrderGrant=Người dùng được cấp "thông qua các đơn đặt hàng" cho phép.
-PaymentOrderRef=Thanh toán tự% s
-CloneOrder=Để Clone
-ConfirmCloneOrder=Bạn có chắc chắn bạn muốn sao chép lệnh <b>này% s?</b>
-DispatchSupplierOrder=Tiếp nhận đơn đặt hàng nhà cung cấp% s
+PaymentOrderRef=Thanh toán đơn đặt hàng %s
+CloneOrder=Sao chép đơn đặt hàng
+ConfirmCloneOrder=Bạn có chắc chắn bạn muốn sao chép đơn đặt hàng này <b>%s</b> ?
+DispatchSupplierOrder=Tiếp nhận đơn đặt hàng nhà cung cấp %s
##### Types de contacts #####
-TypeContact_commande_internal_SALESREPFOLL=Đại diện sau-up đơn đặt hàng
+TypeContact_commande_internal_SALESREPFOLL=Đại diện theo dõi đơn đặt hàng
TypeContact_commande_internal_SHIPPING=Đại diện theo dõi vận chuyển
-TypeContact_commande_external_BILLING=Hóa đơn của khách hàng liên lạc
-TypeContact_commande_external_SHIPPING=Vận chuyển khách hàng liên hệ
-TypeContact_commande_external_CUSTOMER=Liên hệ với khách hàng theo thứ tự sau-up
-TypeContact_order_supplier_internal_SALESREPFOLL=Đại diện theo dõi để cung cấp
+TypeContact_commande_external_BILLING=Địa chỉ hóa đơn khách hàng
+TypeContact_commande_external_SHIPPING=Địa chỉ giao hàng cho khách hàng
+TypeContact_commande_external_CUSTOMER=Địa chỉ khách hàng theo dõi đơn hàng
+TypeContact_order_supplier_internal_SALESREPFOLL=Đại diện theo dõi đơn hàng nhà cung cấp
TypeContact_order_supplier_internal_SHIPPING=Đại diện theo dõi vận chuyển
-TypeContact_order_supplier_external_BILLING=Nhà cung cấp hóa đơn liên lạc
-TypeContact_order_supplier_external_SHIPPING=Nhà cung cấp vận chuyển liên lạc
-TypeContact_order_supplier_external_CUSTOMER=Nhà cung cấp liên lạc theo thứ tự sau-up
+TypeContact_order_supplier_external_BILLING=Địa chỉ hóa đơn nhà cung cấp
+TypeContact_order_supplier_external_SHIPPING=Địa chỉ giao hàng cho nhà cung cấp
+TypeContact_order_supplier_external_CUSTOMER=Đia chỉ nhà cung cấp theo dõi đơn hàng
Error_COMMANDE_SUPPLIER_ADDON_NotDefined=COMMANDE_SUPPLIER_ADDON liên tục không được xác định
Error_COMMANDE_ADDON_NotDefined=COMMANDE_ADDON liên tục không được xác định
-Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Không thể tải tập tin mô-đun '% s'
-Error_FailedToLoad_COMMANDE_ADDON_File=Không thể tải tập tin mô-đun '% s'
+Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Không thể tải tập tin mô-đun '%s'
+Error_FailedToLoad_COMMANDE_ADDON_File=Không thể tải tập tin mô-đun '%s'
Error_OrderNotChecked=Không có đơn đặt hàng cho hóa đơn được lựa chọn
# Sources
OrderSource0=Đề nghị thương mại
@@ -142,22 +142,21 @@ OrderSource6=Cửa hàng
QtyOrdered=Số lượng đặt hàng
AddDeliveryCostLine=Thêm một dòng chi phí giao hàng cho thấy trọng lượng của thứ tự
# Documents models
-PDFEinsteinDescription=Một mô hình để đầy đủ (logo ...)
-PDFEdisonDescription=Một mô hình đơn giản để
+PDFEinsteinDescription=Một mô hình đơn hàng đầy đủ (logo ...)
+PDFEdisonDescription=Một mô hình đơn hàng đơn giản
PDFProformaDescription=Hoá đơn chiếu lệ đầy đủ (logo ...)
# Orders modes
OrderByMail=Thư
OrderByFax=Fax
-OrderByEMail=Thư điện tử
+OrderByEMail=Email
OrderByWWW=Trực tuyến
OrderByPhone=Điện thoại
-CreateInvoiceForThisCustomer=Đơn đặt hàng Bill
+CreateInvoiceForThisCustomer=Thanh toán đơn hàng
NoOrdersToInvoice=Không có đơn đặt hàng có thể thanh toán
-CloseProcessedOrdersAutomatically=Phân loại "chế biến" tất cả các đơn đặt hàng lựa chọn.
-MenuOrdersToBill2=Đơn đặt hàng vào hóa đơn
-OrderCreation=Tạo ra thứ tự
-Ordered=Ra lệnh
+CloseProcessedOrdersAutomatically=Chọn "Đã xử lý" cho tất cả các đơn đặt hàng.
+OrderCreation=Tạo đơn hàng
+Ordered=Đơn hàng đã được tạo
OrderCreated=Đơn đặt hàng của bạn đã được tạo ra
OrderFail=Một lỗi đã xảy ra trong quá trình tạo đơn đặt hàng của bạn
CreateOrders=Tạo đơn đặt hàng
-ToBillSeveralOrderSelectCustomer=Để tạo ra một hóa đơn cho một số đơn đặt hàng, kích đầu tiên vào khách hàng, sau đó chọn "% s".
+ToBillSeveralOrderSelectCustomer=Để tạo ra một hóa đơn cho một số đơn đặt hàng, đầu tiên nhấp vào khách hàng, sau đó chọn "%s".
diff --git a/htdocs/langs/vi_VN/oscommerce.lang b/htdocs/langs/vi_VN/oscommerce.lang
deleted file mode 100644
index 648f546555f6518e2540b0a36c59744a35e732cf..0000000000000000000000000000000000000000
--- a/htdocs/langs/vi_VN/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=Hệ điều hành thương mại
-OSCommerceSetup=Thiết lập mô-đun hệ điều hành thương mại
-OSCommerceSetupSaved=Thiết lập hệ điều hành thương mại lưu
-OSCommerceServer=Hệ điều hành máy chủ lưu trữ thương mại / ip
-OSCommerceDatabaseName=Tên cơ sở dữ liệu hệ điều hành thương mại
-OSCommercePrefix=Hệ điều hành thương mại bảng tiền tố
-OSCommerceUser=Đăng nhập cơ sở dữ liệu hệ điều hành thương mại
diff --git a/htdocs/langs/vi_VN/other.lang b/htdocs/langs/vi_VN/other.lang
index 60293670023b185c933450f9f151a7f3963998bb..a87e0bbfbcb7047b058dbcd94316abfdf3bfbfd0 100644
--- a/htdocs/langs/vi_VN/other.lang
+++ b/htdocs/langs/vi_VN/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=Mã bảo vệ
Calendar=Lịch
-AddTrip=Thêm chuyến đi
Tools=Công cụ
ToolsDesc=Khu vực này được dành riêng cho nhóm dụng cụ khác không có sẵn vào mục trình đơn khác. <br><br> Các công cụ này có thể đạt được từ menu bên cạnh.
Birthday=Sinh nhật
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Dự án sáng tạo
Notify_TASK_CREATE=Nhiệm vụ tạo
Notify_TASK_MODIFY=Nhiệm vụ sửa đổi
Notify_TASK_DELETE=Công tác xóa
+SeeModuleSetup=See module setup
NbOfAttachedFiles=Số đính kèm tập tin / tài liệu
TotalSizeOfAttachedFiles=Tổng dung lượng của các file đính kèm / tài liệu
MaxSize=Kích thước tối đa
@@ -203,25 +203,26 @@ ForgetIfNothing=Nếu bạn không yêu cầu thay đổi này, chỉ cần quê
##### Calendar common #####
AddCalendarEntry=Thêm phần trong lịch% s
-NewCompanyToDolibarr=Công ty% s thêm vào Dolibarr
-ContractValidatedInDolibarr=Hợp đồng xác nhận trong% s Dolibarr
-ContractCanceledInDolibarr=Hợp đồng bị hủy bỏ trong% s Dolibarr
-ContractClosedInDolibarr=Hợp đồng% s đóng cửa Dolibarr
-PropalClosedSignedInDolibarr=Đề xuất% s đã ký trong Dolibarr
-PropalClosedRefusedInDolibarr=Đề xuất% s từ chối trong Dolibarr
-PropalValidatedInDolibarr=Đề nghị xác nhận% s trong Dolibarr
-InvoiceValidatedInDolibarr=Hoá đơn% s xác nhận trong Dolibarr
-InvoicePaidInDolibarr=Hoá đơn% s thay đổi để trả Dolibarr
-InvoiceCanceledInDolibarr=Hoá đơn% s hủy bỏ Dolibarr
-PaymentDoneInDolibarr=Thanh toán% hoàn thành công việc trong Dolibarr
-CustomerPaymentDoneInDolibarr=Khách hàng thanh toán% hoàn thành công việc trong Dolibarr
-SupplierPaymentDoneInDolibarr=Nhà cung cấp thanh toán% hoàn thành công việc trong Dolibarr
-MemberValidatedInDolibarr=Thành viên% s xác nhận trong Dolibarr
-MemberResiliatedInDolibarr=Thành viên% s resiliated trong Dolibarr
-MemberDeletedInDolibarr=Thành viên% s xóa từ Dolibarr
-MemberSubscriptionAddedInDolibarr=Đăng ký cho thành viên được thêm vào trong% s Dolibarr
-ShipmentValidatedInDolibarr=Lô hàng% s xác nhận trong Dolibarr
-ShipmentDeletedInDolibarr=Lô hàng% s xóa từ Dolibarr
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
##### Export #####
Export=Xuất khẩu
ExportsArea=Khu vực xuất khẩu
diff --git a/htdocs/langs/vi_VN/paybox.lang b/htdocs/langs/vi_VN/paybox.lang
index f937768240c3bb7b70a1bdf3e499c60b71d16ab9..aced32a49440a9ff7a1b1e0279522ff49cec7821 100644
--- a/htdocs/langs/vi_VN/paybox.lang
+++ b/htdocs/langs/vi_VN/paybox.lang
@@ -35,3 +35,6 @@ MessageKO=Message on canceled payment return page
NewPayboxPaymentReceived=New Paybox payment received
NewPayboxPaymentFailed=New Paybox payment tried but failed
PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/vi_VN/resource.lang b/htdocs/langs/vi_VN/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..d64075dfbf595897a63e3eebf19194d8f71030dd
--- /dev/null
+++ b/htdocs/langs/vi_VN/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
diff --git a/htdocs/langs/vi_VN/sendings.lang b/htdocs/langs/vi_VN/sendings.lang
index 88e52a17a5fdb890beef1dae9fc4e4cf5fcb14ef..b37fed33b8ee9414259d0c81188c4bb7348812b6 100644
--- a/htdocs/langs/vi_VN/sendings.lang
+++ b/htdocs/langs/vi_VN/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=Đối với thời điểm này, tạo ra một
RelatedShippings=Shippings liên quan
ShipmentLine=Đường vận chuyển
CarrierList=Danh sách vận chuyển
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
# Sending methods
SendingMethodCATCH=Catch của khách hàng
diff --git a/htdocs/langs/vi_VN/stocks.lang b/htdocs/langs/vi_VN/stocks.lang
index f5bfa524b6e4e791b1f1cb268fed9c8e1c52d80a..304832413e76bd7c82e02bff72511041a3b807e1 100644
--- a/htdocs/langs/vi_VN/stocks.lang
+++ b/htdocs/langs/vi_VN/stocks.lang
@@ -2,7 +2,7 @@
WarehouseCard=Thẻ kho
Warehouse=Kho
Warehouses=Các kho hàng
-NewWarehouse=Kho mới / khu vực chứng khoán
+NewWarehouse=Kho mới / khu vực kho
WarehouseEdit=Sửa kho
MenuNewWarehouse=Kho mới
WarehouseOpened=Kho mở
@@ -14,64 +14,64 @@ WarehouseTarget=Kho tiêu
ValidateSending=Xóa gửi
CancelSending=Hủy bỏ việc gửi
DeleteSending=Xóa gửi
-Stock=Cổ
-Stocks=Cổ phiếu
-Movement=Phong trào
-Movements=Biến động
+Stock=Tồn kho
+Stocks=Tồn kho
+Movement=Chuyển kho
+Movements=Danh sách chuyển kho
ErrorWarehouseRefRequired=Tên tài liệu tham khảo kho là cần thiết
ErrorWarehouseLabelRequired=Nhãn kho là cần thiết
-CorrectStock=Chứng khoán chính xác
+CorrectStock=Tồn kho chính xác
ListOfWarehouses=Danh sách kho
-ListOfStockMovements=Danh sách chuyển động chứng khoán
-StocksArea=Khu vực cổ phiếu
+ListOfStockMovements=Danh sách chuyển động kho
+StocksArea=Warehouses area
Location=Đến từ
LocationSummary=Ngắn vị trí tên
NumberOfDifferentProducts=Số lượng sản phẩm khác nhau
NumberOfProducts=Tổng số sản phẩm
LastMovement=Chuyển động mới
-LastMovements=Phong trào cuối
+LastMovements=Chuyển kho cuối
Units=Đơn vị
Unit=Đơn vị
-StockCorrection=Chứng khoán chính xác
-StockTransfer=Chuyển nhượng chứng khoán
+StockCorrection=Tồn kho chính xác
+StockTransfer=Chuyển nhượng kho
StockMovement=Chuyển
-StockMovements=Chuyển nhượng chứng khoán
-LabelMovement=Nhãn Phong trào
+StockMovements=Chuyển nhượng kho
+LabelMovement=Nhãn Chuyển kho
NumberOfUnit=Số đơn vị
UnitPurchaseValue=Giá mua đơn vị
TotalStock=Tổng kho
-StockTooLow=Cổ phiếu quá thấp
-StockLowerThanLimit=Cổ thấp hơn so với giới hạn cảnh báo
+StockTooLow=Tồn kho quá thấp
+StockLowerThanLimit=Tồn kho thấp hơn so với giới hạn cảnh báo
EnhancedValue=Giá trị
PMPValue=Giá bình quân gia quyền
PMPValueShort=WAP
EnhancedValueOfWarehouses=Các kho hàng giá trị
UserWarehouseAutoCreate=Tạo một kho tự động khi tạo một người sử dụng
QtyDispatched=Số lượng cử
-OrderDispatch=Điều phối chứng khoán
-RuleForStockManagementDecrease=Quy tắc cho quản lý chứng khoán giảm
-RuleForStockManagementIncrease=Quy tắc cho tăng quản lý chứng khoán
-DeStockOnBill=Giảm chứng khoán thực tế trên hoá đơn khách hàng / tín dụng ghi xác nhận
-DeStockOnValidateOrder=Giảm cổ phiếu sản trên khách hàng xác nhận đơn đặt hàng
-DeStockOnShipment=Giảm cổ phiếu sản trên xác nhận lô hàng
-ReStockOnBill=Tăng cổ phiếu thực tế các nhà cung cấp hoá đơn tín dụng / ghi xác nhận
-ReStockOnValidateOrder=Tăng cổ phiếu thực sự tán thành đơn đặt hàng các nhà cung cấp
-ReStockOnDispatchOrder=Tăng cổ phiếu sản trên dẫn điều phối vào kho, sau khi tiếp nhận đơn đặt hàng nhà cung cấp
-ReStockOnDeleteInvoice=Tăng cổ phiếu sản trên xóa hóa đơn
-OrderStatusNotReadyToDispatch=Đặt hàng vẫn chưa hoặc không có thêm một trạng thái cho phép điều phối các sản phẩm trong kho chứng khoán.
-StockDiffPhysicTeoric=Lý do cho cổ phiếu khác biệt về thể chất và lý thuyết
-NoPredefinedProductToDispatch=Không có sản phẩm được xác định trước cho đối tượng này. Vì vậy, không có điều phối trong chứng khoán là bắt buộc.
+OrderDispatch=Điều phối kho
+RuleForStockManagementDecrease=Quy tắc cho quản lý kho giảm
+RuleForStockManagementIncrease=Quy tắc cho tăng quản lý kho
+DeStockOnBill=Giảm kho thực tế trên hoá đơn khách hàng / tín dụng ghi xác nhận
+DeStockOnValidateOrder=Giảm tồn kho thực trên khách hàng xác nhận đơn đặt hàng
+DeStockOnShipment=Giảm tồn kho thực trên xác nhận lô hàng
+ReStockOnBill=Tăng tồn kho thực tế các nhà cung cấp hoá đơn tín dụng / ghi xác nhận
+ReStockOnValidateOrder=Tăng tồn kho thực sự tán thành đơn đặt hàng các nhà cung cấp
+ReStockOnDispatchOrder=Tăng tồn kho thực trên dẫn điều phối vào kho, sau khi tiếp nhận đơn đặt hàng nhà cung cấp
+ReStockOnDeleteInvoice=Tăng tồn kho thực trên xóa hóa đơn
+OrderStatusNotReadyToDispatch=Đặt hàng vẫn chưa hoặc không có thêm một trạng thái cho phép điều phối các sản phẩm trong kho kho.
+StockDiffPhysicTeoric=Lý do cho tồn kho khác biệt về thể chất và lý thuyết
+NoPredefinedProductToDispatch=Không có sản phẩm được xác định trước cho đối tượng này. Vì vậy, không có điều phối trong kho là bắt buộc.
DispatchVerb=Công văn
StockLimitShort=Hạn cảnh báo
-StockLimit=Hạn cổ phiếu cho cảnh báo
-PhysicalStock=Cổ vật lý
-RealStock=Bất Cổ
-VirtualStock=Chứng khoán ảo
-MininumStock=Cổ phiếu tối thiểu
+StockLimit=Hạn tồn kho cho cảnh báo
+PhysicalStock=Tồn kho vật lý
+RealStock=Tồn kho thực
+VirtualStock=Tồn kho ảo
+MininumStock=Tồn kho tối thiểu
StockUp=Dự trữ
-MininumStockShort=Cổ phút
+MininumStockShort=Tồn kho tối thiểu
StockUpShort=Dự trữ
-IdWarehouse=Kho Id
+IdWarehouse=Mã kho
DescWareHouse=Mô tả kho
LieuWareHouse=Địa phương hóa kho
WarehousesAndProducts=Các kho hàng và sản phẩm
@@ -80,46 +80,46 @@ AverageUnitPricePMP=Trọng giá đầu vào trung bình
SellPriceMin=Đơn giá bán
EstimatedStockValueSellShort=Giá trị bán
EstimatedStockValueSell=Giá trị bán
-EstimatedStockValueShort=Giá trị cổ phiếu đầu vào
-EstimatedStockValue=Giá trị cổ phiếu đầu vào
+EstimatedStockValueShort=Giá trị tồn kho đầu vào
+EstimatedStockValue=Giá trị tồn kho đầu vào
DeleteAWarehouse=Xóa một nhà kho
ConfirmDeleteWarehouse=Bạn có chắc chắn muốn xóa <b>kho% s?</b>
-PersonalStock=Cổ phiếu cá nhân của% s
-ThisWarehouseIsPersonalStock=Kho này đại diện cho cổ phiếu cá nhân của% s% s
-SelectWarehouseForStockDecrease=Chọn nhà kho để sử dụng cho chứng khoán giảm
-SelectWarehouseForStockIncrease=Chọn nhà kho để sử dụng cho chứng khoán tăng
-NoStockAction=Không có hành động chứng khoán
+PersonalStock=Tồn kho cá nhân của% s
+ThisWarehouseIsPersonalStock=Kho này đại diện cho tồn kho cá nhân của% s% s
+SelectWarehouseForStockDecrease=Chọn nhà kho để sử dụng cho kho giảm
+SelectWarehouseForStockIncrease=Chọn nhà kho để sử dụng cho kho tăng
+NoStockAction=Không có hành động kho
LastWaitingSupplierOrders=Đơn đặt hàng chờ đợi để tiếp khách
-DesiredStock=Chứng khoán mong muốn
+DesiredStock=Tồn kho mong muốn
StockToBuy=Để đặt hàng
Replenishment=Bổ sung
ReplenishmentOrders=Đơn đặt hàng bổ sung
-VirtualDiffersFromPhysical=Theo để tăng / giảm lựa chọn cổ phiếu, chứng khoán vật chất và chứng khoán ảo (vật lý + đơn đặt hàng hiện tại) có thể có khác nhau
-UseVirtualStockByDefault=Sử dụng chứng khoán ảo theo mặc định, thay vì cổ vật lý, cho các tính năng bổ sung
-UseVirtualStock=Sử dụng chứng khoán ảo
-UsePhysicalStock=Sử dụng vật lý cổ phiếu
+VirtualDiffersFromPhysical=Theo để tăng / giảm lựa chọn tồn kho, kho vật chất và kho ảo (vật lý + đơn đặt hàng hiện tại) có thể có khác nhau
+UseVirtualStockByDefault=Sử dụng kho ảo theo mặc định, thay vì cổ vật lý, cho các tính năng bổ sung
+UseVirtualStock=Sử dụng kho ảo
+UsePhysicalStock=Sử dụng vật lý tồn kho
CurentSelectionMode=Dòng định mức chế độ lựa chọn
-CurentlyUsingVirtualStock=Chứng khoán ảo
-CurentlyUsingPhysicalStock=Cổ vật lý
-RuleForStockReplenishment=Quy tắc cho cổ phiếu bổ sung
+CurentlyUsingVirtualStock=Tồn kho ảo
+CurentlyUsingPhysicalStock=Tồn kho vật lý
+RuleForStockReplenishment=Quy tắc cho tồn kho bổ sung
SelectProductWithNotNullQty=Chọn ít nhất một sản phẩm với một SL không null và một nhà cung cấp
AlertOnly= Cảnh báo chỉ
-WarehouseForStockDecrease=<b>Kho% s</b> sẽ được sử dụng cho chứng khoán giảm
-WarehouseForStockIncrease=<b>Kho% s</b> sẽ được sử dụng cho chứng khoán tăng
+WarehouseForStockDecrease=<b>Kho% s</b> sẽ được sử dụng cho kho giảm
+WarehouseForStockIncrease=<b>Kho% s</b> sẽ được sử dụng cho kho tăng
ForThisWarehouse=Đối với kho này
-ReplenishmentStatusDesc=Đây là danh sách của tất cả các sản phẩm với một cổ phiếu thấp hơn so với cổ phiếu mong muốn (hoặc thấp hơn giá trị cảnh báo nếu hộp kiểm "cảnh báo chỉ" được chọn), và đề nghị bạn để tạo ra các đơn đặt hàng nhà cung cấp để lấp đầy sự khác biệt.
+ReplenishmentStatusDesc=Đây là danh sách của tất cả các sản phẩm với một tồn kho thấp hơn so với tồn kho mong muốn (hoặc thấp hơn giá trị cảnh báo nếu hộp kiểm "cảnh báo chỉ" được chọn), và đề nghị bạn để tạo ra các đơn đặt hàng nhà cung cấp để lấp đầy sự khác biệt.
ReplenishmentOrdersDesc=Đây là danh sách của tất cả các đơn đặt hàng nhà cung cấp mở
Replenishments=Replenishments
NbOfProductBeforePeriod=Số lượng sản phẩm% s trong kho trước khi thời gian được lựa chọn (<% s)
NbOfProductAfterPeriod=Số lượng sản phẩm% s trong kho sau khi được lựa chọn thời gian (>% s)
-MassMovement=Phong trào quần chúng
-MassStockMovement=Phong trào chứng khoán đại chúng
+MassMovement=Chuyển kho toàn bộ
+MassStockMovement=Chuyển kho toàn bộ
SelectProductInAndOutWareHouse=Chọn một sản phẩm, một số lượng lớn, kho nguồn và một kho hàng mục tiêu, sau đó nhấp vào "% s". Một khi điều này được thực hiện với mọi hoạt động cần thiết, kích vào "% s".
RecordMovement=Ghi transfert
ReceivingForSameOrder=Receivings về đơn hàng này
-StockMovementRecorded=Chuyển động chứng khoán được ghi nhận
-RuleForStockAvailability=Quy định về yêu cầu chứng khoán
-StockMustBeEnoughForInvoice=Mức cổ phiếu phải đủ để thêm sản phẩm / dịch vụ vào hóa đơn
-StockMustBeEnoughForOrder=Mức cổ phiếu phải đủ để thêm sản phẩm / dịch vụ vào nề nếp
-StockMustBeEnoughForShipment= Mức cổ phiếu phải đủ để thêm sản phẩm / dịch vụ vào lô hàng
+StockMovementRecorded=Chuyển động kho được ghi nhận
+RuleForStockAvailability=Quy định về yêu cầu kho
+StockMustBeEnoughForInvoice=Mức tồn kho phải đủ để thêm sản phẩm / dịch vụ vào hóa đơn
+StockMustBeEnoughForOrder=Mức tồn kho phải đủ để thêm sản phẩm / dịch vụ vào nề nếp
+StockMustBeEnoughForShipment= Mức tồn kho phải đủ để thêm sản phẩm / dịch vụ vào lô hàng
diff --git a/htdocs/langs/vi_VN/users.lang b/htdocs/langs/vi_VN/users.lang
index f3652dcb525c135d1235ff856e74cdeb088232f6..c80e82cd32c2fb4f77c837dd1e16aa670bba19ae 100644
--- a/htdocs/langs/vi_VN/users.lang
+++ b/htdocs/langs/vi_VN/users.lang
@@ -63,7 +63,6 @@ ShowGroup=Hiện nhóm
ShowUser=Hiện người dùng
NonAffectedUsers=Người dùng không được giao
UserModified=Người sử dụng sửa đổi thành công
-GroupModified=Nhóm đổi thành công
PhotoFile=Hình ảnh tập tin
UserWithDolibarrAccess=Người sử dụng truy cập Dolibarr
ListOfUsersInGroup=Danh sách các thành viên trong nhóm này
@@ -103,7 +102,7 @@ UserDisabled=Sử dụng% s khuyết tật
UserEnabled=Sử dụng% s kích hoạt
UserDeleted=Sử dụng% s loại bỏ
NewGroupCreated=Nhóm% s tạo
-GroupModified=Nhóm đổi thành công
+GroupModified=Group %s modified
GroupDeleted=Nhóm% s loại bỏ
ConfirmCreateContact=Bạn có chắc chắn bạn muốn tạo một tài khoản Dolibarr cho liên hệ này?
ConfirmCreateLogin=Bạn có chắc chắn bạn muốn tạo một tài khoản Dolibarr thành viên này?
@@ -120,3 +119,4 @@ UseTypeFieldToChange=Sử dụng Type để thay đổi
OpenIDURL=OpenID URL
LoginUsingOpenID=Sử dụng OpenID để đăng nhập
WeeklyHours=Giờ hàng tuần
+ColorUser=Màu của người sử dụng
diff --git a/htdocs/langs/vi_VN/withdrawals.lang b/htdocs/langs/vi_VN/withdrawals.lang
index 85dce579a881ade0298d263ffeeee7f914a6c959..9a2f990f6b0e74b445a2279a89beca5f2ade9b93 100644
--- a/htdocs/langs/vi_VN/withdrawals.lang
+++ b/htdocs/langs/vi_VN/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=Nhận
LastWithdrawalReceipts=Biên lai thu hồi cuối% s
WithdrawedBills=Hoá đơn bị thu hồi
WithdrawalsLines=Đường rút
-RequestStandingOrderToTreat=Yêu cầu đứng đơn đặt hàng để điều trị
-RequestStandingOrderTreated=Yêu cầu đơn đặt hàng thường trực điều trị
+RequestStandingOrderToTreat=Yêu cầu đứng đơn đặt hàng để xử lý
+RequestStandingOrderTreated=Yêu cầu cho các đơn hàng thường trực xử lý
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=Đơn đặt hàng của khách hàng đứng
CustomerStandingOrder=Để đứng hàng
NbOfInvoiceToWithdraw=Nb. hóa đơn với rút lại yêu cầu
@@ -40,14 +41,13 @@ TransMetod=Phương pháp truyền
Send=Gửi
Lines=Dòng
StandingOrderReject=Ban hành từ chối
-InvoiceRefused=Hoá đơn từ chối
WithdrawalRefused=Rút từ chối
WithdrawalRefusedConfirm=Bạn có chắc chắn bạn muốn nhập một từ chối thu hồi đối với xã hội
RefusedData=Ngày từ chối
RefusedReason=Lý do từ chối
RefusedInvoicing=Thanh toán từ chối
NoInvoiceRefused=Không sạc từ chối
-InvoiceRefused=Hoá đơn từ chối
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=Tình trạng
StatusUnknown=Không biết
StatusWaiting=Chờ
@@ -76,7 +76,7 @@ WithBankUsingRIB=Đối với tài khoản ngân hàng sử dụng RIB
WithBankUsingBANBIC=Đối với tài khoản ngân hàng sử dụng IBAN / BIC / SWIFT
BankToReceiveWithdraw=Tài khoản ngân hàng để nhận Bỏ cuộc
CreditDate=Về tín dụng
-WithdrawalFileNotCapable=Không thể tạo ra tập tin nhận thu hồi cho quốc gia của bạn
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
ShowWithdraw=Hiện Rút
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Tuy nhiên, nếu hóa đơn có ít nhất một thanh toán rút chưa qua chế biến, nó sẽ không được thiết lập như là trả tiền để cho phép quản lý thu hồi trước.
DoStandingOrdersBeforePayments=Thẻ này cho phép bạn yêu cầu để đứng. Sau khi hoàn tất, bạn có thể gõ thanh toán để đóng hóa đơn.
diff --git a/htdocs/langs/zh_CN/accountancy.lang b/htdocs/langs/zh_CN/accountancy.lang
index ae7111d3c321b88d9e5332d2c077beed34aa12e3..fc37725f98e00810854a1e930d2329b390fc99d6 100644
--- a/htdocs/langs/zh_CN/accountancy.lang
+++ b/htdocs/langs/zh_CN/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=选择会计科目表
Validate=验证
Addanaccount=添加一个会计帐户
AccountAccounting=会计账户
-Ventilation=通风
+Ventilation=Breakdown
ToDispatch=派遣
Dispatched=调度
-CustomersVentilation=通风客户
-SuppliersVentilation=通风系统供应商
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
TradeMargin=贸易保证金
Reports=报告
ByCustomerInvoice=依据”发票“的客户
@@ -45,9 +45,9 @@ WriteBookKeeping=在”总账“中的”账户记录“
Bookkeeping=总帐
AccountBalanceByMonth=”账户余额“按月份
-AccountingVentilation=会计通风
-AccountingVentilationSupplier=会计通风的供应商
-AccountingVentilationCustomer=会计通风客户
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
Line=线
CAHTF=总采购供应商HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=发票通风线
IntoAccount=在会计帐户
Ventilate=通风
-VentilationAuto=自动通风
+VentilationAuto=Automatic breakdown
Processing=处理
EndProcessing=处理的结束
@@ -68,9 +68,9 @@ NotVentilatedinAccount=不通风的会计账户
ACCOUNTING_SEPARATORCSV=Separator CSV
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
AccountLength=会计长度账户显示在的Dolibarr
AccountLengthDesc=功能允许由零的数字代替空格假装会计账户的长度。这个函数只接触了显示屏，它不修改的Dolibarr登记的会计科目。为出口，这个功能是必要的，以与特定的软件兼容。
@@ -84,7 +84,7 @@ ACCOUNTING_CASH_JOURNAL=Cash journal
ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
ACCOUNTING_SOCIAL_JOURNAL=Social journal
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=转账账户
ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait
ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
@@ -140,14 +140,14 @@ Active=声明
NewFiscalYear=新财年
-DescVentilCustomer=在这里，请咨询您的发票客户的年度会计通风
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
TotalVente=总成交量HT
TotalMarge=总销售利润率
DescVentilDoneCustomer=这里查阅发票的客户的行和其会计帐户的列表
DescVentilTodoCustomer=与会计帐户通风客户发票行
ChangeAccount=变化的账户选择行会计帐户：
Vide=-
-DescVentilSupplier=在这里，请咨询您的发票供应商的年度会计通风
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
DescVentilTodoSupplier=与会计帐户通风发票的供应商的线路
DescVentilDoneSupplier=在这里请教发票的供应商的线条和其会计帐户列表
@@ -155,4 +155,4 @@ ValidateHistory=自动验证
ErrorAccountancyCodeIsAlreadyUse=错误，你不能删除这个会计帐户，因为它是用来
-FicheVentilation=通风卡
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index e0a4870b10307501c9aa6da2d1963f5e0738175e..7cc1e718e38c8d184366ea2a2c3d2d8b109883fc 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -43,19 +43,19 @@ SecuritySetup=安全设置
ErrorModuleRequirePHPVersion=错误，此模块要求 PHP 版本 %s 或更高
ErrorModuleRequireDolibarrVersion=错误，此模块要求 Dolibarr 版本 %s 或更高
ErrorDecimalLargerThanAreForbidden=错误，不支持超过 <b>%s</b> 的精度。
-DictionarySetup=Dictionary setup
-Dictionary=Dictionaries
-Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
+DictionarySetup=词典的设置
+Dictionary=字典库
+Chartofaccounts=会计科目表
+Fiscalyear=财务年度
ErrorReservedTypeSystemSystemAuto=类型值 'system' 与 'systemauto' 是系统保留值。不能以'user'为值添加您的记录
ErrorCodeCantContainZero=编码不能包含 0
-DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
+DisableJavascript=禁用JavaScript和Ajax功能(推荐 盲人或文本浏览器)
ConfirmAjax=使用 Ajax 弹出式确认窗口
UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectCompany=Use autocompletion fields to choose third parties instead of using a list box.
+UseSearchToSelectCompany=使用自动填充字段来选择第三方(而不是使用一个列表框)。
ActivityStateToSelectCompany= 添加一个筛选器选项来显示/隐藏当前有往来或已停止往来的客户/供应商。
UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
+UseSearchToSelectContact=使用自动填充字段来选择联系人（而不是使用一个列表框）。
SearchFilter=搜索过滤选项
NumberOfKeyToSearch=触发搜索的字符数量：%s
ViewFullDateActions=在第三表中显示全天事件
@@ -106,9 +106,9 @@ OtherOptions=其他选项
OtherSetup=其他设置
CurrentValueSeparatorDecimal=小数位分隔符
CurrentValueSeparatorThousand=千位分隔符
-Destination=Destination
-IdModule=Module ID
-IdPermissions=Permissions ID
+Destination=目的地
+IdModule=模块ID
+IdPermissions=权限ID
Modules=模块
ModulesCommon=主要模块
ModulesOther=其他模块
@@ -120,7 +120,7 @@ LanguageBrowserParameter=参数 %s
LocalisationDolibarrParameters=本地化参数
ClientTZ=客户端时区(用户侧)
ClientHour=客户端时间(用户侧)
-OSTZ=Server OS Time Zone
+OSTZ=服务器操作系统时区
PHPTZ=PHP服务器时区
PHPServerOffsetWithGreenwich=PHP服务器与 GMT 时差(秒)
ClientOffsetWithGreenwich=客户机/浏览器与 GMT 时差(秒)
@@ -238,9 +238,9 @@ OfficialWebSiteFr=法国官方网站
OfficialWiki=Dolibarr Wiki 上的文档
OfficialDemo=Dolibarr在线演示
OfficialMarketPlace=官方市场提供外部模块/扩展
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OfficialWebHostingService=引用网络托管服务（云主机）
+ReferencedPreferredPartners=首选合作伙伴
+OtherResources=其他资源
ForDocumentationSeeWiki=用户或开发人员用文档(文档，常见问题…)，<br>参见 Dolibarr 百科：<br><b><a href="%s" target="_blank">%s</a></b>
ForAnswersSeeForum=您有任何其他问题/帮助，可以到 Dolibarr 论坛： <br> <b><a href="%s" target="_blank">%s</a></b>
HelpCenterDesc1=此处可以帮助你获得 Dolibarr 帮助支持服务。
@@ -302,7 +302,7 @@ CurrentVersion=Dolibarr 当前版本
CallUpdatePage=请到数据库的结构和数据更新页面：%s。
LastStableVersion=最新的稳定版本
GenericMaskCodes=您可自由设置格式掩码。在 %s 格式掩码中， 有如下计数标记可用：<br><b>{000000}</b>表示按顺序递增的序号。序号位数与掩码中0的个数相同，不足自动补零，达最大值后自动归零。<br><b>{000000+000}</b> 同上但 %s 起始序号从 + 后的数值记起。<br><b>{000000@x}</b> 与第一种相同，但序号到X月时自动清零(x=1~12 、0＝程序设置中的财年起始月、99＝每月清零)。 如果使用此种掩码且 x >= 2 ，则必须同时使用日期掩码 {yy}{mm} 或 {yyyy}{mm}。<br><b>{dd}</b> 天 (01~31)。<br><b>{mm}</b> 月 (01~12)。<br><b>{yy}</b>，<b>{yyyy}</b> 或 <b>{y}</b> 代表 2位, 4位 或 1 位年。<br><br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> n个字符，客户端代码<br><b>{cccc000}</b>上的n个字符的客户端代码后面是一个专门用于客户计数器。此计数器将比较全局计数器相同时间为用户进行复位。 <br><b>{tttt}</b>第三方类型的n个字符（见词典第三方类型）的代码。 <br>
GenericMaskCodes3=其它非标记字符将维持不变。<br>不允许使用空格<br>
GenericMaskCodes4a=<u>例如: 2007-01-31 第三方“TheCompany”的第99笔 %s ：</u> <br>
GenericMaskCodes4b=<u>例如: 2007-03-1 建立的第三方公司:</u><br>
@@ -437,8 +437,8 @@ Module52Name=库存
Module52Desc=产品库存的管理
Module53Name=服务
Module53Desc=服务的管理
-Module54Name=合同
-Module54Desc=合同的和服务的管理
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=条码
Module55Desc=条码的管理
Module56Name=电话
@@ -475,16 +475,16 @@ Module320Name=RSS 源
Module320Desc=添加 RSS 源至 Dolibarr 主屏幕页面
Module330Name=书签
Module330Desc=书签的管理
-Module400Name=项目
-Module400Desc=在其他模块内部的管理项目
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=Webcalendar
Module410Desc=Webcalendar 整合
-Module500Name=Special expenses (tax, social contributions, dividends)
-Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
+Module500Name=特别费用（税，社会公益，股息）
+Module500Desc=特别费用如税收，社会公益，分红及工资管理
Module510Name=Salaries
Module510Desc=Management of employees salaries and payments
Module600Name=通知
-Module600Desc=当系统中一些商业事件发生时，通过电邮通知第三方联系人。
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=捐赠
Module700Desc=捐款的管理
Module1200Name=Mantis
@@ -514,18 +514,18 @@ Module5000Name=多公司
Module5000Desc=允许你管理多个公司
Module6000Name=工作流程
Module6000Desc=工作流管理
-Module20000Name=休假
-Module20000Desc=声明和跟踪聘员休假
-Module39000Name=Product batch
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
+Module39000Name=产品批号
Module39000Desc=Batch number, eat-by and sell-by date management on products
Module50000Name=出纳
Module50000Desc=模块通过 PayBox 提供信用卡网上支付页面
Module50100Name=POS
Module50100Desc=POS 模块
-Module50200Name= Paypal
-Module50200Desc= 模块提供信用卡与Paypal网上支付页面
-Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double parties)
+Module50200Name=Paypal
+Module50200Desc=模块提供信用卡与Paypal网上支付页面
+Module50400Name=财会(高级)
+Module50400Desc=会计管理(双方)
Module54000Name=IPP打印
Module54000Desc=通过CUPS IPP 打印机打印 . 注：CUPS IPP:支持Internet协议的Unix打印系统
Module55000Name=Open Poll
@@ -606,15 +606,16 @@ Permission151=阅读常年订单
Permission152=创建/修改常年订单请求
Permission153=阅读常年订单收据
Permission154=信贷/拒绝站在订单收据
-Permission161=读取合同
-Permission162=建立/修改服务合同
-Permission163=启动服务合同
-Permission164=禁用服务合同
-Permission165=删除合同
-Permission171=阅读差旅记录
-Permission172=建立/修改差旅记录
-Permission173=删除差旅记录
-Permission178=导出差旅记录
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Read trips and expenses (own and his subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
Permission180=读取供应商资讯
Permission181=读取采购订单
Permission182=建立/修改采购订单
@@ -671,7 +672,7 @@ Permission300=读取条码
Permission301=建立/修改条码
Permission302=删除条码
Permission311=阅读服务
-Permission312=指派服务到合同
+Permission312=Assign service/subscription to contract
Permission331=阅读书签
Permission332=建立/修改书签
Permission333=删除书签
@@ -688,10 +689,10 @@ Permission401=读取折扣
Permission402=建立/修改折扣
Permission403=确认折扣
Permission404=删除折扣
-Permission510=Read Salaries
-Permission512=Create/modify salaries
-Permission514=Delete salaries
-Permission517=Export salaries
+Permission510=查看工资
+Permission512=创建/修改工资
+Permission514=删除工资
+Permission517=导出工资
Permission531=阅读服务
Permission532=建立/修改服务
Permission534=删除服务
@@ -701,8 +702,8 @@ Permission701=读取捐款资讯
Permission702=建立/修改捐款资讯
Permission703=删除捐款资讯
Permission1001=读取库存资讯
-Permission1002=建立/修改库存资讯
-Permission1003=删除库存资讯
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=读取库存的转让资讯
Permission1005=建立/修改库存转让
Permission1101=读取交货订单
@@ -751,18 +752,18 @@ Permission50202=进口交易
Permission54001=打印
Permission55001=Read polls
Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
+Permission59001=查看商业利润
+Permission59002=确定商业利润
DictionaryCompanyType=Thirdparties type
DictionaryCompanyJuridicalType=Juridical kinds of thirdparties
DictionaryProspectLevel=Prospect potential level
-DictionaryCanton=State/Cantons
-DictionaryRegion=Regions
+DictionaryCanton=国家/各省、直辖市、自治区
+DictionaryRegion=地区
DictionaryCountry=国家
-DictionaryCurrency=Currencies
-DictionaryCivility=Civility title
+DictionaryCurrency=货币
+DictionaryCivility=文明单位称号
DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
+DictionarySocialContributions=社会公益类型
DictionaryVAT=VAT Rates or Sales Tax Rates
DictionaryRevenueStamp=Amount of revenue stamps
DictionaryPaymentConditions=Payment terms
@@ -788,7 +789,7 @@ VATIsNotUsedDesc=默认情况下，建议的营业税为0，可用于像协会
VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared.
VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration. This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
##### Local Taxes #####
-LTRate=Rate
+LTRate=率
LocalTax1IsUsed=使用第二项税率
LocalTax1IsNotUsed=不使用第二项税率
LocalTax1IsUsedDesc=使用其它类型税率(非增值税VAT)
@@ -813,12 +814,12 @@ LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices,
LocalTax2IsNotUsedDescES= By default the proposed IRPF is 0. 规则结束。
LocalTax2IsUsedExampleES= In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
LocalTax2IsNotUsedExampleES= In Spain they are bussines not subject to tax system of modules.
-CalcLocaltax=Reports
-CalcLocaltax1ES=Sales - Purchases
+CalcLocaltax=报告
+CalcLocaltax1ES=销售 - 购买
CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2ES=Purchases
+CalcLocaltax2ES=购买
CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3ES=Sales
+CalcLocaltax3ES=销售
CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
LabelUsedByDefault=如果代码没有翻译则默认使用以下标签
LabelOnDocuments=文档中的标签
@@ -931,14 +932,14 @@ EventsSetup=设置 事件日志
LogEvents=安全稽核事件
Audit=安全稽核
InfoDolibarr=Dolibarr 信息
-InfoBrowser=Infos Browser
+InfoBrowser=浏览器信息
InfoOS=系统 信息
InfoWebServer=网页服务器 信息
InfoDatabase=数据库 信息
InfoPHP=PHP 信息
InfoPerf=履行相关信息
-BrowserName=Browser name
-BrowserOS=Browser OS
+BrowserName=浏览器名称
+BrowserOS=浏览器操作系统
ListEvents=稽核事件
ListOfSecurityEvents=安全事件清单
SecurityEventsPurged=安全事件清除
@@ -1015,13 +1016,13 @@ ExtraFieldsThirdParties=增补属性 (往来单位)
ExtraFieldsContacts=增补属性 (联系人/地址)
ExtraFieldsMember=增补属性 (成员)
ExtraFieldsMemberType=增补属性 (成员类型)
-ExtraFieldsCustomerOrders=Complementary attributes (orders)
-ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
+ExtraFieldsCustomerOrders=增补的属性（订单）
+ExtraFieldsCustomerInvoices=增补的属性（发票）
ExtraFieldsSupplierOrders=增补属性 (订单)
ExtraFieldsSupplierInvoices=增补属性 (账单)
ExtraFieldsProject=增补属性 (项目)
ExtraFieldsProjectTask=增补属性 (任务)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
+ExtraFieldHasWrongValue=属性 %s 有一个错误的值。
AlphaNumOnlyCharsAndNoSpace=仅限英文字母 (不包括空格)
AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
SendingMailSetup=通过电邮发送的设置
@@ -1038,7 +1039,6 @@ YesInSummer=是(在夏天)
OnlyFollowingModulesAreOpenedToExternalUsers=注意，仅如下模块向外部用户开放。(无论外部用户的权限如何)：
SuhosinSessionEncrypt=会话存储空间已用 Suhosin 加密
ConditionIsCurrently=当前条件为 %s
-TestNotPossibleWithCurrentBrowsers=自动检测不能使用
YouUseBestDriver=你使用的驱动程序 %s 就是目前最佳驱动程式。
YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
NbOfProductIsLowerThanNoPb=你只有 %s 的产品/服务在数据库。这并不需要任何特别的优化。
@@ -1052,7 +1052,7 @@ AddRefInList=显示客户/供应商参考列表(选择列表或组合框)和大
FieldEdition=Edition of field %s
FixTZ=TimeZone fix
FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-GetBarCode=Get barcode
+GetBarCode=获取条码
EmptyNumRefModelDesc=The code is free. This code can be modified at any time.
##### Module password generation
PasswordGenerationStandard=返回一个根据 Dolibarr 内部算法生成的密码：8个字符，包含小写数字和字母。
@@ -1074,11 +1074,11 @@ ModuleCompanyCodeAquarium=根据以下编码原则返回会计编号: <br>以 %s
ModuleCompanyCodePanicum=只会回传一个空的会计编号
ModuleCompanyCodeDigitaria=会计编号取决于第三方的编号。代码以C开头，后跟第三方单位的 5 位代码
UseNotifications=使用通知
-NotificationsDesc=电邮通知功能令您可以将 Dolibarr 中的事件通过邮件自动通知给所设定的第三方(客户或供应商)。Choice of active notification and targets contacts is made one third party at time.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
ModelModules=文件模板
DocumentModelOdt=从开放文档模板软件(OpenOffice, KOffice, TextEdit,...等)生成(.ODT，.ODS）模板文档。
WatermarkOnDraft=为草稿文档加水印
-JSOnPaimentBill=Activate feature to autofill payment lines on payment form
+JSOnPaimentBill=激活在线支付功能来自动填充付款的形式
CompanyIdProfChecker=Professional Id 规则
MustBeUnique=必须是唯一 ID 吗？
MustBeMandatory=强制创建第三方？
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=添加交付日期的能力
UseOptionLineIfNoQuantity=定量为0的产品或服务项视为可选项*
FreeLegalTextOnProposal=报价单中的额外说明文本
WatermarkOnDraftProposal=为商业计划书草案添加水印(如果空)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=订单管理设置
OrdersNumberingModules=订单编号模块
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list
ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order
FreeLegalTextOnOrders=订单中的额外说明文本
WatermarkOnDraftOrders=为订单草稿加水印(如果空)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
##### Clicktodial #####
ClickToDialSetup=点击拨号模块设置
ClickToDialUrlDesc=Url called when a click on phone picto is done. In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
@@ -1158,10 +1160,10 @@ FicheinterNumberingModules=干预编号模块
TemplatePDFInterventions=干预信息卡文档模板
WatermarkOnDraftInterventionCards=干预卡文档加水印(如果有)
##### Contracts #####
-ContractsSetup=合同模块的设置
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=合同编号模块
TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
+FreeLegalTextOnContracts=合同自由文本
WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
##### Members #####
MembersSetup=会员模块设置
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=HTTP服务器 %s 类型的文件不会被压缩
CacheByServer=缓存服务器
CacheByClient=通过浏览器缓存
CompressionOfResources=压缩的HTTP响应
-TestNotPossibleWithCurrentBrowsers=自动检测不能使用
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=产品模块设置
ServiceSetup=服务模块设置
@@ -1332,7 +1334,7 @@ ConfirmDeleteProductLineAbility=从表单中删除产品时要求确认
ModifyProductDescAbility=允许更改表单中的产品说明
ViewProductDescInFormAbility=表单中是否可以直接显示产品描述资讯(如果关闭则用弹出工具提示显示)
ViewProductDescInThirdpartyLanguageAbility=是否可以直接显示其他语系的产品描述资讯
-UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+UseSearchToSelectProductTooltip=此外，如果你有大量的产品（> 10万），你可以通过设置 - >其他不变PRODUCT_DONOTSEARCH_ANYWHERE设置为1，提高速度。搜索将被限制在开始的字符串。
UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
UseEcoTaxeAbility=支持生态附加税 (WEEE)
SetDefaultBarcodeTypeProducts=默认的条码类型
@@ -1382,9 +1384,10 @@ MailingSetup=电邮发送模块设置
MailingEMailFrom=邮件模块所使用的邮件发件人
MailingEMailError=对错误的电子邮件发送错误通知邮件(慎用避免循环退信造成IP拉入黑名单)
##### Notification #####
-NotificationSetup=电邮通知模块设置
+NotificationSetup=EMail notification module setup
NotificationEMailFrom=通知模块所使用的邮件发件人
-ListOfAvailableNotifications=可用的通知名单 (项目视实际启用的模块而定)
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
##### Sendings #####
SendingsSetup=发货单模块设置
SendingsReceiptModel=发货单据模板
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=成功连接到服务器'%s'的数据库'%s'上，身份用户
OSCommerceTestKo1=服务器'%s'连接成功，但无法打开数据库'%s'。
OSCommerceTestKo2=以用户身份'%s'连接至服务器'%s' 失败。
##### Stock #####
-StockSetup=库存模块设置
-UserWarehouse=*启用用户自定义库存
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=菜单(项)已删除
TreeMenu=树状菜单
@@ -1478,11 +1482,14 @@ ClickToDialDesc=此模块可以在电话号码后添加图标点击此图标将
##### Point Of Sales (CashDesk) #####
CashDesk=POS
CashDeskSetup=POS 模块设置
-CashDeskThirdPartyForSell=销售用通用第三方
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=接收现金付款的默认帐户
CashDeskBankAccountForCheque= 接收支票付款的默认帐户
CashDeskBankAccountForCB= 接收信用卡支付的默认帐户
-CashDeskIdWareHouse=销售发货仓库
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=书签模块设置
BookmarkDesc=此模块可以管理您的书签您也可以将Dolibarr的任意页面加入您的左侧菜单中。
@@ -1524,17 +1531,25 @@ TaskModelModule=任务报告文档模型
ECMSetup = GED 设置
ECMAutoTree = 自动树形文件夹和文档
##### Fiscal Year #####
-FiscalYears=Fiscal years
-FiscalYear=Fiscal year
-FiscalYearCard=Fiscal year card
-NewFiscalYear=New fiscal year
-EditFiscalYear=Edit fiscal year
-OpenFiscalYear=Open fiscal year
-CloseFiscalYear=Close fiscal year
-DeleteFiscalYear=Delete fiscal year
-ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Opened
-Closed=Closed
-
-Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
+FiscalYears=财年
+FiscalYear=财务年度
+FiscalYearCard=财务年度卡
+NewFiscalYear=新财务年度
+EditFiscalYear=编辑财务年度
+OpenFiscalYear=打开财务年度
+CloseFiscalYear=关闭财务年度
+DeleteFiscalYear=删除财务年度
+ConfirmDeleteFiscalYear=您确定要删除本财年？
+Opened=启动
+Closed=关闭
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
+Format=格式
+TypePaymentDesc=0：客户支付类型，1：供应商支付类型，2：客户和供应商的付款方式
diff --git a/htdocs/langs/zh_CN/agenda.lang b/htdocs/langs/zh_CN/agenda.lang
index 2d25e6718cd318cf00456835cc7bf9b0d76222dd..f0baa362ff11c93530ed4627e0e5c9cbd8ecfdf5 100644
--- a/htdocs/langs/zh_CN/agenda.lang
+++ b/htdocs/langs/zh_CN/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= 全自动灌装议程
AgendaAutoActionDesc= 这里定义Dolibarr会为其自动创建待办事项的活动。如果没有被选\n中(默认情况下)，只有手动操作被列入待办事项。
AgendaSetupOtherDesc= 这页允许配置议程模块其他参数。
AgendaExtSitesDesc=此页面允许声明日历的外部来源，从而在Dolibarr待办事项中可以看到他们的事件。
-ActionsEvents= Dolibarr将为其自动创建一个动作的事件
-PropalValidatedInDolibarr= 建议%s的验证
-InvoiceValidatedInDolibarr= 发票%s的验证
+ActionsEvents=Dolibarr将为其自动创建一个动作的事件
+PropalValidatedInDolibarr=建议%s的验证
+InvoiceValidatedInDolibarr=发票%s的验证
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=发票的%s去回到草案状态
InvoiceDeleteDolibarr=删除 %s 发票
OrderValidatedInDolibarr= 订购%s的验证
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=为了%s批准
OrderRefusedInDolibarr=Order %s refused
OrderBackToDraftInDolibarr=为了%s回到草案状态
OrderCanceledInDolibarr=为了%s取消
-InterventionValidatedInDolibarr=%s的验证干预
ProposalSentByEMail=商业建议通过电子邮件发送%s
OrderSentByEMail=客户订单通过电子邮件发送%s
InvoiceSentByEMail=客户发票通过电子邮件发送%s
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=供应商的订单通过电子邮件发送%s
SupplierInvoiceSentByEMail=供应商的发票通过电子邮件发送%s
ShippingSentByEMail=通过电子邮件发送的航运%s
ShippingValidated= Shipping %s validated
-InterventionSentByEMail=通过电子邮件发送的干预%s
-InterventionClassifiedBilled=Intervention %s classified as Billed
NewCompanyToDolibarr= 第三方创建
DateActionPlannedStart= 计划开始日期
DateActionPlannedEnd= 计划结束日期
@@ -70,9 +68,9 @@ DateActionStart= 开始日期
DateActionEnd= 结束日期
AgendaUrlOptions1=您还可以添加以下参数来筛选输出：
AgendaUrlOptions2=<b>login=%s</b> 表示限制只导出创造用户，受影响用户或使用者或执行者为<b>%s</b>的待办事项。
-AgendaUrlOptions3=<b>logina=%s</b> 表示限制只导出创建用户为<b>%s</b>的待办事项。
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
AgendaUrlOptions4=<b>logint=%s</b>表示限制只导出使用者与受影响者为<b>%s</b>的待办事项。
-AgendaUrlOptions5=<b>logind=%s</b>表示限制只导出执行者为<b>%s</b>的待办事项。
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
AgendaShowBirthdayEvents=显示生日的接触
AgendaHideBirthdayEvents=隐藏生日的接触
Busy=忙碌
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=URL来访问。iCal文件
ExtSiteNoLabel=无说明
WorkingTimeRange=Working time range
WorkingDaysRange=Working days range
-AddEvent=Add event
+AddEvent=Create event
MyAvailability=My availability
diff --git a/htdocs/langs/zh_CN/bills.lang b/htdocs/langs/zh_CN/bills.lang
index 79975931d85696321f9a6ecedc2f11b1b64e3e85..18c59db625f966ad67ecb68d736abb1ec47e6f0f 100644
--- a/htdocs/langs/zh_CN/bills.lang
+++ b/htdocs/langs/zh_CN/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=信用注意
InvoiceAvoirAsk=信用注意纠正发票
InvoiceAvoirDesc=<b>信贷说明</b>是一种消极的发票用来解决一个事实，即发票已缴纳的数额相差实在比额（因为顾客付出太多的错误，例如将不支付或完全因为他归还了部分产品）。
invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
-invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
ReplaceInvoice=替换%s的发票
ReplacementInvoice=更换发票
ReplacedByInvoice=按发票取代s%
@@ -87,7 +87,7 @@ ClassifyCanceled=分类'已遗弃'
ClassifyClosed=分类'已关闭'
ClassifyUnBilled=Classify 'Unbilled'
CreateBill=创建发票
-AddBill=添加注意发票或信用
+AddBill=Create invoice or credit note
AddToDraftInvoices=添加到草案发票
DeleteBill=删除发票
SearchACustomerInvoice=搜寻客户发票
@@ -99,7 +99,7 @@ DoPaymentBack=付款回
ConvertToReduc=转换到未来的折扣
EnterPaymentReceivedFromCustomer=输入从客户收到付款
EnterPaymentDueToCustomer=由于客户的付款
-DisabledBecauseRemainderToPayIsZero=禁用，因为其余部分支付为零
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
Amount=额
PriceBase=价格基准
BillStatus=发票状态
@@ -137,8 +137,6 @@ BillFrom=From
BillTo=Bill To
ActionsOnBill=行动对发票
NewBill=新发票
-Prélèvements=长期订单
-Prélèvements=长期订单
LastBills=上次%s的发票
LastCustomersBills=上次%s的客户发票
LastSuppliersBills=上次%s的供应商发票
@@ -156,9 +154,9 @@ ConfirmCancelBill=你确定要取消发票<b>%s吗</b> ？
ConfirmCancelBillQuestion=你为什么要这样分类发票'放弃'？
ConfirmClassifyPaidPartially=您确定要更改<b>%s</b>的地位发票支付？
ConfirmClassifyPaidPartiallyQuestion=这发票尚未完全支付。是什么原因让你关闭此发票？
-ConfirmClassifyPaidPartiallyReasonAvoir=其余部分支付<b>（%s的%s）</b>是一个折扣，因为获得付款之前任期。我注意到规范使用信用卡的增值税。
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=其余部分支付<b>（%s的%s）</b>是一个折扣，因为获得付款之前任期。我接受失去这个折扣的增值税。
-ConfirmClassifyPaidPartiallyReasonDiscountVat=其余部分支付<b>（%s的%s）</b>是一个折扣，因为获得付款之前任期。我在此折扣不恢复信贷注意到增值税。
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
ConfirmClassifyPaidPartiallyReasonBadCustomer=坏顾客
ConfirmClassifyPaidPartiallyReasonProductReturned=产品部分返回
ConfirmClassifyPaidPartiallyReasonOther=其他原因而放弃额
@@ -191,9 +189,9 @@ AlreadyPaid=已支付
AlreadyPaidBack=已经支付
AlreadyPaidNoCreditNotesNoDeposits=已支付（无信用票据及存款）
Abandoned=弃
-RemainderToPay=未支付
-RemainderToTake=其余部分采取
-RemainderToPayBack=其余还钱
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
Rest=待办
AmountExpected=索赔额
ExcessReceived=收到过剩
@@ -219,19 +217,18 @@ NoInvoice=没有发票
ClassifyBill=分类发票
SupplierBillsToPay=供应商发票，以支付
CustomerBillsUnpaid=客户未付发票
-DispenseMontantLettres=由mechanographical是从字母顺序豁免起草的法案
-DispenseMontantLettres=由mechanographical是从字母顺序豁免起草的法案
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=非可收回
SetConditions=设置付款条件
SetMode=设置支付方式
Billed=帐单
-RepeatableInvoice=预先定义的发票
-RepeatableInvoices=预先定义的发票
-Repeatable=预先定义
-Repeatables=预先定义
-ChangeIntoRepeatableInvoice=转换成预先定义
-CreateRepeatableInvoice=建立预先定义的发票
-CreateFromRepeatableInvoice=创建从预先定义的发票
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
CustomersInvoicesAndInvoiceLines=客户发票和发票的路线
CustomersInvoicesAndPayments=客户发票和付款
ExportDataset_invoice_1=客户发票清单和发票的路线
diff --git a/htdocs/langs/zh_CN/categories.lang b/htdocs/langs/zh_CN/categories.lang
index 1b9cf293eb9a0dc43cb723a214d9d144826054a0..2b0e2a388f36a39aa3f8cff907cc10d1426752e0 100644
--- a/htdocs/langs/zh_CN/categories.lang
+++ b/htdocs/langs/zh_CN/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=供应商及个类别之间的相关链接
CatCusLinks=客户/前景和类别之间的相关链接
CatProdLinks=产品/服务和类别之间的相关链接
CatMemberLinks=成员和类别之间的相关链接
-CatProdLinks=产品/服务和类别之间的相关链接
-CatCusLinks=客户/前景和类别之间的相关链接
-CatSupLinks=供应商及个类别之间的相关链接
DeleteFromCat=从类别中删除
DeletePicture=Picture delete
ConfirmDeletePicture=Confirm picture deletion?
@@ -112,3 +109,4 @@ CategoriesSetup=Categories setup
CategorieRecursiv=Link with parent category automatically
CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category
diff --git a/htdocs/langs/zh_CN/compta.lang b/htdocs/langs/zh_CN/compta.lang
index d1e62ea5eea90eb75ddf2647f91369788568f360..cc7916bbd7d51b00108238f64481d85f3493960a 100644
--- a/htdocs/langs/zh_CN/compta.lang
+++ b/htdocs/langs/zh_CN/compta.lang
@@ -12,7 +12,7 @@ OptionModeTrueDesc=在这种情况下，营业额计算超过付款（付款日
OptionModeVirtualDesc=在这种情况下，营业额计算超过发票（验证的日期）。当这些发票是因为，不论是否已支付或没有，他们在输出中列出的营业额。
FeatureIsSupportedInInOutModeOnly=功能只在信用额，债务提供会计模式（见会计模块的配置）
VATReportBuildWithOptionDefinedInModule=这里显示的数额计算使用由税务模块设置定义的规则。
-LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup.
+LTReportBuildWithOptionDefinedInModule=这里显示的金额是根据公司定义的规则进行计算的。
Param=设置
RemainingAmountPayment=剩余的付款金额：
AmountToBeCharged=支付的总金额：
@@ -54,7 +54,7 @@ LT1SupplierES=RE purchases
VATCollected=增值税征收
ToPay=待支付
ToGet=待取回
-SpecialExpensesArea=Area for all special payments
+SpecialExpensesArea=特殊支付区域
TaxAndDividendsArea=税收，社会捐献和股息区
SocialContribution=社会捐献
SocialContributions=社会捐献
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=坏客户对会计守则在%
SuppliersProductsSellSalesTurnover=通过对供应商的产品销售产生营业额。
CheckReceipt=支票存款
CheckReceiptShort=支票存款
+LastCheckReceiptShort=Last %s check receipts
NewCheckReceipt=新优惠
NewCheckDeposit=新的支票存款
NewCheckDepositOn=创建于账户上的存款收据：%s的
@@ -196,13 +197,13 @@ CalculationRuleDescSupplier=根据供应商，选择适当的方法来套用相
TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
CalculationMode=计算模式
AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=购货缺省会计代码
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=卖货缺省会计代码
+ACCOUNTING_SERVICE_BUY_ACCOUNT=购买服务缺省会计编码
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=出售服务缺省会计代码
ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
+ACCOUNTING_ACCOUNT_CUSTOMER=第三方客户缺省会计代码
ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
CloneTax=Clone a social contribution
ConfirmCloneTax=Confirm the clone of a social contribution
diff --git a/htdocs/langs/zh_CN/contracts.lang b/htdocs/langs/zh_CN/contracts.lang
index c89675f574a4c590e8d9668a6ead51ae138c50d7..d24baa68199c5f9565274b84e08a03b0a169a509 100644
--- a/htdocs/langs/zh_CN/contracts.lang
+++ b/htdocs/langs/zh_CN/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=合同区
ListOfContracts=合约名单
-LastContracts=最后%s的修改过的合同
+LastModifiedContracts=Last %s modified contracts
AllContracts=所有合同
ContractCard=合同卡
ContractStatus=合同地位
@@ -27,7 +27,7 @@ MenuRunningServices=正在运行的服务
MenuExpiredServices=过期服务
MenuClosedServices=休息服务
NewContract=新合同
-AddContract=新增合同
+AddContract=Create contract
SearchAContract=搜索合同
DeleteAContract=删除合同
CloseAContract=关闭的合同
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=名单合同线运行
ListOfRunningServices=运行服务的列表
NotActivatedServices=不活跃的服务（除验证合同）
BoardNotActivatedServices=服务激活验证合同之间
-LastContracts=最后%s的修改过的合同
+LastContracts=Last % contracts
LastActivatedServices=上次%s的激活服务
LastModifiedServices=最后%S修饰服务
EditServiceLine=编辑服务项目
diff --git a/htdocs/langs/zh_CN/cron.lang b/htdocs/langs/zh_CN/cron.lang
index 1878e5a1dc4bb710baa3895e694fc19b6acc66e9..85476b74a5c616c35567cd6fcf8c6890f6ed1fb6 100644
--- a/htdocs/langs/zh_CN/cron.lang
+++ b/htdocs/langs/zh_CN/cron.lang
@@ -1,114 +1,86 @@
# Dolibarr language file - Source file is en_US - cron
-#
# About page
-#
About = 关于
CronAbout = 关于cron
CronAboutPage = cron的“关于”页面
-
-#
# Right
-#
Permission23101 = 阅读计划任务
Permission23102 = 创建/更新计划任务
Permission23103 = 删除计划任务
Permission23104 = 执行计划任务
-
-#
# Admin
-#
-# CronSetup= Scheduled job management setup
-# URLToLaunchCronJobs=URL to check and launch cron jobs if required
-# OrToLaunchASpecificJob=Or to check and launch a specific job
-# KeyForCronAccess=Security key for URL to launch cron jobs
-# FileToLaunchCronJobs=Command line to launch cron jobs
-# CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes
-# CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
-
-
-#
+CronSetup= Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch cron jobs if required
+OrToLaunchASpecificJob=Or to check and launch a specific job
+KeyForCronAccess=Security key for URL to launch cron jobs
+FileToLaunchCronJobs=Command line to launch cron jobs
+CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
# Menu
-#
-# CronJobs=Scheduled jobs
-# CronListActive= List of active jobs
-# CronListInactive= List of disabled jobs
-# CronListActive= List of active jobs
-
-
-#
+CronJobs=Scheduled jobs
+CronListActive=List of active/scheduled jobs
+CronListInactive=List of disabled jobs
# Page list
-#
-# CronDateLastRun=Last run
-# CronLastOutput=Last run output
-# CronLastResult=Last result code
-# CronListOfCronJobs=List of scheduled jobs
-# CronCommand=Command
-# CronList=Jobs list
-# CronDelete= Delete cron jobs
-# CronConfirmDelete= Are you sure you want to delete this cron job ?
-# CronExecute=Launch job
-# CronConfirmExecute= Are you sure to execute this job now
-# CronInfo= Jobs allow to execute task that have been planned
-# CronWaitingJobs=Wainting jobs
-# CronTask=Job
+CronDateLastRun=最后运行
+CronLastOutput=最后运行结果
+CronLastResult=Last result code
+CronListOfCronJobs=List of scheduled jobs
+CronCommand=命令
+CronList=Jobs list
+CronDelete= Delete cron jobs
+CronConfirmDelete= Are you sure you want to delete this cron job ?
+CronExecute=Launch job
+CronConfirmExecute= Are you sure to execute this job now
+CronInfo= Jobs allow to execute task that have been planned
+CronWaitingJobs=Wainting jobs
+CronTask=Job
CronNone= 无
CronDtStart=开始日期
CronDtEnd=结束日期
-# CronDtNextLaunch=Next execution
-# CronDtLastLaunch=Last execution
-# CronFrequency=Frequancy
-# CronClass=Classe
+CronDtNextLaunch=接下来执行
+CronDtLastLaunch=最后执行
+CronFrequency=频率
+CronClass=Classe
CronMethod=方法
CronModule=模
-# CronAction=Action
+CronAction=Action
CronStatus=地位
CronStatusActive=启用
CronStatusInactive=残疾人士
-# CronNoJobs=No jobs registered
+CronNoJobs=No jobs registered
CronPriority=优先
CronLabel=描述
-# CronNbRun=Nb. launch
-# CronEach=Every
-# JobFinished=Job launched and finished
-
-#
+CronNbRun=Nb. launch
+CronEach=Every
+JobFinished=Job launched and finished
#Page card
-#
-# CronAdd= Add jobs
-# CronHourStart= Start Hour and date of task
-# CronEvery= And execute task each
-# CronObject= Instance/Object to create
+CronAdd= Add jobs
+CronHourStart= Start Hour and date of task
+CronEvery= And execute task each
+CronObject= Instance/Object to create
CronArgs=参数
-# CronSaveSucess=Save succesfully
+CronSaveSucess=保存成功
CronNote=评论
-# CronFieldMandatory=Fields %s is mandatory
-# CronErrEndDateStartDt=End date cannot be before start date
-# CronStatusActiveBtn=Enable
+CronFieldMandatory=Fields %s is mandatory
+CronErrEndDateStartDt=End date cannot be before start date
+CronStatusActiveBtn=启用
CronStatusInactiveBtn=禁用
-# CronTaskInactive=This job is disabled
-# CronDtLastResult=Last result date
-# CronId=Id
-# CronClassFile=Classes (filename.class.php)
-# CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-# CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-# CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-# CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is <i>fecth</i>
-# CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-# CronCommandHelp=The system command line to execute.
-
-#
+CronTaskInactive=This job is disabled
+CronDtLastResult=Last result date
+CronId=Id
+CronClassFile=Classes (filename.class.php)
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
+CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronCommandHelp=The system command line to execute.
# Info
-#
CronInfoPage=信息
-
-
-#
# Common
-#
CronType=任务类型
CronType_method=一个Dolibarr类的调用方法
-# CronType_command=Shell command
+CronType_command=Shell command
CronMenu=Cron
-# CronCannotLoadClass=Cannot load class %s or object %s
-
-# UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+CronCannotLoadClass=Cannot load class %s or object %s
+UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
diff --git a/htdocs/langs/zh_CN/donations.lang b/htdocs/langs/zh_CN/donations.lang
index 1dcb46894113aa7e004c6524ea1855b40456356b..0cd5d256a2c6a66a738a3bc92cc244e83ccee13c 100644
--- a/htdocs/langs/zh_CN/donations.lang
+++ b/htdocs/langs/zh_CN/donations.lang
@@ -4,7 +4,7 @@ Donations=捐赠
DonationRef=捐赠文书
Donor=捐赠者
Donors=捐赠者
-AddDonation=添加捐赠
+AddDonation=Create a donation
NewDonation=新捐赠
ShowDonation=显示捐赠
DonationPromise=礼品的承诺
@@ -31,3 +31,8 @@ DonationRecipient=受捐赠者
ThankYou=谢谢您
IConfirmDonationReception=接受者声明接收，捐款，数额如下
MinimumAmount=Minimum amount is %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/zh_CN/externalsite.lang b/htdocs/langs/zh_CN/externalsite.lang
index 4cd72a69451348af976fbdbdc2c91149b349b69c..60addb61283954f3174f8f41d6ce38c9f5895544 100644
--- a/htdocs/langs/zh_CN/externalsite.lang
+++ b/htdocs/langs/zh_CN/externalsite.lang
@@ -2,3 +2,4 @@
ExternalSiteSetup=设置链接到外部网站
ExternalSiteURL=外部网站网址
ExternalSiteModuleNotComplete=外部网站模块配置不正确。
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/zh_CN/holiday.lang b/htdocs/langs/zh_CN/holiday.lang
index 7d37dc79414417074efee461787f785a6582b43c..ba28033c0433529049bf7f10706eb68c56032e62 100644
--- a/htdocs/langs/zh_CN/holiday.lang
+++ b/htdocs/langs/zh_CN/holiday.lang
@@ -7,7 +7,7 @@ MenuAddCP=Make a leave request
NotActiveModCP=You must enable the module Leaves to view this page.
NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
NoCPforUser=You don't have any available day.
-AddCP=Make a leave request
+AddCP=做一个请假申请
Employe=雇员
DateDebCP=开始日期
DateFinCP=结束日期
@@ -18,24 +18,24 @@ ApprovedCP=批准
CancelCP=取消
RefuseCP=拒绝
ValidatorCP=同意
-ListeCP=List of leaves
+ListeCP=请假记录
ReviewedByCP=将审查
DescCP=描述
SendRequestCP=Create leave request
DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Edit balance of leaves
-UpdateAllCP=Update the leaves
+MenuConfCP=编辑剩余假期数
+UpdateAllCP=更新假期
SoldeCPUser=Leaves balance is <b>%s</b> days.
ErrorEndDateCP=你必须选择结束日期大于起始日期。
ErrorSQLCreateCP=创建过程中发生了一个SQL错误：
-ErrorIDFicheCP=An error has occurred, the leave request does not exist.
+ErrorIDFicheCP=出现一个错误，请假申请不存在。
ReturnCP=返回前一页
-ErrorUserViewCP=You are not authorized to read this leave request.
-InfosCP=Information of the leave request
-InfosWorkflowCP=Information Workflow
+ErrorUserViewCP=您无权阅读该请假申请。
+InfosCP=请假申请信息
+InfosWorkflowCP=工作流程信息
RequestByCP=Requested by
-TitreRequestCP=Leave request
-NbUseDaysCP=Number of days of vacation consumed
+TitreRequestCP=请假条
+NbUseDaysCP=消耗的休假天数
EditCP=编辑
DeleteCP=删除
ActionValidCP=验证
@@ -43,31 +43,30 @@ ActionRefuseCP=拒绝
ActionCancelCP=取消
StatutCP=地位
SendToValidationCP=发送到验证
-TitleDeleteCP=Delete the leave request
-ConfirmDeleteCP=Confirm the deletion of this leave request?
-ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
-CantCreateCP=You don't have the right to make leave requests.
+TitleDeleteCP=删除请假条
+ConfirmDeleteCP=确认删除该请假申请？
+ErrorCantDeleteCP=错误，您没有权限删除这个请假条。
+CantCreateCP=您无权做请假条。
InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=更新
-CantUpdate=You cannot update this leave request.
+CantUpdate=您不能更新这个请假条
NoDateDebut=你必须选择开始日期。
NoDateFin=你必须选择结束日期。
-ErrorDureeCP=Your request for holidays does not contain working day.
-TitleValidCP=批准申请假期
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
ConfirmValidCP=Are you sure you want to approve the leave request?
DateValidCP=批准日期
TitleToValidCP=Send leave request
ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the request holidays
+TitleRefuseCP=Refuse the leave request
ConfirmRefuseCP=Are you sure you want to refuse the leave request?
NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=取消假期申请
+TitleCancelCP=Cancel the leave request
ConfirmCancelCP=Are you sure you want to cancel the leave request?
DetailRefusCP=拒绝原因
DateRefusCP=拒绝日期
DateCancelCP=注销日期
DefineEventUserCP=为用户分配一个特殊的假期
-addEventToUserCP=Assign leave
+addEventToUserCP=指定休假
MotifCP=雷森
UserCP=用户
ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
@@ -78,35 +77,35 @@ ActionByCP=Performed by
UserUpdateCP=For the user
PrevSoldeCP=Previous Balance
NewSoldeCP=New Balance
-alreadyCPexist=A request for holidays has already been done on this period.
+alreadyCPexist=A leave request has already been done on this period.
UserName=名称
Employee=雇员
-FirstDayOfHoliday=First day of vacation
-LastDayOfHoliday=Last day of vacation
+FirstDayOfHoliday=假期第一天
+LastDayOfHoliday=假期最后一天
HolidaysMonthlyUpdate=每月更新
ManualUpdate=手动更新
HolidaysCancelation=Leave request cancelation
## Configuration du Module ##
-ConfCP=节假日模块的配置
+ConfCP=Configuration of leave request module
DescOptionCP=选项描述
ValueOptionCP=值
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
ConfirmConfigCP=验证配置
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
UpdateConfCPOK=更新成功。
ErrorUpdateConfCP=An error occurred during the update, please try again.
-AddCPforUsers=Please add the balance of holidays of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
Module27130Name= Management of leave requests
Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
TitleOptionEventCP=Settings of leave requets for events
ValidEventCP=验证
UpdateEventCP=Update events
@@ -125,7 +124,7 @@ TitleUpdateEventCP=Edit or delete a exceptional leave
DeleteEventOptionCP=删除
UpdateEventOptionCP=更新
ErrorMailNotSend=An error occurred while sending email:
-NoCPforMonth=No leave this month.
+NoCPforMonth=这个月无休。
nbJours=天数
TitleAdminCP=Configuration of Leaves
#Messages
diff --git a/htdocs/langs/zh_CN/interventions.lang b/htdocs/langs/zh_CN/interventions.lang
index df8ca7a572c729c2b8226eb6bdea93169d0de1cb..af761b7fe90e8bada1d1829334bd9e94e11af9ca 100644
--- a/htdocs/langs/zh_CN/interventions.lang
+++ b/htdocs/langs/zh_CN/interventions.lang
@@ -3,7 +3,7 @@ Intervention=介入
Interventions=干预
InterventionCard=干预卡
NewIntervention=新的干预
-AddIntervention=添加干预
+AddIntervention=Create intervention
ListOfInterventions=名单干预
EditIntervention=编辑干预
ActionsOnFicheInter=干预的行动
@@ -30,6 +30,15 @@ StatusInterInvoiced=帐单
RelatedInterventions=相关的干预措施
ShowIntervention=展干预
SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=代表随访干预
TypeContact_fichinter_internal_INTERVENING=干预
diff --git a/htdocs/langs/zh_CN/mails.lang b/htdocs/langs/zh_CN/mails.lang
index 447d802140503b880e35b2294ab686b6a94efcef..7ce895780f56b16343f14546042361db7f0adf06 100644
--- a/htdocs/langs/zh_CN/mails.lang
+++ b/htdocs/langs/zh_CN/mails.lang
@@ -115,7 +115,7 @@ SentBy=发送
MailingNeedCommand=出于安全的原因，收发邮件发送是更好地执行命令行。如果你有一个，请问您的服务器管理员启动以下命令给所有收件人发送电子邮件：
MailingNeedCommand2=但是您可以发送到网上，加入与最大的电子邮件数量值参数MAILING_LIMIT_SENDBYWEB你要发送的会议。
ConfirmSendingEmailing=如果你能或不喜欢他们发送您的www浏览器，请确认你确定要发送电子邮件现在从你的浏览器吗？
-LimitSendingEmailing=注：在线发送<b>%s</b>的email限制发送，安全和超时的原因。
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=清除名单
ToClearAllRecipientsClickHere=点击这里以清除此电子邮件的收件人列表
ToAddRecipientsChooseHere=添加从名单中选择收件人
@@ -133,6 +133,9 @@ Notifications=通知
NoNotificationsWillBeSent=没有电子邮件通知此事件的计划和公司
ANotificationsWillBeSent=1通知将通过电子邮件发送
SomeNotificationsWillBeSent=%s的通知将通过电子邮件发送
-AddNewNotification=启动一个新的电子邮件通知的要求
-ListOfActiveNotifications=列出所有有效的电子邮件通知要求
+AddNewNotification=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
ListOfNotificationsDone=列出所有发送电子邮件通知
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index b1dbdf62e7c04b629114a58cdb244ce3cd1fcfad..6829f2fb3463610621a10fbbabe6c9d038b0b94d 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=无法找到用户<b>%s</b>在Dolibarr数
ErrorNoVATRateDefinedForSellerCountry=错误，没有增值税税率确定为国家'%s'的。
ErrorNoSocialContributionForSellerCountry=错误，没有社会贡献类型定义为国家'%s'的。
ErrorFailedToSaveFile=错误，无法保存文件。
-ErrorOnlyPngJpgSupported=错误，只。PNG和。jpg图像文件格式支持。
-ErrorImageFormatNotSupported=你的PHP不支持函数来转换这种格式的图像。
SetDate=Set date
SelectDate=Select a date
SeeAlso=另请参阅 %s
BackgroundColorByDefault=默认的背景颜色
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
FileWasNotUploaded=一个文件被选中的附件，但还没有上传。点击“附加文件”为这一点。
NbOfEntries=铌条目
GoToWikiHelpPage=在线阅读帮助（需要互联网接入）
@@ -266,6 +266,7 @@ Afternoon=Afternoon
Quadri=夸德里
MonthOfDay=本月的一天
HourShort=Ĥ
+MinuteShort=mn
Rate=率
UseLocalTax=含税
Bytes=字节
@@ -340,6 +341,7 @@ FullList=全部列表
Statistics=统计
OtherStatistics=其他统计
Status=状态
+Favorite=Favorite
ShortInfo=信息。
Ref=号码
RefSupplier=号。供应商
@@ -365,6 +367,7 @@ ActionsOnCompany=关于这个第三方的行动
ActionsOnMember=有关此成员的活动
NActions=%s的行动
NActionsLate=%s的后期
+RequestAlreadyDone=Request already recorded
Filter=过滤器
RemoveFilter=删除过滤器
ChartGenerated=图表生成
@@ -645,6 +648,7 @@ OptionalFieldsSetup=额外的属性设置
URLPhoto=照片/徽标的URL
SetLinkToThirdParty=链接到另一个第三方
CreateDraft=创建草案
+SetToDraft=Back to draft
ClickToEdit=单击“编辑”
ObjectDeleted=删除对象%s
ByCountry=按国家
@@ -678,7 +682,7 @@ ViewPrivateNote=View notes
XMoreLines=%s line(s) hidden
PublicUrl=Public URL
AddBox=Add box
-
+SelectElementAndClickRefresh=Select an element and click Refresh
# Week day
Monday=星期一
Tuesday=星期二
diff --git a/htdocs/langs/zh_CN/margins.lang b/htdocs/langs/zh_CN/margins.lang
index 1d90b4bc87130ff6b678919c0c03f504087ea2fb..c348b54732125980261d46d75e768c50f05b02a2 100644
--- a/htdocs/langs/zh_CN/margins.lang
+++ b/htdocs/langs/zh_CN/margins.lang
@@ -10,24 +10,18 @@ MarkRate=Mark rate
DisplayMarginRates=Display margin rates
DisplayMarkRates=Display mark rates
InputPrice=Input price
-
margin=Profit margins management
margesSetup=Profit margins management setup
-
MarginDetails=Margin details
-
ProductMargins=Product margins
CustomerMargins=Customer margins
SalesRepresentativeMargins=Sales representative margins
-
ProductService=产品/服务
AllProducts=All products and services
ChooseProduct/Service=Choose product or service
-
StartDate=开始日期
EndDate=结束日期
Launch=开始
-
ForceBuyingPriceIfNull=Force buying price if null
ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0)
MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
@@ -35,16 +29,16 @@ UseDiscountAsProduct=As a product
UseDiscountAsService=As a service
UseDiscountOnTotal=On subtotal
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
-
MARGIN_TYPE=Margin type
MargeBrute=Raw margin
MargeNette=Net margin
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - Cost price
-
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
Charges=Charges
-
AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/zh_CN/orders.lang b/htdocs/langs/zh_CN/orders.lang
index 4b5b283cb473bae51941f16794caee69d6155348..02ee548183d8ba6ed39d9a136066b06df44a332f 100644
--- a/htdocs/langs/zh_CN/orders.lang
+++ b/htdocs/langs/zh_CN/orders.lang
@@ -1,6 +1,6 @@
# Dolibarr language file - Source file is en_US - orders
OrdersArea=客户订单区
-SuppliersOrdersArea=供应商的订单区
+SuppliersOrdersArea=供应商订单区
OrderCard=订购卡
OrderId=订单编号
Order=订单
@@ -8,7 +8,7 @@ Orders=订单
OrderLine=在线订单
OrderFollow=跟进
OrderDate=订购日期
-OrderToProcess=为了处理
+OrderToProcess=待处理订单
NewOrder=新订单
ToOrder=订单填写
MakeOrder=订单填写
@@ -18,133 +18,133 @@ SuppliersOrdersRunning=当前供应商的订单
CustomerOrder=客户订单
CustomersOrders=客户的订单
CustomersOrdersRunning=当前客户的订单
-CustomersOrdersAndOrdersLines=客户的订单，订单的行
-OrdersToValid=常规验证
-OrdersToBill=比尔订单
-OrdersInProcess=订单流程
-OrdersToProcess=订单处理
-SuppliersOrdersToProcess=供应商的订单处理
-StatusOrderCanceledShort=取消
+CustomersOrdersAndOrdersLines=客户订单和订单行
+OrdersToValid=客户订单验证
+OrdersToBill=已发货订单
+OrdersInProcess=处理中的客户订单
+OrdersToProcess=待处理客户订单
+SuppliersOrdersToProcess=待处理供应商订单
+StatusOrderCanceledShort=已取消
StatusOrderDraftShort=草案
-StatusOrderValidatedShort=验证
-StatusOrderSentShort=在过程
-StatusOrderSent=出货过程中
+StatusOrderValidatedShort=已验证
+StatusOrderSentShort=处理中
+StatusOrderSent=船运处理中
StatusOrderOnProcessShort=论过程
-StatusOrderProcessedShort=加工
-StatusOrderToBillShort=为了法案
-StatusOrderToBill2Short=为了法案
-StatusOrderApprovedShort=核准
-StatusOrderRefusedShort=拒绝
-StatusOrderToProcessShort=要处理
-StatusOrderReceivedPartiallyShort=部分接受
-StatusOrderReceivedAllShort=一切都收到
-StatusOrderCanceled=取消
+StatusOrderProcessedShort=处理中
+StatusOrderToBillShort=已递送
+StatusOrderToBill2Short=待付账
+StatusOrderApprovedShort=已核准
+StatusOrderRefusedShort=已拒绝
+StatusOrderToProcessShort=待处理
+StatusOrderReceivedPartiallyShort=部分收到
+StatusOrderReceivedAllShort=全部收到
+StatusOrderCanceled=已取消
StatusOrderDraft=草案（需要验证）
-StatusOrderValidated=验证
-StatusOrderOnProcess=论过程
-StatusOrderProcessed=加工
-StatusOrderToBill=为了法案
-StatusOrderToBill2=为了法案
-StatusOrderApproved=核准
-StatusOrderRefused=拒绝
-StatusOrderReceivedPartially=部分接受
-StatusOrderReceivedAll=一切都收到
-ShippingExist=A货存在
-DraftOrWaitingApproved=草案尚未下令或批准
-DraftOrWaitingShipped=草案或审定尚未运
-MenuOrdersToBill=比尔订单
-MenuOrdersToBill2=订单票据
-SearchOrder=搜索顺序
-SearchACustomerOrder=Search a customer order
-ShipProduct=船舶产品
+StatusOrderValidated=已验证
+StatusOrderOnProcess=等待接收
+StatusOrderProcessed=已处理
+StatusOrderToBill=已递送
+StatusOrderToBill2=待付账
+StatusOrderApproved=已核准
+StatusOrderRefused=已拒绝
+StatusOrderReceivedPartially=部分收到
+StatusOrderReceivedAll=全部收到
+ShippingExist=航运存在
+DraftOrWaitingApproved=草案或尚未批准的订单
+DraftOrWaitingShipped=草案或尚未验证的船运
+MenuOrdersToBill=已发货订单
+MenuOrdersToBill2=Billable orders
+SearchOrder=搜索订单
+SearchACustomerOrder=搜索一个客户订单
+ShipProduct=航运产品
Discount=折扣
CreateOrder=创建订单
RefuseOrder=拒绝订单
-ApproveOrder=接受命令
-ValidateOrder=为了验证
+ApproveOrder=接受订单
+ValidateOrder=验证订单
UnvalidateOrder=未验证订单
DeleteOrder=删除订单
CancelOrder=取消订单
-AddOrder=添加顺序
+AddOrder=Create order
AddToMyOrders=添加到我的订单
-AddToOtherOrders=添加到其他命令
+AddToOtherOrders=添加到其他订单
AddToDraftOrders=添加订单草案
-ShowOrder=显示顺序
-NoOpenedOrders=没有打开订单
+ShowOrder=显示订单
+NoOpenedOrders=没有打开的订单
NoOtherOpenedOrders=没有其他打开的订单
NoDraftOrders=没有订单草案
-OtherOrders=其他命令
+OtherOrders=其他订单
LastOrders=上次%s的订单
LastModifiedOrders=最后修改%s的订单
-LastClosedOrders=最后%的封闭式订单
+LastClosedOrders=最后关闭的%订单
AllOrders=所有的订单
NbOfOrders=订单号码
-OrdersStatistics=为了统计
+OrdersStatistics=订单统计
OrdersStatisticsSuppliers=供应商的订单统计
NumberOfOrdersByMonth=按月份订单数
AmountOfOrdersByMonthHT=每月订单金额（税后）
ListOfOrders=订单列表
-CloseOrder=关闭命令
-ConfirmCloseOrder=您确定要关闭这个秩序？一旦订单是封闭的，它只能产生帐单。
-ConfirmCloseOrderIfSending=您确定要关闭这个秩序？你必须关闭，只有当所有航运完成的顺序。
-ConfirmDeleteOrder=你确定要删除这个秩序？
+CloseOrder=关闭订单
+ConfirmCloseOrder=您确定要关闭这个订单？一旦订单被关闭，它只能产生帐单。
+ConfirmCloseOrderIfSending=您确定要关闭这个订单？只有当所有航运完成的时候你才必须关闭一个订单。
+ConfirmDeleteOrder=你确定要删除这个订单？
ConfirmValidateOrder=你确定要验证这个原则下，根据名称<b>%s吗</b> ？
-ConfirmUnvalidateOrder=你是否确定要恢复秩序<b>%s</b>草案状态？
+ConfirmUnvalidateOrder=你是否确定要恢复订单<b>%s</b>草案状态？
ConfirmCancelOrder=您确定要取消此订单？
-ConfirmMakeOrder=你一定要确认你这对<b>%的</b>命令？
+ConfirmMakeOrder=你确定你想要生成这个<b>%的</b>订单？
GenerateBill=生成发票
ClassifyShipped=归类"已交付"
ClassifyBilled=归类“已付账”
ComptaCard=会计证
DraftOrders=草案订单
-RelatedOrders=有关命令
-OnProcessOrders=在处理订单
+RelatedOrders=相关订单
+OnProcessOrders=处理中订单
RefOrder=订单号码
RefCustomerOrder=客户订单号
-RefCustomerOrderShort=号。卡斯特。秩序
-SendOrderByMail=为了通过邮件发送
-ActionsOnOrder=订购行动
+RefCustomerOrderShort=客户订单号缩写
+SendOrderByMail=通过邮件发送订单
+ActionsOnOrder=订单上的事件
NoArticleOfTypeProduct=任何类型的产品文章'，以便对这一秩序shippable文章
OrderMode=订购方法
AuthorRequest=要求提交
UseCustomerContactAsOrderRecipientIfExist=如果存在客户联系方式，使用它而不是第三方地址为收件人地址
-RunningOrders=订单的过程
-UserWithApproveOrderGrant=授予了“批准订单”权限的用户。
-PaymentOrderRef=清缴秩序%
+RunningOrders=处理中的订单
+UserWithApproveOrderGrant=授予了“核准订单”权限的用户。
+PaymentOrderRef=订单付款%s
CloneOrder=克隆订单
ConfirmCloneOrder=你确定要克隆这个订单<b>%s吗</b> ？
DispatchSupplierOrder=接收供应商的订单%s
##### Types de contacts #####
-TypeContact_commande_internal_SALESREPFOLL=代表随访客户订单
-TypeContact_commande_internal_SHIPPING=代表随访航运
-TypeContact_commande_external_BILLING=客户发票接触
-TypeContact_commande_external_SHIPPING=客户航运联系
-TypeContact_commande_external_CUSTOMER=客户联系随访秩序
-TypeContact_order_supplier_internal_SALESREPFOLL=代表随访供应商的订单
-TypeContact_order_supplier_internal_SHIPPING=代表随访航运
-TypeContact_order_supplier_external_BILLING=供应商发票接触
-TypeContact_order_supplier_external_SHIPPING=航运供应商联系
-TypeContact_order_supplier_external_CUSTOMER=供应商联系随访秩序
+TypeContact_commande_internal_SALESREPFOLL=代表跟进客户订单
+TypeContact_commande_internal_SHIPPING=代表跟进航运
+TypeContact_commande_external_BILLING=客户发票联系人
+TypeContact_commande_external_SHIPPING=客户航运联系人
+TypeContact_commande_external_CUSTOMER=客户跟进订单联系人
+TypeContact_order_supplier_internal_SALESREPFOLL=代表跟进供应商订单
+TypeContact_order_supplier_internal_SHIPPING=代表跟进航运
+TypeContact_order_supplier_external_BILLING=供应商发票联系人
+TypeContact_order_supplier_external_SHIPPING=供应商航运联系人
+TypeContact_order_supplier_external_CUSTOMER=供应商跟进订单联系人
-Error_COMMANDE_SUPPLIER_ADDON_NotDefined=常COMMANDE_SUPPLIER_ADDON没有定义
-Error_COMMANDE_ADDON_NotDefined=常COMMANDE_ADDON没有定义
+Error_COMMANDE_SUPPLIER_ADDON_NotDefined=常量COMMANDE_SUPPLIER_ADDON没有定义
+Error_COMMANDE_ADDON_NotDefined=常量COMMANDE_ADDON没有定义
Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=无法加载模块文件'%s'的
Error_FailedToLoad_COMMANDE_ADDON_File=无法加载模块文件'%s'的
Error_OrderNotChecked=没有订单发票选择
# Sources
-OrderSource0=商业建议
+OrderSource0=报价单
OrderSource1=因特网
OrderSource2=邮件活动
-OrderSource3=电话的宣传运动，
+OrderSource3=电话宣传运动
OrderSource4=传真活动
-OrderSource5=商业
+OrderSource5=广告
OrderSource6=商店
QtyOrdered=订购数量
AddDeliveryCostLine=添加交货成本线，显示该命令的重量
# Documents models
PDFEinsteinDescription=一个完整的命令模式（logo. ..）
PDFEdisonDescription=一份简单的订购模式
-PDFProformaDescription=A complete proforma invoice (logo…)
+PDFProformaDescription=完整的预开发票(标志...)
# Orders modes
OrderByMail=邮件
OrderByFax=传真
@@ -153,11 +153,10 @@ OrderByWWW=在线
OrderByPhone=电话
CreateInvoiceForThisCustomer=计费订单
NoOrdersToInvoice=没有订单计费
-CloseProcessedOrdersAutomatically=分类“处理”所有选定的订单。
-MenuOrdersToBill2=订单票据
+CloseProcessedOrdersAutomatically=归类所有“已处理”的订单。
OrderCreation=创建订单
-Ordered=有序
+Ordered=已下单
OrderCreated=您的订单已创建
OrderFail=您的订单创建期间发生了错误
CreateOrders=创建订单
-ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+ToBillSeveralOrderSelectCustomer=要为多个订单创建一张发票, 首先点击客户，然后选择 "%s".
diff --git a/htdocs/langs/zh_CN/oscommerce.lang b/htdocs/langs/zh_CN/oscommerce.lang
deleted file mode 100644
index 58838b8203844ffa954e4bac5d564f1c0e8d71ac..0000000000000000000000000000000000000000
--- a/htdocs/langs/zh_CN/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=商务部操作系统
-OSCommerceSetup=商务部模块安装操作系统
-OSCommerceSetupSaved=商务部操作系统设置保存
-OSCommerceServer=商业服务器操作系统的主机/ IP
-OSCommerceDatabaseName=操作系统商业数据库的名称
-OSCommercePrefix=操作系统商务部表前缀
-OSCommerceUser=操作系统商业数据库登录
diff --git a/htdocs/langs/zh_CN/other.lang b/htdocs/langs/zh_CN/other.lang
index 246160b982f70c70c982ca7ed8c19e7779e1c99f..87e6584b4d6ea8045bd371419aed04ced0592f23 100644
--- a/htdocs/langs/zh_CN/other.lang
+++ b/htdocs/langs/zh_CN/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=安全代码
Calendar=日历
-AddTrip=添加行程
Tools=工具
ToolsDesc=这个区域是专门用于杂项工具组到其他菜单项。 <br><br>这些工具可以达到从侧面菜单。
Birthday=生日
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation
Notify_TASK_CREATE=Task created
Notify_TASK_MODIFY=Task modified
Notify_TASK_DELETE=Task deleted
+SeeModuleSetup=See module setup
NbOfAttachedFiles=所附文件数/文件
TotalSizeOfAttachedFiles=所附文件的总大小/文件
MaxSize=最大尺寸
@@ -80,6 +80,16 @@ ModifiedBy=由%改性s
ValidatedBy=由%验证s
CanceledBy=由%s已取消
ClosedBy=由%闭s
+CreatedById=User id who created
+ModifiedById=User id who made last change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made last change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
FileWasRemoved=档案%s被删除
DirWasRemoved=目录%s被删除
FeatureNotYetAvailableShort=在下一版本可用
@@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your
##### Calendar common #####
AddCalendarEntry=日历项中添加%s的
-NewCompanyToDolibarr=%s的公司加入Dolibarr
-ContractValidatedInDolibarr=%s的验证合同中Dolibarr
-ContractCanceledInDolibarr=%s的合同取消Dolibarr
-ContractClosedInDolibarr=%s的合同在Dolibarr关闭
-PropalClosedSignedInDolibarr=建议%s的签署Dolibarr
-PropalClosedRefusedInDolibarr=建议%s的拒绝在Dolibarr
-PropalValidatedInDolibarr=建议在Dolibarr%s的验证
-InvoiceValidatedInDolibarr=%s的验证发票在Dolibarr
-InvoicePaidInDolibarr=发票%s的改变Dolibarr支付
-InvoiceCanceledInDolibarr=%s的发票取消Dolibarr
-PaymentDoneInDolibarr=%s的支付做Dolibarr
-CustomerPaymentDoneInDolibarr=%s的客户付款做Dolibarr
-SupplierPaymentDoneInDolibarr=%s的供应商付款做Dolibarr
-MemberValidatedInDolibarr=成员%s验证在Dolibarr
-MemberResiliatedInDolibarr=成员%s resiliated在Dolibarr
-MemberDeletedInDolibarr=成员%s删除Dolibarr
-MemberSubscriptionAddedInDolibarr=对成员%认购s加入Dolibarr
-ShipmentValidatedInDolibarr=运费%s在Dolibarr验证
-ShipmentDeletedInDolibarr=从Dolibarr删除 %s 出货
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
##### Export #####
Export=出口
ExportsArea=出口地区
diff --git a/htdocs/langs/zh_CN/paybox.lang b/htdocs/langs/zh_CN/paybox.lang
index 119119f7b2e06774a97f2af78fd0b1fa4533a50e..be6470eb12885312faa2345643ebaecb2db7a3ad 100644
--- a/htdocs/langs/zh_CN/paybox.lang
+++ b/htdocs/langs/zh_CN/paybox.lang
@@ -35,3 +35,6 @@ MessageKO=取消支付返回页面的讯息
NewPayboxPaymentReceived=新的出纳收到货款
NewPayboxPaymentFailed=新的出纳支付的尝试，但未能
PAYBOX_PAYONLINE_SENDEMAIL=电子邮件提醒后付款（成功或失败）
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/zh_CN/resource.lang b/htdocs/langs/zh_CN/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..d64075dfbf595897a63e3eebf19194d8f71030dd
--- /dev/null
+++ b/htdocs/langs/zh_CN/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
diff --git a/htdocs/langs/zh_CN/sendings.lang b/htdocs/langs/zh_CN/sendings.lang
index 1665ecc81374f0008dc951bd509cda998ac36594..b3b6e2e2c1be5ec2cdef74565de52a0db2698910 100644
--- a/htdocs/langs/zh_CN/sendings.lang
+++ b/htdocs/langs/zh_CN/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=就目前而言，建立一个新的装运完成
RelatedShippings=相关运送
ShipmentLine=航线
CarrierList=转运列表
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
# Sending methods
SendingMethodCATCH=按客户捕捉
diff --git a/htdocs/langs/zh_CN/stocks.lang b/htdocs/langs/zh_CN/stocks.lang
index d31e76ce60f6a6230a977ef0df08c05dcf1644f8..8c7df3be823ef4e25e0945c52aec476de2df2d9e 100644
--- a/htdocs/langs/zh_CN/stocks.lang
+++ b/htdocs/langs/zh_CN/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=仓库标签要求
CorrectStock=正确的股票
ListOfWarehouses=仓库名单
ListOfStockMovements=名单的股票走势
-StocksArea=股票区
+StocksArea=Warehouses area
Location=位置
LocationSummary=短名称位置
NumberOfDifferentProducts=不同的产品数
diff --git a/htdocs/langs/zh_CN/users.lang b/htdocs/langs/zh_CN/users.lang
index 592ca9fe45e224504b822371b2b9f609aa5d1acd..ba1a3ecec4db14048b2399b9edda617f63e666f6 100644
--- a/htdocs/langs/zh_CN/users.lang
+++ b/htdocs/langs/zh_CN/users.lang
@@ -63,7 +63,6 @@ ShowGroup=显示组
ShowUser=显示用户
NonAffectedUsers=非受影响的用户
UserModified=用户修改成功
-GroupModified=集团修改成功
PhotoFile=图片档案
UserWithDolibarrAccess=与Dolibarr用户访问
ListOfUsersInGroup=在这个名单的用户组
@@ -103,7 +102,7 @@ UserDisabled=用户%s禁用
UserEnabled=用户%s启动
UserDeleted=使用者%s删除
NewGroupCreated=集团创建%s的
-GroupModified=集团修改成功
+GroupModified=Group %s modified
GroupDeleted=群组%s删除
ConfirmCreateContact=你确定要为此创造联系Dolibarr帐户？
ConfirmCreateLogin=你确定要创建该成员成为Dolibarr帐户？
@@ -114,8 +113,10 @@ YourRole=您的角色
YourQuotaOfUsersIsReached=你的活跃用户达到配额！
NbOfUsers=NB用户
DontDowngradeSuperAdmin=只有超级管理员可以降级超级管理员
-HierarchicalResponsible=责任分级
+HierarchicalResponsible=Supervisor
HierarchicView=分层视图
UseTypeFieldToChange=改变用户字段类型
OpenIDURL=OpenID URL
LoginUsingOpenID=Use OpenID to login
+WeeklyHours=Weekly hours
+ColorUser=Color of the user
diff --git a/htdocs/langs/zh_CN/withdrawals.lang b/htdocs/langs/zh_CN/withdrawals.lang
index 46a24c5c759a7fa92a3552a45bac24847a958da1..0c7d34a38f552992971ad7e99932a0605d249cae 100644
--- a/htdocs/langs/zh_CN/withdrawals.lang
+++ b/htdocs/langs/zh_CN/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=收据
LastWithdrawalReceipts=最后%s撤出收益
WithdrawedBills=撤回发票
WithdrawalsLines=提款线
-RequestStandingOrderToTreat=要求会议常规治疗
-RequestStandingOrderTreated=站在请求处理的订单
+RequestStandingOrderToTreat=Request for standing orders to process
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=站在客户的订单
CustomerStandingOrder=客户的长期订单
NbOfInvoiceToWithdraw=可撤消请求发票数目
@@ -40,14 +41,13 @@ TransMetod=传输的方法
Send=发送
Lines=线路
StandingOrderReject=发出拒绝
-InvoiceRefused=负责对客户拒绝
WithdrawalRefused=提款Refuseds
WithdrawalRefusedConfirm=你确定要输入一个社会拒绝撤出
RefusedData=日期拒收
RefusedReason=拒绝的原因
RefusedInvoicing=帐单拒绝
NoInvoiceRefused=拒绝不收
-InvoiceRefused=负责对客户拒绝
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=地位
StatusUnknown=未知
StatusWaiting=等候
@@ -76,7 +76,7 @@ WithBankUsingRIB=有关银行账户，使用肋
WithBankUsingBANBIC=使用的IBAN / BIC / SWIFT的银行帐户
BankToReceiveWithdraw=银行帐户，以接收退出
CreditDate=信贷
-WithdrawalFileNotCapable=无法生成撤出贵国收到文件
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
ShowWithdraw=显示撤柜
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=然而，如果发票已至少有一个撤出支付尚未处理的，它不会被设置为支付最高允许管理撤出之前。
DoStandingOrdersBeforePayments=这个标签允许你为一个固定的订单要求。一旦完成，你可以键入付款，收发票。
diff --git a/htdocs/langs/zh_TW/accountancy.lang b/htdocs/langs/zh_TW/accountancy.lang
index 8cab9d2b651d75b0721d76fda619e2034e4509b4..39c2732ec29852cf93d41614ed1812c2a4c1ce4f 100644
--- a/htdocs/langs/zh_TW/accountancy.lang
+++ b/htdocs/langs/zh_TW/accountancy.lang
@@ -25,12 +25,12 @@ Selectchartofaccounts=Select a chart of accounts
Validate=Validate
Addanaccount=Add an accounting account
AccountAccounting=Accounting account
-Ventilation=Ventilation
+Ventilation=Breakdown
ToDispatch=To dispatch
Dispatched=Dispatched
-CustomersVentilation=Ventilation customers
-SuppliersVentilation=Ventilation suppliers
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
TradeMargin=Trade margin
Reports=Reports
ByCustomerInvoice=By invoices customers
@@ -45,9 +45,9 @@ WriteBookKeeping=Record accounts in general ledger
Bookkeeping=General ledger
AccountBalanceByMonth=Account balance by month
-AccountingVentilation=Accounting ventilation
-AccountingVentilationSupplier=Accounting ventilation supplier
-AccountingVentilationCustomer=Accounting ventilation customer
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
Line=Line
CAHTF=Total purchase supplier HT
@@ -56,7 +56,7 @@ InvoiceLinesDone=Ventilated lines of invoice
IntoAccount=In the accounting account
Ventilate=Ventilate
-VentilationAuto=Automatic ventilation
+VentilationAuto=Automatic breakdown
Processing=Processing
EndProcessing=The end of processing
@@ -68,9 +68,9 @@ NotVentilatedinAccount=Not ventilated in the accounting account
ACCOUNTING_SEPARATORCSV=Separator CSV
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
@@ -140,14 +140,14 @@ Active=Statement
NewFiscalYear=New fiscal year
-DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
TotalVente=Total turnover HT
TotalMarge=Total sales margin
DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
ChangeAccount=Change the accounting account for lines selected by the account:
Vide=-
-DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
@@ -155,4 +155,4 @@ ValidateHistory=Validate Automatically
ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-FicheVentilation=Ventilation card
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index 09d12f227e3ea735cddd1e3098269b2d70952393..001aa613e7eb4aa515fc4cf230119e284e4b5228 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -437,8 +437,8 @@ Module52Name=庫存
Module52Desc=產品庫存的管理
Module53Name=服務
Module53Desc=服務的管理
-Module54Name=合同
-Module54Desc=合同的和服務的管理
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=條碼
Module55Desc=條碼的管理
Module56Name=電話
@@ -475,8 +475,8 @@ Module320Name=RSS饋送
Module320Desc=添加RSS飼料內Dolibarr屏幕頁面
Module330Name=書籤
Module330Desc=書籤的管理
-Module400Name=項目
-Module400Desc=項目的其他模組內部管理
+Module400Name=Projects/Opportunity
+Module400Desc=Management of projects or opportunity. You can then assign all other elements (invoice, order, proposal, intervention, ...) to this projects
Module410Name=Webcalendar
Module410Desc=Webcalendar一體化
Module500Name=Special expenses (tax, social contributions, dividends)
@@ -484,7 +484,7 @@ Module500Desc=Management of special expenses like taxes, social contribution, di
Module510Name=Salaries
Module510Desc=Management of employees salaries and payments
Module600Name=通知
-Module600Desc=由一些商業活動的電子郵件發送Dolibarr通知給第三方的交往
+Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=捐贈
Module700Desc=捐款的管理
Module1200Name=螂
@@ -514,16 +514,16 @@ Module5000Name=多公司
Module5000Desc=允許你管理多個公司
Module6000Name=Workflow
Module6000Desc=Workflow management
-Module20000Name=Holidays
-Module20000Desc=Declare and follow employees holidays
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
Module39000Name=Product batch
Module39000Desc=Batch number, eat-by and sell-by date management on products
Module50000Name=出納
Module50000Desc=模組提供信用卡網上支付頁面與出納
Module50100Name=銷售點
Module50100Desc=銷售點模組
-Module50200Name= 貝寶
-Module50200Desc= 模組提供信用卡與Paypal網上支付頁面
+Module50200Name=貝寶
+Module50200Desc=模組提供信用卡與Paypal網上支付頁面
Module50400Name=Accounting (advanced)
Module50400Desc=Accounting management (double parties)
Module54000Name=PrintIPP
@@ -606,15 +606,16 @@ Permission151=閲讀常年訂單
Permission152=安裝常年訂單
Permission153=閲讀常年訂單收據
Permission154=信貸/拒絶站在訂單收據
-Permission161=看看合同
-Permission162=建立/修改合約
-Permission163=啟動了一個服務合同
-Permission164=禁用服務的合同
-Permission165=刪除合同
-Permission171=閲讀人次
-Permission172=建立/修改行程
-Permission173=刪除人次
-Permission178=出口旅行
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Read trips and expenses (own and his subordinates)
+Permission172=Create/modify trips and expenses
+Permission173=Delete trips and expenses
+Permission174=Read all trips and expenses
+Permission178=Export trips and expenses
Permission180=讀取供應商資訊
Permission181=讀取供應商訂單
Permission182=建立/修改供應商訂單
@@ -671,7 +672,7 @@ Permission300=讀取條碼
Permission301=建立/修改條碼
Permission302=刪除條碼
Permission311=閲讀服務
-Permission312=指定的服務合約
+Permission312=Assign service/subscription to contract
Permission331=閲讀書籤
Permission332=建立/修改書籤
Permission333=刪除書籤
@@ -701,8 +702,8 @@ Permission701=閲讀捐款
Permission702=建立/修改捐款
Permission703=刪除捐款
Permission1001=讀取庫存資訊
-Permission1002=建立/修改庫存資訊
-Permission1003=刪除庫存資訊
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
Permission1004=讀取庫存的轉讓資訊
Permission1005=建立/修改庫存轉讓
Permission1101=讀取交貨訂單
@@ -1038,7 +1039,6 @@ YesInSummer=Yes in summer
OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
SuhosinSessionEncrypt=Session storage encrypted by Suhosin
ConditionIsCurrently=Condition is currently %s
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
YouUseBestDriver=You use driver %s that is best driver available currently.
YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization.
@@ -1074,7 +1074,7 @@ ModuleCompanyCodeAquarium=根據以下編碼原則返回會計編號: <br>以 %s
ModuleCompanyCodePanicum=只會回傳一個空的會計編號
ModuleCompanyCodeDigitaria=會計代碼依賴於第三方的代碼。該代碼是字元組成的“C”的第一個位置的前5第三方代碼字元之後。
UseNotifications=使用通知
-NotificationsDesc=電子郵件通知功能，您可以靜靜地發送自動郵件，對於一些Dolibarr活動時，（客戶或供應商）被配置給第三方。主動通知和作出選擇的目標聯繫在一次第三方。
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
ModelModules=文件範本
DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
WatermarkOnDraft=在草稿文件上產生浮水印字串(如果以下文字框不是空字串)
@@ -1138,6 +1138,7 @@ AddDeliveryAddressAbility=添加交付日期的能力
UseOptionLineIfNoQuantity=一個產品線/服務的，是作為一個選項視為零的數額
FreeLegalTextOnProposal=可在下面輸入額外的建議書資訊
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
##### Orders #####
OrdersSetup=設定訂單管理模組
OrdersNumberingModules=訂單編號模組
@@ -1146,6 +1147,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list
ValidOrderAfterPropalClosed=為了驗證該命令後，建議密切，使得它可以不一步的臨時命令
FreeLegalTextOnOrders=可在下面輸入額外的訂單資訊
WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
##### Clicktodial #####
ClickToDialSetup=點擊撥號模組設置
ClickToDialUrlDesc=連結時調用一個電話象形點擊完成。丹斯l'網址，vous pouvez utiliser萊balises <br> <b>%%1 $ s的</b>誇血清remplacé電話桿樂德l' appelé <br> <b>%%2 $ s的</b>誇血清remplacé電話桿樂德l' appelant（樂votre） <br> <b>%%3 $ s的</b>誇血清remplacé桿votre登錄clicktodial（定義所涵蓋河畔votre膠片utilisateur） <br> <b>%%4 $ s的</b>誇血清remplacé桿votre摩托羅拉德過時clicktodial（定義所涵蓋河畔votre膠片utilisateur）。
@@ -1158,7 +1160,7 @@ FicheinterNumberingModules=干預編號模組
TemplatePDFInterventions=干預卡文件模式
WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
##### Contracts #####
-ContractsSetup=合同模組的設置
+ContractsSetup=Contracts/Subscriptions module setup
ContractsNumberingModules=合同編號模組
TemplatePDFContracts=Contracts documents models
FreeLegalTextOnContracts=Free text on contracts
@@ -1322,7 +1324,7 @@ FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
CacheByServer=Cache by server
CacheByClient=Cache by browser
CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
ProductSetup=產品模組設置
ServiceSetup=服務模組的設置
@@ -1382,9 +1384,10 @@ MailingSetup=設定電子郵件發送模組
MailingEMailFrom=發件人的電子郵件（從）為通過電子郵件發送電子郵件模組
MailingEMailError=回電子郵件（錯誤對），與錯誤的電子郵件
##### Notification #####
-NotificationSetup=模組設置電子郵件通知府
+NotificationSetup=EMail notification module setup
NotificationEMailFrom=發件人的電子郵件（從）為發送通知郵件
-ListOfAvailableNotifications=可用的通知名單（此名單上激活的模組依賴）
+ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+FixedEmailTarget=Fixed email target
##### Sendings #####
SendingsSetup=設定出貨單模組
SendingsReceiptModel=出貨單據範本
@@ -1412,8 +1415,9 @@ OSCommerceTestOk=連接到服務器'%s'於資料庫'用戶'%s'的%s'的成功。
OSCommerceTestKo1=連接到服務器'%s'的成功，但是數據庫'%s'的無法達成。
OSCommerceTestKo2=連接到服務器'%s的與用戶'%s'的失敗。
##### Stock #####
-StockSetup=庫存模組設置
-UserWarehouse=使用用戶的個人股票
+StockSetup=Warehouse module setup
+UserWarehouse=Use user personal warehouses
+IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
##### Menu #####
MenuDeleted=選單中刪除
TreeMenu=樹選單
@@ -1478,11 +1482,14 @@ ClickToDialDesc=這個模組允許添加後Dolibarr聯繫電話號碼的圖標
##### Point Of Sales (CashDesk) #####
CashDesk=銷售點
CashDeskSetup=模組設置的銷售點
-CashDeskThirdPartyForSell=通用第三方使用銷售
+CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=帳戶用於接收現金付款
CashDeskBankAccountForCheque= 帳戶用於接收支票付款
CashDeskBankAccountForCB= 帳戶用於接收信用卡支付現金
-CashDeskIdWareHouse=倉庫使用銷售
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
+StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=模組設置書籤
BookmarkDesc=這個模組允許您管理書籤。您還可以添加快捷方式到任何Dolibarr網頁或在您的左邊菜單externale網站。
@@ -1535,6 +1542,14 @@ DeleteFiscalYear=Delete fiscal year
ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
Opened=Opened
Closed=Closed
-
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+NbMajMin=Minimum number of uppercase characters
+NbNumMin=Minimum number of numeric characters
+NbSpeMin=Minimum number of special characters
+NbIteConsecutive=Maximum number of repeating same characters
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
diff --git a/htdocs/langs/zh_TW/agenda.lang b/htdocs/langs/zh_TW/agenda.lang
index 7d9a577b157b339dba29e2509179fd8475e93ae8..eaa4f1ff00de03fd6129d7fcf80b2ca7cf5964fc 100644
--- a/htdocs/langs/zh_TW/agenda.lang
+++ b/htdocs/langs/zh_TW/agenda.lang
@@ -41,9 +41,10 @@ AutoActions= 全自動灌裝議程
AgendaAutoActionDesc= 在此事件定義為要Dolibarr自動創建一個議程的行動。如果沒有被選中（默認情況下），只有手動操作將被列入議程。
AgendaSetupOtherDesc= 這頁允許配置議程模塊其他參數。
AgendaExtSitesDesc=此頁面允許申報日歷的外部來源，以他們的活動看到到Dolibarr議程。
-ActionsEvents= 為此Dolibarr活動將創建一個自動行動議程
-PropalValidatedInDolibarr= 建議%s的驗證
-InvoiceValidatedInDolibarr= 發票%s的驗證
+ActionsEvents=為此Dolibarr活動將創建一個自動行動議程
+PropalValidatedInDolibarr=建議%s的驗證
+InvoiceValidatedInDolibarr=發票%s的驗證
+InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
InvoiceBackToDraftInDolibarr=發票的%s去回到草案狀態
InvoiceDeleteDolibarr=Invoice %s deleted
OrderValidatedInDolibarr= 採購訂單%s已驗證
@@ -51,7 +52,6 @@ OrderApprovedInDolibarr=為了%s批準
OrderRefusedInDolibarr=Order %s refused
OrderBackToDraftInDolibarr=為了%s回到草案狀態
OrderCanceledInDolibarr=為了%s取消
-InterventionValidatedInDolibarr=%s的驗證幹預
ProposalSentByEMail=商業建議通過電子郵件發送%s
OrderSentByEMail=客戶訂單通過電子郵件發送%s
InvoiceSentByEMail=客戶發票通過電子郵件發送%s
@@ -59,8 +59,6 @@ SupplierOrderSentByEMail=供應商的訂單通過電子郵件發送%s
SupplierInvoiceSentByEMail=供應商的發票通過電子郵件發送%s
ShippingSentByEMail=通過電子郵件發送的航運%s
ShippingValidated= Shipping %s validated
-InterventionSentByEMail=通過電子郵件發送的幹預%s
-InterventionClassifiedBilled=Intervention %s classified as Billed
NewCompanyToDolibarr= 第三方創建
DateActionPlannedStart= 計劃開始日期
DateActionPlannedEnd= 計劃結束日期
@@ -70,9 +68,9 @@ DateActionStart= 開始日期
DateActionEnd= 結束日期
AgendaUrlOptions1=您還可以添加以下參數來篩選輸出：
AgendaUrlOptions2=<b>login=%s</b>到限制產量以行動來創造，受影響或將使用者 與所做<b>%</b>。
-AgendaUrlOptions3=<b>logina=%s</b>到限制輸出到用戶的操作創建為<b>%</b>。
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
AgendaUrlOptions4=<b>logint=%s</b>到限制輸出到行動<b>使用者與受影響<b>%</b>。
-AgendaUrlOptions5=<b>logind=%s</b>到限制輸出到用戶的行為進行由<b>%</b>。
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
AgendaShowBirthdayEvents=顯示生日的接觸
AgendaHideBirthdayEvents=隱藏生日的接觸
Busy=Busy
@@ -89,5 +87,5 @@ ExtSiteUrlAgenda=URL來訪問。iCal文件
ExtSiteNoLabel=無說明
WorkingTimeRange=Working time range
WorkingDaysRange=Working days range
-AddEvent=Add event
+AddEvent=Create event
MyAvailability=My availability
diff --git a/htdocs/langs/zh_TW/bills.lang b/htdocs/langs/zh_TW/bills.lang
index 795fea0ec9cec5ec92afb8e3fb81c2c12b9f3b8b..1674ff158abe373c91f34d536af11f87a9869d41 100644
--- a/htdocs/langs/zh_TW/bills.lang
+++ b/htdocs/langs/zh_TW/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=信用票據
InvoiceAvoirAsk=信用註意糾正發票
InvoiceAvoirDesc=<b>信貸說明</b>是一種消極的發票用來解決一個事實，即發票已繳納的數額相差實在比額（因為顧客付出太多的錯誤，例如將不支付或完全因為他歸還了部分產品）。
invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
-invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
ReplaceInvoice=替換%s的發票
ReplacementInvoice=更換發票
ReplacedByInvoice=按發票取代%s
@@ -87,7 +87,7 @@ ClassifyCanceled=分類'遺棄'
ClassifyClosed=分類'關閉'
ClassifyUnBilled=Classify 'Unbilled'
CreateBill=建立發票
-AddBill=新增發票(invoice)或票據(credit note)
+AddBill=Create invoice or credit note
AddToDraftInvoices=Add to draft invoice
DeleteBill=刪除發票
SearchACustomerInvoice=搜尋客戶發票
@@ -99,7 +99,7 @@ DoPaymentBack=不要付款回
ConvertToReduc=轉換到未來的折扣
EnterPaymentReceivedFromCustomer=輸入從客戶收到付款
EnterPaymentDueToCustomer=由於客戶的付款
-DisabledBecauseRemainderToPayIsZero=禁用，因為其余部分支付為零
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
Amount=總額
PriceBase=價格基準
BillStatus=發票狀態
@@ -137,8 +137,6 @@ BillFrom=From
BillTo=Bill To
ActionsOnBill=行動對發票
NewBill=新建發票(invoice)
-Prélèvements=長期訂單
-Prélèvements=長期訂單
LastBills=上次%s的發票
LastCustomersBills=上次%s的客戶發票
LastSuppliersBills=上次%s的供應商發票
@@ -156,9 +154,9 @@ ConfirmCancelBill=你確定要取消發票<b>%s嗎</b> ？
ConfirmCancelBillQuestion=你為什麽要這樣分類發票'放棄'？
ConfirmClassifyPaidPartially=您確定要更改<b>%s</b>的地位發票支付？
ConfirmClassifyPaidPartiallyQuestion=這發票尚未完全支付。是什麽原因讓你關閉此發票？
-ConfirmClassifyPaidPartiallyReasonAvoir=其余部分支付<b>（%s的%s）</b>是一個折扣，因為獲得付款之前任期。我註意到規範使用信用卡的增值稅。
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=其余部分支付<b>（%s的%s）</b>是一個折扣，因為獲得付款之前任期。我接受失去這個折扣的增值稅。
-ConfirmClassifyPaidPartiallyReasonDiscountVat=其余部分支付<b>（%s的%s）</b>是一個折扣，因為獲得付款之前任期。我在此折扣不恢復信貸註意到增值稅。
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
ConfirmClassifyPaidPartiallyReasonBadCustomer=壞顧客
ConfirmClassifyPaidPartiallyReasonProductReturned=產品部分返回
ConfirmClassifyPaidPartiallyReasonOther=其他原因而放棄額
@@ -191,9 +189,9 @@ AlreadyPaid=已支付
AlreadyPaidBack=Already paid back
AlreadyPaidNoCreditNotesNoDeposits=已支付（無信用票據及存款）
Abandoned=棄
-RemainderToPay=未支付
-RemainderToTake=其余部分采取
-RemainderToPayBack=Remainder to pay back
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
Rest=Pending
AmountExpected=索賠額
ExcessReceived=收到過剩
@@ -219,19 +217,18 @@ NoInvoice=沒有任何發票(invoice)
ClassifyBill=分類發票
SupplierBillsToPay=待付款的供應商發票
CustomerBillsUnpaid=客戶未付款的發票
-DispenseMontantLettres=由mechanographical是從字母順序豁免起草的法案
-DispenseMontantLettres=由mechanographical是從字母順序豁免起草的法案
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=非可收回
SetConditions=設置付款條件
SetMode=設置支付方式
Billed=帳單
-RepeatableInvoice=事先定義的發票
-RepeatableInvoices=事先定義的發票清單
-Repeatable=事先定義
-Repeatables=事先定義
-ChangeIntoRepeatableInvoice=轉換成預先定義
-CreateRepeatableInvoice=建立預先定義的發票
-CreateFromRepeatableInvoice=創建從預先定義的發票
+RepeatableInvoice=Template invoice
+RepeatableInvoices=Template invoices
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Convert into template invoice
+CreateRepeatableInvoice=Create template invoice
+CreateFromRepeatableInvoice=Create from template invoice
CustomersInvoicesAndInvoiceLines=客戶發票和發票的路線
CustomersInvoicesAndPayments=客戶發票和付款
ExportDataset_invoice_1=客戶發票清單和發票的路線
diff --git a/htdocs/langs/zh_TW/categories.lang b/htdocs/langs/zh_TW/categories.lang
index 4642c5a954c4e005461a92e6ae982507040cb146..85497e00361cad39234e74c0a8fb321a7c5c23b4 100644
--- a/htdocs/langs/zh_TW/categories.lang
+++ b/htdocs/langs/zh_TW/categories.lang
@@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories
CatCusLinks=Links between customers/prospects and categories
CatProdLinks=Links between products/services and categories
CatMemberLinks=Links between members and categories
-CatProdLinks=Links between products/services and categories
-CatCusLinks=Links between customers/prospects and categories
-CatSupLinks=Links between suppliers and categories
DeleteFromCat=Remove from category
DeletePicture=Picture delete
ConfirmDeletePicture=Confirm picture deletion?
@@ -112,3 +109,4 @@ CategoriesSetup=Categories setup
CategorieRecursiv=Link with parent category automatically
CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category
diff --git a/htdocs/langs/zh_TW/compta.lang b/htdocs/langs/zh_TW/compta.lang
index d083d28aaf82fe7d372247c9928246fa963f7f46..0550676f5a96bc219da4309301df093953a0f8fc 100644
--- a/htdocs/langs/zh_TW/compta.lang
+++ b/htdocs/langs/zh_TW/compta.lang
@@ -108,6 +108,7 @@ ErrorWrongAccountancyCodeForCompany=壞客戶對會計守則在%
SuppliersProductsSellSalesTurnover=通過對供應商的產品銷售產生營業額。
CheckReceipt=支票存款
CheckReceiptShort=支票存款
+LastCheckReceiptShort=Last %s check receipts
NewCheckReceipt=新優惠
NewCheckDeposit=新的支票存款
NewCheckDepositOn=創建於賬戶上的存款收據：%s的
diff --git a/htdocs/langs/zh_TW/contracts.lang b/htdocs/langs/zh_TW/contracts.lang
index 9d5a60567c592a6f788e3b4d4b7296afa4cd61a5..65b0b67e7faaa5fe09ad1f17d9d613ce38795a71 100644
--- a/htdocs/langs/zh_TW/contracts.lang
+++ b/htdocs/langs/zh_TW/contracts.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=合同區
ListOfContracts=合約名單
-LastContracts=最後%s的修改過的合同
+LastModifiedContracts=Last %s modified contracts
AllContracts=所有合同
ContractCard=合同卡
ContractStatus=合同地位
@@ -27,7 +27,7 @@ MenuRunningServices=正在運行的服務
MenuExpiredServices=過期服務
MenuClosedServices=休息服務
NewContract=新合同
-AddContract=新增合同
+AddContract=Create contract
SearchAContract=搜尋合同
DeleteAContract=刪除合同
CloseAContract=關閉的合同
@@ -53,7 +53,7 @@ ListOfRunningContractsLines=名單合同線運行
ListOfRunningServices=運行服務的列表
NotActivatedServices=不活躍的服務（除驗證合同）
BoardNotActivatedServices=服務激活驗證合同之間
-LastContracts=最後%s的修改過的合同
+LastContracts=Last % contracts
LastActivatedServices=上次%s的激活服務
LastModifiedServices=最後%S修飾服務
EditServiceLine=編輯服務項目
diff --git a/htdocs/langs/zh_TW/cron.lang b/htdocs/langs/zh_TW/cron.lang
index c3e4131b2c8812eabc3d669520460fe17dabf386..04f3929fe1c954d68250953afd4351747de64fcc 100644
--- a/htdocs/langs/zh_TW/cron.lang
+++ b/htdocs/langs/zh_TW/cron.lang
@@ -1,114 +1,86 @@
# Dolibarr language file - Source file is en_US - cron
-#
# About page
-#
About = 關於
-# CronAbout = About Cron
-# CronAboutPage = Cron about page
-
-#
+CronAbout = About Cron
+CronAboutPage = Cron about page
# Right
-#
-# Permission23101 = Read Scheduled task
-# Permission23102 = Create/update Scheduled task
-# Permission23103 = Delete Scheduled task
-# Permission23104 = Execute Scheduled task
-
-#
+Permission23101 = Read Scheduled task
+Permission23102 = Create/update Scheduled task
+Permission23103 = Delete Scheduled task
+Permission23104 = Execute Scheduled task
# Admin
-#
-# CronSetup= Scheduled job management setup
-# URLToLaunchCronJobs=URL to check and launch cron jobs if required
-# OrToLaunchASpecificJob=Or to check and launch a specific job
-# KeyForCronAccess=Security key for URL to launch cron jobs
-# FileToLaunchCronJobs=Command line to launch cron jobs
-# CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes
-# CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
-
-
-#
+CronSetup= Scheduled job management setup
+URLToLaunchCronJobs=URL to check and launch cron jobs if required
+OrToLaunchASpecificJob=Or to check and launch a specific job
+KeyForCronAccess=Security key for URL to launch cron jobs
+FileToLaunchCronJobs=Command line to launch cron jobs
+CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes
+CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
# Menu
-#
-# CronJobs=Scheduled jobs
-# CronListActive= List of active jobs
-# CronListInactive= List of disabled jobs
-# CronListActive= List of active jobs
-
-
-#
+CronJobs=Scheduled jobs
+CronListActive=List of active/scheduled jobs
+CronListInactive=List of disabled jobs
# Page list
-#
-# CronDateLastRun=Last run
-# CronLastOutput=Last run output
-# CronLastResult=Last result code
-# CronListOfCronJobs=List of scheduled jobs
-# CronCommand=Command
-# CronList=Jobs list
-# CronDelete= Delete cron jobs
-# CronConfirmDelete= Are you sure you want to delete this cron job ?
-# CronExecute=Launch job
-# CronConfirmExecute= Are you sure to execute this job now
-# CronInfo= Jobs allow to execute task that have been planned
-# CronWaitingJobs=Wainting jobs
-# CronTask=Job
+CronDateLastRun=Last run
+CronLastOutput=Last run output
+CronLastResult=Last result code
+CronListOfCronJobs=List of scheduled jobs
+CronCommand=Command
+CronList=Jobs list
+CronDelete= Delete cron jobs
+CronConfirmDelete= Are you sure you want to delete this cron job ?
+CronExecute=Launch job
+CronConfirmExecute= Are you sure to execute this job now
+CronInfo= Jobs allow to execute task that have been planned
+CronWaitingJobs=Wainting jobs
+CronTask=Job
CronNone= 無
CronDtStart=開始日期
CronDtEnd=結束日期
-# CronDtNextLaunch=Next execution
-# CronDtLastLaunch=Last execution
-# CronFrequency=Frequancy
-# CronClass=Classe
+CronDtNextLaunch=Next execution
+CronDtLastLaunch=Last execution
+CronFrequency=Frequancy
+CronClass=Classe
CronMethod=方法
CronModule=模組
-# CronAction=Action
+CronAction=Action
CronStatus=地位
CronStatusActive=啟用
CronStatusInactive=已禁用
-# CronNoJobs=No jobs registered
+CronNoJobs=No jobs registered
CronPriority=優先
CronLabel=描述
-# CronNbRun=Nb. launch
-# CronEach=Every
-# JobFinished=Job launched and finished
-
-#
+CronNbRun=Nb. launch
+CronEach=Every
+JobFinished=Job launched and finished
#Page card
-#
-# CronAdd= Add jobs
-# CronHourStart= Start Hour and date of task
-# CronEvery= And execute task each
-# CronObject= Instance/Object to create
+CronAdd= Add jobs
+CronHourStart= Start Hour and date of task
+CronEvery= And execute task each
+CronObject= Instance/Object to create
CronArgs=參數清單
-# CronSaveSucess=Save succesfully
+CronSaveSucess=Save succesfully
CronNote=註解
-# CronFieldMandatory=Fields %s is mandatory
-# CronErrEndDateStartDt=End date cannot be before start date
-# CronStatusActiveBtn=Enable
+CronFieldMandatory=Fields %s is mandatory
+CronErrEndDateStartDt=End date cannot be before start date
+CronStatusActiveBtn=Enable
CronStatusInactiveBtn=禁用
-# CronTaskInactive=This job is disabled
-# CronDtLastResult=Last result date
-# CronId=Id
-# CronClassFile=Classes (filename.class.php)
-# CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-# CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-# CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-# CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is <i>fecth</i>
-# CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-# CronCommandHelp=The system command line to execute.
-
-#
+CronTaskInactive=This job is disabled
+CronDtLastResult=Last result date
+CronId=Id
+CronClassFile=Classes (filename.class.php)
+CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
+CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+CronCommandHelp=The system command line to execute.
# Info
-#
-# CronInfoPage=Information
-
-
-#
+CronInfoPage=Information
# Common
-#
-# CronType=Task type
-# CronType_method=Call method of a Dolibarr Class
-# CronType_command=Shell command
-# CronMenu=Cron
-# CronCannotLoadClass=Cannot load class %s or object %s
-
-# UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+CronType=Task type
+CronType_method=Call method of a Dolibarr Class
+CronType_command=Shell command
+CronMenu=Cron
+CronCannotLoadClass=Cannot load class %s or object %s
+UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
diff --git a/htdocs/langs/zh_TW/donations.lang b/htdocs/langs/zh_TW/donations.lang
index fc7c7019e8e4b6da47fea545f88c1f767ebf6bdb..5f5db905084f6b641aa7bbe1cf3da61be25a5706 100644
--- a/htdocs/langs/zh_TW/donations.lang
+++ b/htdocs/langs/zh_TW/donations.lang
@@ -4,7 +4,7 @@ Donations=捐贈
DonationRef=Donation ref.
Donor=捐贈者
Donors=捐助者
-AddDonation=添加捐贈
+AddDonation=Create a donation
NewDonation=新捐贈
ShowDonation=Show donation
DonationPromise=禮品的承諾
@@ -31,3 +31,8 @@ DonationRecipient=Donation recipient
ThankYou=Thank You
IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
MinimumAmount=Minimum amount is %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+DONATION_ART200=Show article 200 from CGI if you are concerned
+DONATION_ART238=Show article 238 from CGI if you are concerned
+DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/zh_TW/externalsite.lang b/htdocs/langs/zh_TW/externalsite.lang
index 11e8a83bad8f920b2aa427aac99d60fbea141aa7..dbdaf2d783f41c23ae721240d0a802768e28c0cd 100644
--- a/htdocs/langs/zh_TW/externalsite.lang
+++ b/htdocs/langs/zh_TW/externalsite.lang
@@ -1,4 +1,5 @@
# Dolibarr language file - Source file is en_US - externalsite
ExternalSiteSetup=設置鏈接到外部網站
ExternalSiteURL=外部網站網址
-# ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/zh_TW/holiday.lang b/htdocs/langs/zh_TW/holiday.lang
index a60a165a32b9d6767e7c12e63676ae3a94a219fd..2bddf36550d36ca95e6fa83f91756f0a34464e38 100644
--- a/htdocs/langs/zh_TW/holiday.lang
+++ b/htdocs/langs/zh_TW/holiday.lang
@@ -48,20 +48,19 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
CantCreateCP=You don't have the right to make leave requests.
InvalidValidatorCP=You must choose an approbator to your leave request.
-UpdateButtonCP=更新
CantUpdate=You cannot update this leave request.
NoDateDebut=You must select a start date.
NoDateFin=You must select an end date.
-ErrorDureeCP=Your request for holidays does not contain working day.
-TitleValidCP=Approve the request holidays
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
ConfirmValidCP=Are you sure you want to approve the leave request?
DateValidCP=Date approved
TitleToValidCP=Send leave request
ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the request holidays
+TitleRefuseCP=Refuse the leave request
ConfirmRefuseCP=Are you sure you want to refuse the leave request?
NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
+TitleCancelCP=Cancel the leave request
ConfirmCancelCP=Are you sure you want to cancel the leave request?
DetailRefusCP=Reason for refusal
DateRefusCP=Date of refusal
@@ -78,7 +77,7 @@ ActionByCP=Performed by
UserUpdateCP=For the user
PrevSoldeCP=Previous Balance
NewSoldeCP=New Balance
-alreadyCPexist=A request for holidays has already been done on this period.
+alreadyCPexist=A leave request has already been done on this period.
UserName=名稱
Employee=Employee
FirstDayOfHoliday=First day of vacation
@@ -88,25 +87,25 @@ ManualUpdate=Manual update
HolidaysCancelation=Leave request cancelation
## Configuration du Module ##
-ConfCP=Configuration of holidays module
+ConfCP=Configuration of leave request module
DescOptionCP=Description of the option
ValueOptionCP=價值
-GroupToValidateCP=Group with the ability to approve vacation
+GroupToValidateCP=Group with the ability to approve leave requests
ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last automatic update of vacation
+LastUpdateCP=Last automatic update of leaves allocation
UpdateConfCPOK=Updated successfully.
ErrorUpdateConfCP=An error occurred during the update, please try again.
-AddCPforUsers=Please add the balance of holidays of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of vacation days added every month
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
Module27130Name= Management of leave requests
Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of Leave request
+TitleOptionMainCP=Main settings of leave request
TitleOptionEventCP=Settings of leave requets for events
ValidEventCP=驗證
UpdateEventCP=Update events
diff --git a/htdocs/langs/zh_TW/interventions.lang b/htdocs/langs/zh_TW/interventions.lang
index a32490b24735e28e2c4590251a1a2f308bfd8c50..c26551d4a9683ce133e031e6e17ccdd3fb014a7b 100644
--- a/htdocs/langs/zh_TW/interventions.lang
+++ b/htdocs/langs/zh_TW/interventions.lang
@@ -3,7 +3,7 @@ Intervention=介入
Interventions=幹預
InterventionCard=幹預卡
NewIntervention=新的幹預
-AddIntervention=添加幹預
+AddIntervention=Create intervention
ListOfInterventions=名單幹預
EditIntervention=編輯幹預
ActionsOnFicheInter=幹預的行動
@@ -30,6 +30,15 @@ StatusInterInvoiced=帳單
RelatedInterventions=相關的幹預措施
ShowIntervention=展幹預
SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=代表隨訪幹預
TypeContact_fichinter_internal_INTERVENING=幹預
diff --git a/htdocs/langs/zh_TW/mails.lang b/htdocs/langs/zh_TW/mails.lang
index 0b6f99c6339cc306a78636677f7ee8cbf52bc7fe..61cba6b14a7378a779320411e797eebc369724f7 100644
--- a/htdocs/langs/zh_TW/mails.lang
+++ b/htdocs/langs/zh_TW/mails.lang
@@ -115,7 +115,7 @@ SentBy=發送
MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
MailingNeedCommand2=但是您可以發送到網上，加入與最大的電子郵件數量值參數MAILING_LIMIT_SENDBYWEB你要發送的會議。
ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
TargetsReset=清除名單
ToClearAllRecipientsClickHere=點擊這裏以清除此電子郵件的收件人列表
ToAddRecipientsChooseHere=添加從名單中選擇收件人
@@ -133,6 +133,9 @@ Notifications=通知
NoNotificationsWillBeSent=沒有電子郵件通知此事件的計劃和公司
ANotificationsWillBeSent=1通知將通過電子郵件發送
SomeNotificationsWillBeSent=%s的通知將通過電子郵件發送
-AddNewNotification=啟動一個新的電子郵件通知的要求
-ListOfActiveNotifications=列出所有有效的電子郵件通知要求
+AddNewNotification=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
ListOfNotificationsDone=列出所有發送電子郵件通知
+MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
index 90961f2cb9d52e4d1be11d94e9b509bcef1bc138..3b27e8f9a7e4ceaf171a062d0e9babe0057b3b0c 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=無法找到用戶<b>%s</b>在Dolibarr數
ErrorNoVATRateDefinedForSellerCountry=錯誤!沒有定義 '%s' 幣別的營業稅率。
ErrorNoSocialContributionForSellerCountry=錯誤，沒有社會貢獻類型定義為國家'%s'的。
ErrorFailedToSaveFile=錯誤，無法保存文件。
-ErrorOnlyPngJpgSupported=錯誤，只。PNG和。jpg圖像文件格式支持。
-ErrorImageFormatNotSupported=你的PHP不支持函數來轉換這種格式的圖像。
SetDate=Set date
SelectDate=Select a date
SeeAlso=See also %s
BackgroundColorByDefault=默認的背景顏色
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
FileWasNotUploaded=一個文件被選中的附件，但還沒有上傳。點擊“附加文件”為這一點。
NbOfEntries=鈮條目
GoToWikiHelpPage=至 維基 網站看線上說明(需要連接網際網路的功能)
@@ -266,6 +266,7 @@ Afternoon=Afternoon
Quadri=誇德裏
MonthOfDay=本月的一天
HourShort=Ĥ
+MinuteShort=mn
Rate=稅率
UseLocalTax=Include tax
Bytes=Bytes
@@ -340,6 +341,7 @@ FullList=全部列表
Statistics=統計
OtherStatistics=其他統計
Status=狀態
+Favorite=Favorite
ShortInfo=Info.
Ref=編號
RefSupplier=供應商編號
@@ -365,6 +367,7 @@ ActionsOnCompany=關於這個第三方的行動
ActionsOnMember=有關此成員的活動
NActions=%s的行動
NActionsLate=%s的後期
+RequestAlreadyDone=Request already recorded
Filter=篩選器
RemoveFilter=刪除篩選器
ChartGenerated=圖表生成
@@ -645,6 +648,7 @@ OptionalFieldsSetup=額外的屬性設置
URLPhoto=照片/徽標的URL
SetLinkToThirdParty=鏈接到另一個第三方
CreateDraft=建立草稿
+SetToDraft=Back to draft
ClickToEdit=單擊“編輯”
ObjectDeleted=刪除對象%s
ByCountry=按國家
@@ -678,7 +682,7 @@ ViewPrivateNote=View notes
XMoreLines=%s line(s) hidden
PublicUrl=Public URL
AddBox=Add box
-
+SelectElementAndClickRefresh=Select an element and click Refresh
# Week day
Monday=星期一
Tuesday=星期二
diff --git a/htdocs/langs/zh_TW/margins.lang b/htdocs/langs/zh_TW/margins.lang
index 9034cb7fa49a954ea9051e2b83b332b1a094a4b8..80bee50f2c347330c28cd827d7d8dff935458f29 100644
--- a/htdocs/langs/zh_TW/margins.lang
+++ b/htdocs/langs/zh_TW/margins.lang
@@ -10,24 +10,18 @@ MarkRate=Mark rate
DisplayMarginRates=Display margin rates
DisplayMarkRates=Display mark rates
InputPrice=Input price
-
margin=Profit margins management
margesSetup=Profit margins management setup
-
MarginDetails=Margin details
-
ProductMargins=Product margins
CustomerMargins=Customer margins
SalesRepresentativeMargins=Sales representative margins
-
ProductService=產品或服務
AllProducts=All products and services
ChooseProduct/Service=Choose product or service
-
StartDate=開始日期
EndDate=結束日期
Launch=開始
-
ForceBuyingPriceIfNull=Force buying price if null
ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0)
MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
@@ -35,16 +29,16 @@ UseDiscountAsProduct=As a product
UseDiscountAsService=As a service
UseDiscountOnTotal=On subtotal
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
-
MARGIN_TYPE=Margin type
MargeBrute=Raw margin
MargeNette=Net margin
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - Cost price
-
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
Charges=Charges
-
AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents
+AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
+rateMustBeNumeric=Rate must be a numeric value
+markRateShouldBeLesserThan100=Mark rate should be lower than 100
+ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/zh_TW/orders.lang b/htdocs/langs/zh_TW/orders.lang
index 8affd74e84eeff233aa08b28e8c3961cec002e7c..e83d01cad453ff076436f16b30a261c3934a5c5a 100644
--- a/htdocs/langs/zh_TW/orders.lang
+++ b/htdocs/langs/zh_TW/orders.lang
@@ -2,7 +2,7 @@
OrdersArea=客戶訂單面積
SuppliersOrdersArea=供應商的訂單面積
OrderCard=訂單資訊
-# OrderId=Order Id
+OrderId=Order Id
Order=訂單
Orders=訂單
OrderLine=在線訂單
@@ -28,7 +28,7 @@ StatusOrderCanceledShort=已取消
StatusOrderDraftShort=草案階段
StatusOrderValidatedShort=驗證階段
StatusOrderSentShort=在過程
-# StatusOrderSent=Shipment in process
+StatusOrderSent=Shipment in process
StatusOrderOnProcessShort=處理中
StatusOrderProcessedShort=處理完畢
StatusOrderToBillShort=等待帳單
@@ -53,9 +53,9 @@ ShippingExist=A貨存在
DraftOrWaitingApproved=草案尚未下令或批準
DraftOrWaitingShipped=草案或審定尚未運
MenuOrdersToBill=訂單To帳單
-# MenuOrdersToBill2=Orders to bill
+MenuOrdersToBill2=Billable orders
SearchOrder=搜尋訂單
-# SearchACustomerOrder=Search a customer order
+SearchACustomerOrder=Search a customer order
ShipProduct=船舶產品
Discount=折扣
CreateOrder=創建訂單
@@ -65,14 +65,14 @@ ValidateOrder=驗證訂單
UnvalidateOrder=Unvalidate秩序
DeleteOrder=刪除訂單
CancelOrder=取消訂單
-AddOrder=新增訂單
+AddOrder=Create order
AddToMyOrders=新增我的訂單
AddToOtherOrders=新增其他人的訂單
-# AddToDraftOrders=Add to draft order
+AddToDraftOrders=Add to draft order
ShowOrder=顯示訂單
NoOpenedOrders=沒有打開訂單
NoOtherOpenedOrders=沒有其他人已經新增的訂單
-# NoDraftOrders=No draft orders
+NoDraftOrders=No draft orders
OtherOrders=其他命令
LastOrders=上次%s的訂單
LastModifiedOrders=最新修改的訂單
@@ -82,7 +82,7 @@ NbOfOrders=訂單號碼
OrdersStatistics=訂單統計
OrdersStatisticsSuppliers=供應商的訂單統計
NumberOfOrdersByMonth=按月份訂單數
-# AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
+AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
ListOfOrders=訂單列表
CloseOrder=關閉命令
ConfirmCloseOrder=您確定要關閉這個秩序？一旦訂單是封閉的，它只能產生帳單。
@@ -93,7 +93,7 @@ ConfirmUnvalidateOrder=你是否確定要還原訂單<b>%s</b>草案狀態？
ConfirmCancelOrder=您確定要取消此訂單？
ConfirmMakeOrder=請確認您是否想要確認您於 <b>%s</b> 製作的訂單？
GenerateBill=生成發票
-# ClassifyShipped=Classify delivered
+ClassifyShipped=Classify delivered
ClassifyBilled=分類“帳單”
ComptaCard=會計證
DraftOrders=草案訂單
@@ -101,7 +101,6 @@ RelatedOrders=有關命令
OnProcessOrders=處理中的訂單
RefOrder=訂單號碼
RefCustomerOrder=客戶訂單號
-CustomerOrder=客戶訂單
RefCustomerOrderShort=客戶訂單號
SendOrderByMail=為了通過郵件發送
ActionsOnOrder=採購過程中的事件記錄
@@ -131,9 +130,7 @@ Error_COMMANDE_SUPPLIER_ADDON_NotDefined=常COMMANDE_SUPPLIER_ADDON沒有定義
Error_COMMANDE_ADDON_NotDefined=常COMMANDE_ADDON沒有定義
Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=無法加載模塊文件'%s'的
Error_FailedToLoad_COMMANDE_ADDON_File=無法加載模塊文件'%s'的
-# Error_OrderNotChecked=No orders to invoice selected
-
-
+Error_OrderNotChecked=No orders to invoice selected
# Sources
OrderSource0=商業建議
OrderSource1=因特網
@@ -144,25 +141,22 @@ OrderSource5=商業
OrderSource6=商店
QtyOrdered=訂購數量
AddDeliveryCostLine=添加交貨成本線，顯示該命令的重量
-
# Documents models
PDFEinsteinDescription=可產生一份完整的訂單範本（logo. ..）
PDFEdisonDescription=可產生一份簡單的訂單範本
-# PDFProformaDescription=A complete proforma invoice (logo…)
+PDFProformaDescription=A complete proforma invoice (logo…)
# Orders modes
OrderByMail=郵件
OrderByFax=傳真
OrderByEMail=電子郵件
OrderByWWW=網頁
OrderByPhone=電話
-
-# CreateInvoiceForThisCustomer=Bill orders
-# NoOrdersToInvoice=No orders billable
-# CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-# MenuOrdersToBill2=Orders to bill
-# OrderCreation=Order creation
-# Ordered=Ordered
-# OrderCreated=Your orders have been created
-# OrderFail=An error happened during your orders creation
-# CreateOrders=Create orders
-# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+CreateInvoiceForThisCustomer=Bill orders
+NoOrdersToInvoice=No orders billable
+CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
+OrderCreation=Order creation
+Ordered=Ordered
+OrderCreated=Your orders have been created
+OrderFail=An error happened during your orders creation
+CreateOrders=Create orders
+ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
diff --git a/htdocs/langs/zh_TW/oscommerce.lang b/htdocs/langs/zh_TW/oscommerce.lang
deleted file mode 100644
index 9d6d95cddc6866f2efcc0a12d35d76defd322868..0000000000000000000000000000000000000000
--- a/htdocs/langs/zh_TW/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=商務部操作系統
-OSCommerceSetup=商務部模塊安裝操作系統
-OSCommerceSetupSaved=商務部操作系統設置保存
-OSCommerceServer=商業服務器操作系統的主機/ IP
-OSCommerceDatabaseName=操作系統商業數據庫的名稱
-OSCommercePrefix=操作系統商務部表前綴
-OSCommerceUser=操作系統商業數據庫登錄
diff --git a/htdocs/langs/zh_TW/other.lang b/htdocs/langs/zh_TW/other.lang
index aa23ef336f5b32af4f1f72fcc0ceb6f512cd2cd7..227494058af7256e7cf0b408f9a8ced0187e590f 100644
--- a/htdocs/langs/zh_TW/other.lang
+++ b/htdocs/langs/zh_TW/other.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - other
SecurityCode=安全代碼
Calendar=日歷
-AddTrip=添加行程
Tools=工具
ToolsDesc=此區提供無法加入在子選單的雜項工具。<br><br>請選擇左側選單來執行你想要的工具。
Birthday=生日
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Project creation
Notify_TASK_CREATE=Task created
Notify_TASK_MODIFY=Task modified
Notify_TASK_DELETE=Task deleted
+SeeModuleSetup=See module setup
NbOfAttachedFiles=所附文件數/文件
TotalSizeOfAttachedFiles=附件大小總計
MaxSize=檔案最大
@@ -80,6 +80,16 @@ ModifiedBy=修改 by %s
ValidatedBy=被%s驗證
CanceledBy=被%s取消
ClosedBy=被%s關閉
+CreatedById=User id who created
+ModifiedById=User id who made last change
+ValidatedById=User id who validated
+CanceledById=User id who canceled
+ClosedById=User id who closed
+CreatedByLogin=User login who created
+ModifiedByLogin=User login who made last change
+ValidatedByLogin=User login who validated
+CanceledByLogin=User login who canceled
+ClosedByLogin=User login who closed
FileWasRemoved=檔案%s被刪除
DirWasRemoved=目錄%s被刪除
FeatureNotYetAvailableShort=在下一版本可用
@@ -193,25 +203,26 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your
##### Calendar common #####
AddCalendarEntry=日歷項中添加%s的
-NewCompanyToDolibarr=%s的公司加入Dolibarr
-ContractValidatedInDolibarr=%s的驗證合同中Dolibarr
-ContractCanceledInDolibarr=%s的合同取消Dolibarr
-ContractClosedInDolibarr=%s的合同在Dolibarr關閉
-PropalClosedSignedInDolibarr=建議%s的簽署Dolibarr
-PropalClosedRefusedInDolibarr=建議%s的拒絕在Dolibarr
-PropalValidatedInDolibarr=建議在Dolibarr%s的驗證
-InvoiceValidatedInDolibarr=%s的驗證發票在Dolibarr
-InvoicePaidInDolibarr=發票%s的改變Dolibarr支付
-InvoiceCanceledInDolibarr=%s的發票取消Dolibarr
-PaymentDoneInDolibarr=%s的支付做Dolibarr
-CustomerPaymentDoneInDolibarr=%s的客戶付款做Dolibarr
-SupplierPaymentDoneInDolibarr=%s的供應商付款做Dolibarr
-MemberValidatedInDolibarr=成員%s驗證在Dolibarr
-MemberResiliatedInDolibarr=成員%s resiliated在Dolibarr
-MemberDeletedInDolibarr=成員%s刪除Dolibarr
-MemberSubscriptionAddedInDolibarr=對成員%s認購加入Dolibarr
-ShipmentValidatedInDolibarr=運費%s在Dolibarr驗證
-ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr
+NewCompanyToDolibarr=Company %s added
+ContractValidatedInDolibarr=Contract %s validated
+ContractCanceledInDolibarr=Contract %s canceled
+ContractClosedInDolibarr=Contract %s closed
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
+PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+InvoiceValidatedInDolibarr=Invoice %s validated
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+PaymentDoneInDolibarr=Payment %s done
+CustomerPaymentDoneInDolibarr=Customer payment %s done
+SupplierPaymentDoneInDolibarr=Supplier payment %s done
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentDeletedInDolibarr=Shipment %s deleted
##### Export #####
Export=出口
ExportsArea=出口地區
diff --git a/htdocs/langs/zh_TW/paybox.lang b/htdocs/langs/zh_TW/paybox.lang
index 0bcac93c6337a3a252c787454c6bf9dd1d659cd9..9b0238829a05cc298fc0d00f7200c68594baff51 100644
--- a/htdocs/langs/zh_TW/paybox.lang
+++ b/htdocs/langs/zh_TW/paybox.lang
@@ -32,6 +32,9 @@ VendorName=供應商名稱
CSSUrlForPaymentForm=付款方式的CSS樣式表的URL
MessageOK=訊息驗證支付返回頁面
MessageKO=取消支付返回頁面的訊息
-# NewPayboxPaymentReceived=New Paybox payment received
-# NewPayboxPaymentFailed=New Paybox payment tried but failed
-# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+NewPayboxPaymentReceived=New Paybox payment received
+NewPayboxPaymentFailed=New Paybox payment tried but failed
+PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
+PAYBOX_PBX_SITE=Value for PBX SITE
+PAYBOX_PBX_RANG=Value for PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
diff --git a/htdocs/langs/zh_TW/resource.lang b/htdocs/langs/zh_TW/resource.lang
new file mode 100644
index 0000000000000000000000000000000000000000..d64075dfbf595897a63e3eebf19194d8f71030dd
--- /dev/null
+++ b/htdocs/langs/zh_TW/resource.lang
@@ -0,0 +1,36 @@
+
+MenuResourceIndex=Resources
+MenuResourceAdd=New resource
+MenuResourcePlanning=Resource planning
+DeleteResource=Delete resource
+ConfirmDeleteResourceElement=Confirm delete the resource for this element
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Resources list
+ResourceSingular=Resource
+ResourceCard=Resource card
+AddResource=Create a resource
+ResourceFormLabel_ref=Resource name
+ResourceType=Resource type
+ResourceFormLabel_description=Resource description
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Go to date
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+DictionaryEMailTemplates=Modèles d'Emails
+
+SelectResource=Select resource
diff --git a/htdocs/langs/zh_TW/sendings.lang b/htdocs/langs/zh_TW/sendings.lang
index ec32163c56e12acc6d351a5ae4bad0260d203142..d721893af679920e52376c0fead1ddb05e3c87a6 100644
--- a/htdocs/langs/zh_TW/sendings.lang
+++ b/htdocs/langs/zh_TW/sendings.lang
@@ -61,6 +61,8 @@ ShipmentCreationIsDoneFromOrder=就目前而言，從這個訂單而建立的出
RelatedShippings=相關出貨清單
ShipmentLine=Shipment line
CarrierList=List of transporters
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
# Sending methods
SendingMethodCATCH=按客戶捕捉
diff --git a/htdocs/langs/zh_TW/stocks.lang b/htdocs/langs/zh_TW/stocks.lang
index 3332371f2fa4243c982a2ccfd140fca7318299c7..d46a709f7cb432179bd33702f0eb081f3bd4f0ef 100644
--- a/htdocs/langs/zh_TW/stocks.lang
+++ b/htdocs/langs/zh_TW/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=倉庫標簽要求
CorrectStock=目前的庫存
ListOfWarehouses=倉庫名單
ListOfStockMovements=庫存轉讓清單
-StocksArea=庫存區
+StocksArea=Warehouses area
Location=位置
LocationSummary=擺放位置
NumberOfDifferentProducts=Number of different products
diff --git a/htdocs/langs/zh_TW/users.lang b/htdocs/langs/zh_TW/users.lang
index b573b41b4927ff70c096368bfa454342a0a7df6b..9b4cf4f6f2e482502e5f6fdb8d5ac0e8c83c268b 100644
--- a/htdocs/langs/zh_TW/users.lang
+++ b/htdocs/langs/zh_TW/users.lang
@@ -63,7 +63,6 @@ ShowGroup=顯示群組
ShowUser=顯示用戶
NonAffectedUsers=非受影響的用戶
UserModified=用戶修改成功
-GroupModified=集團修改成功
PhotoFile=圖片檔案
UserWithDolibarrAccess=與Dolibarr用戶訪問
ListOfUsersInGroup=在這個名單的用戶組
@@ -103,7 +102,7 @@ UserDisabled=用戶%s禁用
UserEnabled=用戶%s啟動
UserDeleted=使用者%s刪除
NewGroupCreated=集團創建%s的
-GroupModified=集團修改成功
+GroupModified=Group %s modified
GroupDeleted=群組%s刪除
ConfirmCreateContact=你確定要為此創造聯系Dolibarr帳戶？
ConfirmCreateLogin=你確定要創建該成員成為Dolibarr帳戶？
@@ -114,8 +113,10 @@ YourRole=您的角色
YourQuotaOfUsersIsReached=你的活躍用戶達到配額！
NbOfUsers=用戶數
DontDowngradeSuperAdmin=只有超級管理員可以降級超級管理員
-HierarchicalResponsible=Hierarchical responsible
+HierarchicalResponsible=Supervisor
HierarchicView=Hierarchical view
UseTypeFieldToChange=Use field Type to change
OpenIDURL=OpenID URL
LoginUsingOpenID=Use OpenID to login
+WeeklyHours=Weekly hours
+ColorUser=Color of the user
diff --git a/htdocs/langs/zh_TW/withdrawals.lang b/htdocs/langs/zh_TW/withdrawals.lang
index 5a9b91daff4c7a51865c18c7583d185652520714..40e93a15a5a91bd2ab20f83a283857483cc1d7f7 100644
--- a/htdocs/langs/zh_TW/withdrawals.lang
+++ b/htdocs/langs/zh_TW/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=收據
LastWithdrawalReceipts=最後%s撤出收益
WithdrawedBills=撤回發票
WithdrawalsLines=提款線
-RequestStandingOrderToTreat=要求會議常規治療
-RequestStandingOrderTreated=站在請求處理的訂單
+RequestStandingOrderToTreat=Request for standing orders to process
+RequestStandingOrderTreated=Request for standing orders processed
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
CustomersStandingOrders=站在客戶的訂單
CustomerStandingOrder=客戶的長期訂單
NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
@@ -40,14 +41,13 @@ TransMetod=傳輸的方法
Send=發送
Lines=線路
StandingOrderReject=發出拒絕
-InvoiceRefused=負責對客戶拒絕
WithdrawalRefused=提款Refuseds
WithdrawalRefusedConfirm=你確定要輸入一個社會拒絕撤出
RefusedData=日期拒收
RefusedReason=拒絕的原因
RefusedInvoicing=帳單拒絕
NoInvoiceRefused=拒絕不收
-InvoiceRefused=負責對客戶拒絕
+InvoiceRefused=Invoice refused (Charge the rejection to customer)
Status=地位
StatusUnknown=未知
StatusWaiting=等候
@@ -76,7 +76,7 @@ WithBankUsingRIB=有關銀行賬戶，使用肋
WithBankUsingBANBIC=使用的IBAN / BIC / SWIFT的銀行帳戶
BankToReceiveWithdraw=銀行帳戶，以接收退出
CreditDate=信貸
-WithdrawalFileNotCapable=無法生成撤出貴國收到文件
+WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
ShowWithdraw=顯示撤櫃
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=然而，如果發票已至少有一個撤出支付尚未處理的，它不會被設置為支付最高允許管理撤出之前。
DoStandingOrdersBeforePayments=這個標簽允許你為一個固定的訂單要求。一旦完成，你可以鍵入付款，收發票。
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 15f2281cc1f17ed43ac78ef80be3bd586dd6977c..2920dc2e436d6355eea55e116e2bffccc46f555f 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1534,8 +1534,8 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
// Instantiate hooks of thirdparty module
$hookmanager->initHooks(array('searchform','leftblock'));
- if (empty($conf->dol_use_jmobile) && ! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT)) print "\n".'<div class="ui-layout-west"> <!-- Begin left layout -->'."\n";
- else print '<div id="id-left"> <!-- Begin id-left -->';
+ if (empty($conf->dol_use_jmobile) && ! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT)) print "\n".'<!-- Begin left layout -->'."\n".'<div class="ui-layout-west">'."\n";
+ else print "\n".'<!-- Begin id-left -->'."\n".'<div id="id-left">'."\n";
print "\n";
@@ -1543,33 +1543,33 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
if ((( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)) && ! empty($conf->global->MAIN_SEARCHFORM_SOCIETE) && $user->rights->societe->lire)
{
$langs->load("companies");
- $searchform.=printSearchForm(DOL_URL_ROOT.'/societe/societe.php', DOL_URL_ROOT.'/societe/societe.php', img_object('','company').' '.$langs->trans("ThirdParties"), 'soc', 'socname', 'T');
+ $searchform.=printSearchForm(DOL_URL_ROOT.'/societe/societe.php', DOL_URL_ROOT.'/societe/societe.php', img_object('','company').' '.$langs->trans("ThirdParties"), 'soc', 'socname', 'T', 'searchleft');
}
if (! empty($conf->societe->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_CONTACT) && $user->rights->societe->lire)
{
$langs->load("companies");
- $searchform.=printSearchForm(DOL_URL_ROOT.'/contact/list.php', DOL_URL_ROOT.'/contact/list.php', img_object('','contact').' '.$langs->trans("Contacts"), 'contact', 'contactname');
+ $searchform.=printSearchForm(DOL_URL_ROOT.'/contact/list.php', DOL_URL_ROOT.'/contact/list.php', img_object('','contact').' '.$langs->trans("Contacts"), 'contact', 'contactname', '', 'searchleft');
}
if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! empty($conf->service->enabled) && $user->rights->service->lire))
&& ! empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE))
{
$langs->load("products");
- $searchform.=printSearchForm(DOL_URL_ROOT.'/product/list.php', DOL_URL_ROOT.'/product/list.php', img_object('','product').' '.$langs->trans("Products")."/".$langs->trans("Services"), 'products', 'sall', 'P');
+ $searchform.=printSearchForm(DOL_URL_ROOT.'/product/list.php', DOL_URL_ROOT.'/product/list.php', img_object('','product').' '.$langs->trans("Products")."/".$langs->trans("Services"), 'products', 'sall', 'P', 'searchleft');
}
if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! empty($conf->service->enabled) && $user->rights->service->lire)) && ! empty($conf->fournisseur->enabled)
&& ! empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER))
{
$langs->load("products");
- $searchform.=printSearchForm(DOL_URL_ROOT.'/fourn/product/list.php', DOL_URL_ROOT.'/fourn/product/list.php', img_object('','product').' '.$langs->trans("SupplierRef"), 'products', 'srefsupplier');
+ $searchform.=printSearchForm(DOL_URL_ROOT.'/fourn/product/list.php', DOL_URL_ROOT.'/fourn/product/list.php', img_object('','product').' '.$langs->trans("SupplierRef"), 'products', 'srefsupplier', '', 'searchleft');
}
if (! empty($conf->adherent->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_ADHERENT) && $user->rights->adherent->lire)
{
$langs->load("members");
- $searchform.=printSearchForm(DOL_URL_ROOT.'/adherents/list.php', DOL_URL_ROOT.'/adherents/list.php', img_object('','user').' '.$langs->trans("Members"), 'member', 'sall', 'M');
+ $searchform.=printSearchForm(DOL_URL_ROOT.'/adherents/list.php', DOL_URL_ROOT.'/adherents/list.php', img_object('','user').' '.$langs->trans("Members"), 'member', 'sall', 'M', 'searchleft');
}
// Execute hook printSearchForm
@@ -1806,9 +1806,10 @@ function getHelpParamFor($helppagename,$langs)
* @param string $htmlmodesearch Value to set into parameter "mode_search" ('soc','contact','products','member',...)
* @param string $htmlinputname Field Name input form
* @param string $accesskey Accesskey
+ * @param string $idname Complement for id to avoid multiple same id in the page
* @return string
*/
-function printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch,$htmlinputname,$accesskey='')
+function printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch,$htmlinputname,$accesskey='', $idname='')
{
global $conf,$langs;
@@ -1828,7 +1829,7 @@ function printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch,$htmlinput
$ret.=($accesskey?' accesskey="'.$accesskey.'"':'');
if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $ret.=' placeholder="'.$langs->trans("SearchOf").''.strip_tags($title).'"';
else $ret.=' title="'.$langs->trans("SearchOf").''.strip_tags($title).'"';
- $ret.=' name="'.$htmlinputname.'" id="'.$htmlinputname.'" size="10" />';
+ $ret.=' name="'.$htmlinputname.'" id="'.$idname.$htmlinputname.'" size="10" />';
$ret.='<input type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px" value="'.$langs->trans("Go").'">';
$ret.="</form>\n";
return $ret;
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 4b3c0a4cd48e1ec67fde86ae8f520aad8b87c933..7cfb6441c0663bce97abfb09c4ed169e2ef0d86c 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -864,7 +864,7 @@ else
// Batch number management
if (! empty($conf->productbatch->enabled))
{
- print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Batch").')</td><td colspan="3">';
+ print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td colspan="3">';
$statutarray=array('0' => $langs->trans("ProductStatusNotOnBatch"), '1' => $langs->trans("ProductStatusOnBatch"));
print $form->selectarray('status_batch',$statutarray,GETPOST('status_batch'));
print '</td></tr>';
@@ -1122,7 +1122,7 @@ else
// Batch number managment
if ($conf->productbatch->enabled) {
- print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Lot").')</td><td colspan="2">';
+ print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td colspan="2">';
$statutarray=array('0' => $langs->trans("ProductStatusNotOnBatch"), '1' => $langs->trans("ProductStatusOnBatch"));
print $form->selectarray('status_batch',$statutarray,$object->status_batch);
print '</td></tr>';
@@ -1440,11 +1440,11 @@ else
// Batch number management (to batch)
if ($conf->productbatch->enabled) {
- print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Lot").')</td><td colspan="2">';
+ print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td colspan="2">';
if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
print ajax_object_onoff($object, 'status_batch', 'tobatch', 'ProductStatusOnBatch', 'ProductStatusNotOnBatch');
} else {
- print $object->getLibStatut(2,2);
+ print $object->getLibStatut(0,2);
}
print '</td></tr>';
}
@@ -1547,7 +1547,9 @@ else
}
// Note
- print '<tr><td valign="top">'.$langs->trans("Note").'</td><td colspan="'.(2+(($showphoto||$showbarcode)?1:0)).'">'.(dol_textishtml($object->note)?$object->note:dol_nl2br($object->note,1,true)).'</td></tr>';
+ print '<!-- show Note --> '."\n";
+ print '<tr><td valign="top">'.$langs->trans("Note").'</td><td colspan="'.(2+(($showphoto||$showbarcode)?1:0)).'">'.(dol_textishtml($object->note)?$object->note:dol_nl2br($object->note,1,true)).'</td></tr>'."\n";
+ print '<!-- End show Note --> '."\n";
print "</table>\n";
diff --git a/htdocs/product/class/priceexpression.class.php b/htdocs/product/class/priceexpression.class.php
new file mode 100755
index 0000000000000000000000000000000000000000..45fd9f9fa301167cd67f46d40d2ee7c902cf2461
--- /dev/null
+++ b/htdocs/product/class/priceexpression.class.php
@@ -0,0 +1,349 @@
+<?php
+/* Copyright (C) 2007-2012 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es>
+/* Copyright (C) 2014 Ion Agorria <ion@agorria.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file htdocs/product/class/priceexpression.class.php
+ * \ingroup product
+ * \brief Class for accesing price expression table
+ */
+
+
+/**
+ * Class for accesing price expression table
+ */
+class PriceExpression
+{
+ var $db; //!< To store db handler
+ var $error; //!< To return error code (or message)
+ var $errors=array(); //!< To return several error codes (or messages)
+ var $id;
+ var $title;
+ var $expression;
+
+ /**
+ * Constructor
+ *
+ * @param DoliDb $db Database handler
+ */
+ function __construct($db)
+ {
+ $this->db = $db;
+ return 1;
+ }
+
+
+ /**
+ * Create object into database
+ *
+ * @param User $user User that creates
+ * @param int $notrigger 0=launch triggers after, 1=disable triggers
+ * @return int <0 if KO, Id of created object if OK
+ */
+ function create($user, $notrigger=0)
+ {
+ $error=0;
+
+ // Clean parameters
+ if (isset($this->title)) $this->title=trim($this->title);
+ if (isset($this->expression)) $this->expression=trim($this->expression);
+
+ // Insert request
+ $sql = "INSERT INTO ".MAIN_DB_PREFIX."c_price_expression (";
+ $sql.= "title, expression";
+ $sql.= ") VALUES (";
+ $sql.= " ".(isset($this->title)?"'".$this->db->escape($this->title)."'":"''").",";
+ $sql.= " ".(isset($this->expression)?"'".$this->db->escape($this->expression)."'":"''");
+ $sql.= ")";
+
+ $this->db->begin();
+
+ dol_syslog(get_class($this)."::create", LOG_DEBUG);
+ $resql=$this->db->query($sql);
+ if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+ if (! $error)
+ {
+ $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+
+ if (! $notrigger)
+ {
+ // Uncomment this and change MYOBJECT to your own tag if you
+ // want this action calls a trigger.
+
+ //// Call triggers
+ //$result=$this->call_trigger('MYOBJECT_CREATE',$user);
+ //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+ //// End call triggers
+ }
+ }
+
+ // Commit or rollback
+ if ($error)
+ {
+ foreach($this->errors as $errmsg)
+ {
+ dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
+ $this->error.=($this->error?', '.$errmsg:$errmsg);
+ }
+ $this->db->rollback();
+ return -1*$error;
+ }
+ else
+ {
+ $this->db->commit();
+ return $this->id;
+ }
+ }
+
+
+ /**
+ * Load object in memory from the database
+ *
+ * @param int $id Id object
+ * @return int < 0 if KO, 0 if OK but not found, > 0 if OK
+ */
+ function fetch($id)
+ {
+ $sql = "SELECT title, expression";
+ $sql.= " FROM ".MAIN_DB_PREFIX."c_price_expression";
+ $sql.= " WHERE rowid = ".$id;
+
+ dol_syslog(get_class($this)."::fetch");
+ $resql=$this->db->query($sql);
+ if ($resql)
+ {
+ $obj = $this->db->fetch_object($resql);
+ if ($obj)
+ {
+ $this->id = $id;
+ $this->title = $obj->title;
+ $this->expression = $obj->expression;
+ return 1;
+ }
+ else
+ {
+ return 0;
+ }
+ }
+ else
+ {
+ $this->error="Error ".$this->db->lasterror();
+ return -1;
+ }
+ }
+
+ /**
+ * List all price expressions
+ *
+ * @return array Array of price expressions
+ */
+ function list_price_expression()
+ {
+ $sql = "SELECT rowid, title, expression";
+ $sql.= " FROM ".MAIN_DB_PREFIX."c_price_expression";
+ $sql.= " ORDER BY title";
+
+ dol_syslog(get_class($this)."::list_price_expression");
+ $resql=$this->db->query($sql);
+ if ($resql)
+ {
+ $retarray = array();
+
+ while ($record = $this->db->fetch_array($resql))
+ {
+ $price_expression_obj = new PriceExpression($this->db);
+ $price_expression_obj->id = $record["rowid"];
+ $price_expression_obj->title = $record["title"];
+ $price_expression_obj->expression = $record["expression"];
+ $retarray[]=$price_expression_obj;
+ }
+
+ $this->db->free($resql);
+ return $retarray;
+ }
+ else
+ {
+ $this->error=$this->db->error();
+ return -1;
+ }
+ }
+
+
+ /**
+ * Returns any existing rowid with specified title
+ *
+ * @param String $title Title of expression
+ * @return int < 0 if KO, 0 if OK but not found, > 0 rowid
+ */
+ function find_title($title)
+ {
+ $sql = "SELECT rowid";
+ $sql.= " FROM ".MAIN_DB_PREFIX."c_price_expression";
+ $sql.= " WHERE title = '".$this->db->escape($title)."'";
+
+ dol_syslog(get_class($this)."::find_title");
+ $resql=$this->db->query($sql);
+ if ($resql)
+ {
+ $obj = $this->db->fetch_object($resql);
+ if ($obj)
+ {
+ return (int) $obj->rowid;
+ }
+ else
+ {
+ return 0;
+ }
+ }
+ else
+ {
+ $this->error="Error ".$this->db->lasterror();
+ return -1;
+ }
+ }
+
+
+ /**
+ * Update object into database
+ *
+ * @param User $user User that modifies
+ * @param int $notrigger 0=launch triggers after, 1=disable triggers
+ * @return int <0 if KO, >0 if OK
+ */
+ function update($user=0, $notrigger=0)
+ {
+ $error=0;
+
+ // Clean parameters
+ if (isset($this->title)) $this->title=trim($this->title);
+ if (isset($this->expression)) $this->expression=trim($this->expression);
+
+ // Update request
+ $sql = "UPDATE ".MAIN_DB_PREFIX."c_price_expression SET";
+ $sql.= " title = ".(isset($this->title)?"'".$this->db->escape($this->title)."'":"''").",";
+ $sql.= " expression = ".(isset($this->expression)?"'".$this->db->escape($this->expression)."'":"''")."";
+ $sql.= " WHERE rowid = ".$this->id;
+
+ $this->db->begin();
+
+ dol_syslog(get_class($this)."::update");
+ $resql = $this->db->query($sql);
+ if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+ if (! $error)
+ {
+ if (! $notrigger)
+ {
+ // Uncomment this and change MYOBJECT to your own tag if you
+ // want this action calls a trigger.
+
+ //// Call triggers
+ //$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
+ //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+ //// End call triggers
+ }
+ }
+
+ // Commit or rollback
+ if ($error)
+ {
+ foreach($this->errors as $errmsg)
+ {
+ dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+ $this->error.=($this->error?', '.$errmsg:$errmsg);
+ }
+ $this->db->rollback();
+ return -1*$error;
+ }
+ else
+ {
+ $this->db->commit();
+ return 1;
+ }
+ }
+
+
+ /**
+ * Delete object in database
+ *
+ * @param int $rowid Row id of expression
+ * @param User $user User that deletes
+ * @param int $notrigger 0=launch triggers after, 1=disable triggers
+ * @return int <0 if KO, >0 if OK
+ */
+ function delete($rowid, $user, $notrigger=0)
+ {
+ $error=0;
+
+ $this->db->begin();
+
+ if (! $error)
+ {
+ if (! $notrigger)
+ {
+ // Uncomment this and change MYOBJECT to your own tag if you
+ // want this action calls a trigger.
+
+ //// Call triggers
+ //$result=$this->call_trigger('MYOBJECT_DELETE',$user);
+ //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+ //// End call triggers
+ }
+ }
+
+ if (! $error)
+ {
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."c_price_expression";
+ $sql.= " WHERE rowid = ".$rowid;
+
+ dol_syslog(get_class($this)."::delete");
+ $resql = $this->db->query($sql);
+ if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+ }
+
+ // Commit or rollback
+ if ($error)
+ {
+ foreach($this->errors as $errmsg)
+ {
+ dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+ $this->error.=($this->error?', '.$errmsg:$errmsg);
+ }
+ $this->db->rollback();
+ return -1*$error;
+ }
+ else
+ {
+ $this->db->commit();
+ return 1;
+ }
+ }
+
+ /**
+ * Initialise object with example values
+ * Id must be 0 if object instance is a specimen
+ *
+ * @return void
+ */
+ function initAsSpecimen()
+ {
+ $this->id=0;
+ $this->expression='';
+ }
+}
diff --git a/htdocs/product/class/priceparser.class.php b/htdocs/product/class/priceparser.class.php
new file mode 100755
index 0000000000000000000000000000000000000000..5e4fb949cbb5bb797300e3127be8247cfa765fd2
--- /dev/null
+++ b/htdocs/product/class/priceparser.class.php
@@ -0,0 +1,240 @@
+<?php
+/* Copyright (C) 2014 Ion Agorria <ion@agorria.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file htdocs/product/class/priceparser.class.php
+ * \ingroup product
+ * \brief File of class to calculate prices using expression
+ */
+require_once DOL_DOCUMENT_ROOT.'/includes/evalmath/evalmath.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/priceexpression.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+
+/**
+ * Class to parse product price expressions
+ */
+class PriceParser
+{
+ protected $db;
+ // Limit of expressions per price
+ public $limit = 100;
+ // The error that ocurred when parsing price
+ public $error;
+ // The expression that caused the error
+ public $error_expr;
+ //The special char
+ public $special_chr = "#";
+ //The separator char
+ public $separator_chr = ";";
+
+ /**
+ * Constructor
+ *
+ * @param DoliDB $db Database handler
+ */
+ function __construct($db)
+ {
+ $this->db = $db;
+ }
+
+ /**
+ * Returns translated error
+ *
+ * @return string Translated error
+ */
+ public function translatedError()
+ {
+ global $langs;
+ $langs->load("errors");
+ /*
+ -No arg
+ 9, an unexpected error occured
+ 14, division by zero
+ 19, expression not found
+ 20, empty expression
+
+ -1 Arg
+ 1, cannot assign to constant '%s'
+ 2, cannot redefine built-in function '%s'
+ 3, undefined variable '%s' in function definition
+ 4, illegal character '%s'
+ 5, unexpected '%s'
+ 8, unexpected operator '%s'
+ 10, operator '%s' lacks operand
+ 11, expecting '%s'
+ 17, undefined variable '%s'
+ 21, empty result '%s'
+ 22, negative result '%s'
+
+ -2 Args
+ 6, wrong number of arguments (%s given, %s expected)
+
+ -internal errors
+ 7, internal error
+ 12, internal error
+ 13, internal error
+ 15, internal error
+ 16, internal error
+ 18, internal error
+ */
+ if (empty($this->error)) {
+ return $langs->trans("ErrorPriceExpressionUnknown", 0); //this is not supposed to happen
+ }
+ list($code, $info) = $this->error;
+ if (in_array($code, array(9, 14, 19, 20))) //Errors which have 0 arg
+ {
+ return $langs->trans("ErrorPriceExpression".$code);
+ }
+ else if (in_array($code, array(1, 2, 3, 4, 5, 8, 10, 11, 17, 21, 22))) //Errors which have 1 arg
+ {
+ return $langs->trans("ErrorPriceExpression".$code, $info);
+ }
+ else if (in_array($code, array(6))) //Errors which have 2 args
+ {
+ return $langs->trans("ErrorPriceExpression".$code, $info[0], $info[1]);
+ }
+ else if (in_array($code, array(7, 12, 13, 15, 16, 18))) //Internal errors
+ {
+ return $langs->trans("ErrorPriceExpressionInternal", $code);
+ }
+ else //Unknown errors
+ {
+ return $langs->trans("ErrorPriceExpressionUnknown", $code);
+ }
+ }
+
+ /**
+ * Calculates price based on expression
+ *
+ * @param array $values Strings to replaces
+ * @param String $expression The expression to parse
+ * @return int > 0 if OK, < 1 if KO
+ */
+ public function parseExpression($values, $expression)
+ {
+ //Check if empty
+ $expression = trim($expression);
+ if (empty($expression))
+ {
+ $this->error = array(20, null);
+ return -1;
+ }
+
+ //Prepare the lib, parameters and values
+ $em = new EvalMath();
+ $em->suppress_errors = true; //Don't print errors on page
+ $this->error_expr = null;
+ $search = array();
+ $replace = array();
+ foreach ($values as $key => $value) {
+ if ($value !== null) {
+ $search[] = $this->special_chr.$key.$this->special_chr;
+ $replace[] = $value;
+ }
+ }
+
+ //Iterate over each expression splitted by $separator_chr
+ $expression = str_replace("\n", $this->separator_chr, $expression);
+ $expressions = explode($this->separator_chr, $expression);
+ $expressions = array_slice($expressions, 0, $limit);
+ foreach ($expressions as $expr) {
+ $expr = trim($expr);
+ if (!empty($expr))
+ {
+ $expr = str_ireplace($search, $replace, $expr);
+ $last_result = $em->evaluate($expr);
+ $this->error = $em->last_error_code;
+ if ($this->error !== null) { //$em->last_error is null if no error happened, so just check if error is not null
+ $this->error_expr = $expr;
+ return -2;
+ }
+ }
+ }
+ $vars = $em->vars();
+ if (empty($vars["price"])) {
+ $vars["price"] = $last_result;
+ }
+ if ($vars["price"] === null)
+ {
+ $this->error = array(21, $expression);
+ return -3;
+ }
+ if ($vars["price"] < 0)
+ {
+ $this->error = array(22, $expression);
+ return -4;
+ }
+ return $vars["price"];
+ }
+
+ /**
+ * Calculates supplier product price based on product id and string expression
+ *
+ * @param int $product_id The Product id to get information
+ * @param string $expression The expression to parse
+ * @param int $quantity Min quantity
+ * @param int $tva_tx VAT rate
+ * @param array $extra_values Any aditional values for expression
+ * @return int > 0 if OK, < 1 if KO
+ */
+ public function parseProductSupplierExpression($product_id, $expression, $quantity = null, $tva_tx = null, $extra_values = array())
+ {
+ //Accessible values by expressions
+ $expression_values = array(
+ "quantity" => $quantity,
+ "tva_tx" => $tva_tx,
+ );
+ $expression_values = array_merge($expression_values, $extra_values);
+
+ //Retreive all extrafield for product and add it to expression_values
+ $extrafields = new ExtraFields($this->db);
+ $extralabels = $extrafields->fetch_name_optionals_label('product', true);
+ $product = new Product($this->db);
+ $product->fetch_optionals($product_id, $extralabels);
+ foreach($extrafields->attribute_label as $key=>$label)
+ {
+ $expression_values['options_'.$key] = $product->array_options['options_'.$key];
+ }
+
+ //Parse the expression and return the price
+ return $this->parseExpression($expression_values, $expression);
+ }
+
+ /**
+ * Calculates supplier product price based on product id and expression id
+ *
+ * @param int $product_id The Product id to get information
+ * @param int $expression_id The expression to parse
+ * @param int $quantity Min quantity
+ * @param int $tva_tx VAT rate
+ * @param array $extra_values Any aditional values for expression
+ * @return int > 0 if OK, < 1 if KO
+ */
+ public function parseProductSupplier($product_id, $expression_id, $quantity = null, $tva_tx = null, $extra_values = array())
+ {
+ $price_expression = new PriceExpression($this->db);
+ $res = $price_expression->fetch($expression_id);
+ if ($res > 1) {
+ $this->error = array(19, null);
+ return -1;
+ }
+
+ //Parse the expression and return the price
+ return $this->parseProductSupplierExpression($product_id, $price_expression->expression, $quantity, $tva_tx, $extra_values);
+ }
+}
\ No newline at end of file
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
old mode 100644
new mode 100755
index e2898943509e9d4aac44857be0b4e30ed7b1c4a2..4839549a9dcead38ee4d9a99728763974fdb9843
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1166,11 +1166,12 @@ class Product extends CommonObject
*/
function get_buyprice($prodfournprice,$qty,$product_id=0,$fourn_ref=0)
{
+ require_once DOL_DOCUMENT_ROOT.'/product/class/priceparser.class.php';
$result = 0;
// We do select by searching with qty and prodfournprice
$sql = "SELECT pfp.rowid, pfp.price as price, pfp.quantity as quantity,";
- $sql.= " pfp.fk_product, pfp.ref_fourn, pfp.fk_soc, pfp.tva_tx";
+ $sql.= " pfp.fk_product, pfp.ref_fourn, pfp.fk_soc, pfp.tva_tx, pfp.fk_price_expression";
$sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
$sql.= " WHERE pfp.rowid = ".$prodfournprice;
if ($qty) $sql.= " AND pfp.quantity <= ".$qty;
@@ -1182,6 +1183,13 @@ class Product extends CommonObject
$obj = $this->db->fetch_object($resql);
if ($obj && $obj->quantity > 0) // If found
{
+ if (!empty($obj->fk_price_expression)) {
+ $priceparser = new PriceParser($this->db);
+ $price_result = $priceparser->parseProductSupplier($obj->fk_product, $obj->fk_price_expression, $obj->quantity, $obj->tva_tx);
+ if ($price_result >= 0) {
+ $obj->price = $price_result;
+ }
+ }
$this->buyprice = $obj->price; // \deprecated
$this->fourn_pu = $obj->price / $obj->quantity; // Prix unitaire du produit pour le fournisseur $fourn_id
$this->ref_fourn = $obj->ref_fourn; // Ref supplier
@@ -1193,7 +1201,7 @@ class Product extends CommonObject
{
// We do same select again but searching with qty, ref and id product
$sql = "SELECT pfp.rowid, pfp.price as price, pfp.quantity as quantity, pfp.fk_soc,";
- $sql.= " pfp.fk_product, pfp.ref_fourn as ref_supplier, pfp.tva_tx";
+ $sql.= " pfp.fk_product, pfp.ref_fourn as ref_supplier, pfp.tva_tx, pfp.fk_price_expression";
$sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
$sql.= " WHERE pfp.ref_fourn = '".$fourn_ref."'";
$sql.= " AND pfp.fk_product = ".$product_id;
@@ -1208,6 +1216,13 @@ class Product extends CommonObject
$obj = $this->db->fetch_object($resql);
if ($obj && $obj->quantity > 0) // If found
{
+ if (!empty($obj->fk_price_expression)) {
+ $priceparser = new PriceParser($this->db);
+ $price_result = $priceparser->parseProductSupplier($obj->fk_product, $obj->fk_price_expression, $obj->quantity, $obj->tva_tx);
+ if ($result >= 0) {
+ $obj->price = $price_result;
+ }
+ }
$this->buyprice = $obj->price; // deprecated
$this->fourn_qty = $obj->quantity; // min quantity for price
$this->fourn_pu = $obj->price / $obj->quantity; // Prix unitaire du produit pour le fournisseur $fourn_id
diff --git a/htdocs/product/expression.php b/htdocs/product/expression.php
new file mode 100755
index 0000000000000000000000000000000000000000..68c57489bfb4acdaeaccacd1b16e1a6231e0d59f
--- /dev/null
+++ b/htdocs/product/expression.php
@@ -0,0 +1,221 @@
+<?php
+/* Copyright (C) 2014 Ion Agorria <ion@agorria.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file htdocs/product/expression.php
+ * \ingroup product
+ * \brief Page for editing expression
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/priceexpression.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/priceparser.class.php';
+
+$langs->load("products");
+$langs->load("accountancy"); //"Back" translation is on this file
+
+$id = GETPOST('id', 'int');
+$eid = GETPOST('eid', 'int');
+$action = GETPOST('action', 'alpha');
+$title = GETPOST('expression_title', 'alpha');
+$expression = GETPOST('expression');
+$tab = GETPOST('tab', 'alpha');
+$tab = (!empty($tab)) ? $tab : 'card';
+
+// Security check
+$result=restrictedArea($user,'produit|service&fournisseur',$id,'product&product','','','rowid');
+
+//Initialize objects
+$product = new Product($db);
+$product->fetch($id, '');
+
+$price_expression = new PriceExpression($db);
+
+//Fetch expression data
+if (empty($eid)) //This also disables fetch when eid == 0
+{
+ $eid = 0;
+}
+else if ($action != 'delete')
+{
+ $price_expression->fetch($eid);
+}
+
+/*
+ * Actions
+ */
+
+if ($action == 'add')
+{
+ if ($eid == 0)
+ {
+ $result = $price_expression->find_title($title);
+ if ($result == 0) //No existing entry found with title, ok
+ {
+ //Check the expression validity by parsing it
+ $priceparser = new PriceParser($db);
+ $price_result = $priceparser->parseProductSupplierExpression($id, $expression, 0, 0);
+ if ($price_result < 0) { //Expression is not valid
+ setEventMessage($priceparser->translatedError(), 'errors');
+ }
+ else
+ {
+ $price_expression->title = $title;
+ $price_expression->expression = $expression;
+ $result = $price_expression->create($user);
+ if ($result > 0) //created successfully, set the eid to newly created entry
+ {
+ $eid = $price_expression->id;
+ }
+ else
+ {
+ setEventMessage("add: ".$price_expression->error, 'errors');
+ }
+ }
+ }
+ else if ($result < 0)
+ {
+ setEventMessage("add find: ".$price_expression->error, 'errors');
+ }
+ else
+ {
+ setEventMessage($langs->trans("ErrorRecordAlreadyExists"), 'errors');
+ }
+ }
+}
+
+if ($action == 'update')
+{
+ if ($eid != 0)
+ {
+ $result = $price_expression->find_title($title);
+ if ($result == 0 || $result == $eid) //No existing entry found with title or existing one is the current one, ok
+ {
+ //Check the expression validity by parsing it
+ $priceparser = new PriceParser($db);
+ $price_result = $priceparser->parseProductSupplierExpression($id, $expression, 0, 0);
+ if ($price_result < 0) { //Expression is not valid
+ setEventMessage($priceparser->translatedError(), 'errors');
+ }
+ else
+ {
+ $price_expression->id = $eid;
+ $price_expression->title = $title;
+ $price_expression->expression = $expression;
+ $result = $price_expression->update($user);
+ if ($result < 0)
+ {
+ setEventMessage("update: ".$price_expression->error, 'errors');
+ }
+ }
+ }
+ else if ($result < 0)
+ {
+ setEventMessage("update find: ".$price_expression->error, 'errors');
+ }
+ else
+ {
+ setEventMessage($langs->trans("ErrorRecordAlreadyExists"), 'errors');
+ }
+ }
+}
+
+if ($action == 'delete')
+{
+ if ($eid != 0)
+ {
+ $result = $price_expression->delete($eid, $user);
+ if ($result < 0)
+ {
+ setEventMessage("delete: ".$price_expression->error, 'errors');
+ }
+ $eid = 0;
+ }
+}
+
+/*
+ * View
+ */
+
+//Header
+llxHeader("","",$langs->trans("CardProduct".$product->type));
+print_fiche_titre($langs->trans("PriceExpressionEditor"));
+$form = new Form($db);
+
+//Form/Table
+print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'&tab='.$tab.'&eid='.$eid.'" method="POST">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value='.($eid == 0 ? 'add' : 'update').'>';
+print '<table class="border" width="100%">';
+
+// Price expression selector
+print '<tr><td class="fieldrequired">'.$langs->trans("PriceExpressionSelected").'</td><td>';
+$price_expression_list = array(0 => $langs->trans("New")); //Put the new as first option
+foreach ($price_expression->list_price_expression() as $entry) {
+ $price_expression_list[$entry->id] = $entry->title;
+}
+print $form->selectarray('expression_selection', $price_expression_list, $eid);
+print '</td></tr>';
+
+// Title input
+print '<tr><td class="fieldrequired">'.$langs->trans("Name").'</td><td>';
+print '<input class="flat" name="expression_title" size="15" value="'.($price_expression->title?$price_expression->title:'').'">';
+print '</td></tr>';
+
+//Price expression editor
+print '<tr><td class="fieldrequired">'.$form->textwithpicto($langs->trans("PriceExpressionEditor"),$langs->trans("PriceExpressionEditorHelp"),1).'</td><td>';
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+$doleditor=new DolEditor('expression',isset($price_expression->expression)?$price_expression->expression:'','',300,'','',false,false,false,4,80);
+$doleditor->Create();
+print '</td></tr>';
+print '</table>';
+
+//Buttons
+print '<center>';
+print '<input type="submit" class="butAction" value="'.$langs->trans("Save").'">';
+print '<span id="back" class="butAction">'.$langs->trans("Back").'</span>';
+if ($eid == 0)
+{
+ print '<div class="inline-block divButAction"><span id="action-delete" class="butActionRefused">'.$langs->trans('Delete').'</span></div>'."\n";
+}
+else
+{
+ print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&tab='.$tab.'&eid='.$eid.'&action=delete">'.$langs->trans("Delete").'</a></div>';
+}
+print '</center>';
+
+print '</form>';
+
+// This code reloads the page depending of selected option, goes back in history when back is pressed
+print '<script type="text/javascript">
+ jQuery(document).ready(run);
+ function run() {
+ jQuery("#back").click(on_click);
+ jQuery("#expression_selection").change(on_change);
+ }
+ function on_click() {
+ window.location = "'.str_replace('expression.php', $tab.'.php', $_SERVER["PHP_SELF"]).'?id='.$id.'";
+ }
+ function on_change() {
+ window.location = "'.$_SERVER["PHP_SELF"].'?id='.$id.'&tab='.$tab.'&eid=" + $("#expression_selection").attr("value");
+ }
+</script>';
+
+llxFooter();
+$db->close();
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
old mode 100644
new mode 100755
index 220b6ad758e41a8235213959d3837e90cb9917f4..4f382d3b7f8503ae8b6acbbf22f034c2f0fed265
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -5,6 +5,7 @@
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2010-2012 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2012 Christophe Battarel <christophe.battarel@altairis.fr>
+ * Copyright (C) 2014 Ion Agorria <ion@agorria.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -30,11 +31,12 @@ require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/priceexpression.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/priceparser.class.php';
$langs->load("products");
$langs->load("suppliers");
$langs->load("bills");
-// Charges ????
if (! empty($conf->margin->enabled)) $langs->load("margins");
$id = GETPOST('id', 'int');
@@ -104,6 +106,7 @@ if ($action == 'updateprice' && GETPOST('cancel') <> $langs->trans("Cancel"))
$npr = preg_match('/\*/', $_POST['tva_tx']) ? 1 : 0 ;
$tva_tx = str_replace('*','', GETPOST('tva_tx','alpha'));
$tva_tx = price2num($tva_tx);
+ $price_expression = GETPOST('eid', 'int') == 0 ? 'NULL' : GETPOST('eid', 'int'); //Discard expression if not in expression mode
if ($tva_tx == '')
{
@@ -127,8 +130,14 @@ if ($action == 'updateprice' && GETPOST('cancel') <> $langs->trans("Cancel"))
}
if ($_POST["price"] < 0 || $_POST["price"] == '')
{
- $error++;
- setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Price")), 'errors');
+ if ($price_expression == 'NULL') { //This is not because of using expression instead of numeric price
+ $error++;
+ setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Price")), 'errors');
+ }
+ else
+ {
+ $_POST["price"] = 0;
+ }
}
$product = new ProductFournisseur($db);
@@ -174,6 +183,26 @@ if ($action == 'updateprice' && GETPOST('cancel') <> $langs->trans("Cancel"))
{
$error++;
setEventMessage($product->error, 'errors');
+ }
+ else
+ {
+ if ($price_expression != 'NULL') {
+ //Check the expression validity by parsing it
+ $priceparser = new PriceParser($db);
+ $price_result = $priceparser->parseProductSupplier($id, $price_expression, $quantity, $tva_tx);
+ if ($price_result < 0) { //Expression is not valid
+ $error++;
+ setEventMessage($priceparser->translatedError(), 'errors');
+ }
+ }
+ if (! $error && ! empty($conf->dynamicprices->enabled)) {
+ $ret=$product->setPriceExpression($price_expression);
+ if ($ret < 0)
+ {
+ $error++;
+ setEventMessage($product->error, 'errors');
+ }
+ }
}
}
@@ -267,7 +296,7 @@ if ($id || $ref)
if ($rowid)
{
- $product->fetch_product_fournisseur_price($rowid);
+ $product->fetch_product_fournisseur_price($rowid, 1); //Ignore the math expression when getting the price
print_fiche_titre($langs->trans("ChangeSupplierPrice"));
}
else
@@ -369,8 +398,41 @@ if ($id || $ref)
print '<input type="text" class="flat" size="5" name="tva_tx" value="'.(GETPOST("tva_tx")?vatrate(GETPOST("tva_tx")):($default_vat!=''?vatrate($default_vat):'')).'">';
print '</td></tr>';
+ if (! empty($conf->dynamicprices->enabled)) { //Only show price mode and expression selector if module is enabled
+ // Price mode selector
+ print '<tr><td class="fieldrequired">'.$langs->trans("PriceMode").'</td><td>';
+ $price_expression = new PriceExpression($db);
+ $price_expression_list = array(0 => $langs->trans("PriceNumeric")); //Put the numeric mode as first option
+ foreach ($price_expression->list_price_expression() as $entry) {
+ $price_expression_list[$entry->id] = $entry->title;
+ }
+ $price_expression_preselection = GETPOST('eid') ? GETPOST('eid') : ($product->fk_price_expression ? $product->fk_price_expression : '0');
+ print $form->selectarray('eid', $price_expression_list, $price_expression_preselection);
+ print ' <div id="expression_editor" class="button">'.$langs->trans("PriceExpressionEditor").'</div>';
+ print '</td></tr>';
+ // This code hides the numeric price input if is not selected, loads the editor page if editor button is pressed
+ print '<script type="text/javascript">
+ jQuery(document).ready(run);
+ function run() {
+ jQuery("#expression_editor").click(on_click);
+ jQuery("#eid").change(on_change);
+ on_change();
+ }
+ function on_click() {
+ window.location = "'.DOL_URL_ROOT.'/product/expression.php?id='.$id.'&tab=fournisseurs&eid=" + $("#eid").attr("value");
+ }
+ function on_change() {
+ if ($("#eid").attr("value") == 0) {
+ jQuery("#price_numeric").show();
+ } else {
+ jQuery("#price_numeric").hide();
+ }
+ }
+ </script>';
+ }
+
// Price qty min
- print '<tr><td class="fieldrequired">'.$langs->trans("PriceQtyMin").'</td>';
+ print '<tr id="price_numeric"><td class="fieldrequired">'.$langs->trans("PriceQtyMin").'</td>';
print '<td><input class="flat" name="price" size="8" value="'.(GETPOST('price')?price(GETPOST('price')):(isset($product->fourn_price)?price($product->fourn_price):'')).'">';
print ' ';
print $form->select_PriceBaseType((GETPOST('price_base_type')?GETPOST('price_base_type'):$product->price_base_type), "price_base_type");
@@ -383,15 +445,18 @@ if ($id || $ref)
print '</tr>';
// Charges ????
- if (! empty($conf->margin->enabled))
+ if ($conf->global->PRODUCT_CHARGES)
{
- print '<tr>';
- print '<td>'.$langs->trans("Charges").'</td>';
- print '<td><input class="flat" name="charges" size="8" value="'.(GETPOST('charges')?price(GETPOST('charges')):(isset($product->fourn_charges)?price($product->fourn_charges):'')).'">';
- print '</td>';
- print '</tr>';
+ if (! empty($conf->margin->enabled))
+ {
+ print '<tr>';
+ print '<td>'.$langs->trans("Charges").'</td>';
+ print '<td><input class="flat" name="charges" size="8" value="'.(GETPOST('charges')?price(GETPOST('charges')):(isset($product->fourn_charges)?price($product->fourn_charges):'')).'">';
+ print '</td>';
+ print '</tr>';
+ }
}
-
+
if (is_object($hookmanager))
{
$parameters=array('id_fourn'=>$id_fourn,'prod_id'=>$product->id);
@@ -446,11 +511,17 @@ if ($id || $ref)
print '<td class="liste_titre" align="right">'.$langs->trans("VATRate").'</td>';
print '<td class="liste_titre" align="right">'.$langs->trans("PriceQtyMinHT").'</td>';
// Charges ????
- if (! empty($conf->margin->enabled)) print '<td align="right">'.$langs->trans("Charges").'</td>';
+ if ($conf->global->PRODUCT_CHARGES)
+ {
+ if (! empty($conf->margin->enabled)) print '<td align="right">'.$langs->trans("Charges").'</td>';
+ }
print_liste_field_titre($langs->trans("UnitPriceHT"),$_SERVER["PHP_SELF"],"pfp.unitprice","",$param,'align="right"',$sortfield,$sortorder);
print '<td class="liste_titre" align="right">'.$langs->trans("DiscountQtyMin").'</td>';
// Charges ????
- if (! empty($conf->margin->enabled)) print '<td align="right">'.$langs->trans("UnitCharges").'</td>';
+ if ($conf->global->PRODUCT_CHARGES)
+ {
+ if (! empty($conf->margin->enabled)) print '<td align="right">'.$langs->trans("UnitCharges").'</td>';
+ }
print '<td class="liste_titre"></td>';
print "</tr>\n";
@@ -496,13 +567,16 @@ if ($id || $ref)
print '</td>';
// Charges ????
- if (! empty($conf->margin->enabled))
- {
- print '<td align="right">';
- print $productfourn->fourn_charges?price($productfourn->fourn_charges):"";
- print '</td>';
+ if ($conf->global->PRODUCT_CHARGES)
+ {
+ if (! empty($conf->margin->enabled))
+ {
+ print '<td align="right">';
+ print $productfourn->fourn_charges?price($productfourn->fourn_charges):"";
+ print '</td>';
+ }
}
-
+
// Unit price
print '<td align="right">';
print price($productfourn->fourn_unitprice);
@@ -514,14 +588,17 @@ if ($id || $ref)
print price2num($productfourn->fourn_remise_percent).'%';
print '</td>';
- // Unit Charges ???
- if (! empty($conf->margin->enabled))
+ // Charges ????
+ if ($conf->global->PRODUCT_CHARGES)
{
- print '<td align="right">';
- print $productfourn->fourn_unitcharges?price($productfourn->fourn_unitcharges) : ($productfourn->fourn_qty?price($productfourn->fourn_charges/$productfourn->fourn_qty):" ");
- print '</td>';
+ if (! empty($conf->margin->enabled))
+ {
+ print '<td align="right">';
+ print $productfourn->fourn_unitcharges?price($productfourn->fourn_unitcharges) : ($productfourn->fourn_qty?price($productfourn->fourn_charges/$productfourn->fourn_qty):" ");
+ print '</td>';
+ }
}
-
+
if (is_object($hookmanager))
{
$parameters=array('id_pfp'=>$productfourn->product_fourn_price_id,'id_fourn'=>$id_fourn,'prod_id'=>$product->id);
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 476c394ecc1d838e10c0a1f2b0b01e99f03443e2..59561da32ea1642bc7e56845e0b5370f9b5b9ca8 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -296,8 +296,8 @@ if ($id > 0 || $ref)
print '</td></tr>';
if ($conf->productbatch->enabled) {
- print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("l_sellby").')</td><td>';
- print $product->getLibStatut(2,2);
+ print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td>';
+ print $product->getLibStatut(0,2);
print '</td></tr>';
}
@@ -471,15 +471,18 @@ if ($id > 0 || $ref)
//eat-by date
if ((! empty($conf->productbatch->enabled)) && $product->hasbatch()) {
print '<tr>';
- print '<td width="15%">'.$langs->trans("l_eatby").'</td><td width="15%">';
+ print '<td colspan="2">'.$langs->trans("batch_number").'</td><td colspan="4">';
+ print '<input type="text" name="batch_number" size="40" value="'.GETPOST("batch_number").'">';
+ print '</td>';
+ print '</tr><tr>';
+ print '<td colspan="2">'.$langs->trans("l_eatby").'</td><td>';
$form->select_date('','eatby','','',1,"");
print '</td>';
- print '<td width="15%">'.$langs->trans("l_sellby").'</td><td width="15%">';
+ print '<td></td>';
+ print '<td>'.$langs->trans("l_sellby").'</td><td>';
$form->select_date('','sellby','','',1,"");
print '</td>';
- print '<td width="15%">'.$langs->trans("batch_number").'</td><td width="15%">';
- print '<input type="text" name="batch_number" size="40" value="'.GETPOST("batch_number").'">';
- print '</td></tr>';
+ print '</tr>';
}
print '</table>';
@@ -597,9 +600,10 @@ print '<td align="right">'.$langs->trans("SellPriceMin").'</td>';
print '<td align="right">'.$langs->trans("EstimatedStockValueSellShort").'</td>';
print '</tr>';
if ( (! empty($conf->productbatch->enabled)) && $product->hasbatch()) {
- print '<tr class="liste_titre"><td width="10%"></td><td align="right" width="10%">'.$langs->trans("l_eatby").'</td>';
- print '<td align="right" width="10%">'.$langs->trans("l_sellby").'</td>';
+ print '<tr class="liste_titre"><td width="10%"></td>';
print '<td align="right" width="10%">'.$langs->trans("batch_number").'</td>';
+ print '<td align="right" width="10%">'.$langs->trans("l_eatby").'</td>';
+ print '<td align="right" width="10%">'.$langs->trans("l_sellby").'</td>';
print '<td align="right" colspan="5"></td>';
print '</tr>';
}
@@ -650,15 +654,18 @@ if ($resql)
$totalvalue = $totalvalue + price2num($obj->pmp*$obj->reel,'MU'); // Ditto : Show PMP from movement or from product
$totalvaluesell = $totalvaluesell + price2num($product->price*$obj->reel,'MU'); // Ditto : Show PMP from movement or from product
//Batch Detail
- if ((! empty($conf->productbatch->enabled)) && $product->hasbatch()) {
+ if ((! empty($conf->productbatch->enabled)) && $product->hasbatch())
+ {
$details=Productbatch::findAll($db,$obj->product_stock_id);
if ($details<0) dol_print_error($db);
- foreach ($details as $pdluo) {
- print "\n".'<tr><td width="10%"></td><td width="10%" align="right">'. dol_print_date($pdluo->eatby,'day') .'</td>';
- print '<td align="right" width="10%">'. dol_print_date($pdluo->sellby,'day') .'</td>';
- print '<td align="right" width="10%">'.$pdluo->batch.'</td>';
- print '<td align="right" width="10%">'.$pdluo->qty.($pdluo->qty<0?' '.img_warning():'').'</td>';
- print '<td colspan="4" width="50%"></td></tr>';
+ foreach ($details as $pdluo)
+ {
+ print "\n".'<tr><td></td>';
+ print '<td align="right">'.$pdluo->batch.'</td>';
+ print '<td align="right">'. dol_print_date($pdluo->eatby,'day') .'</td>';
+ print '<td align="right">'. dol_print_date($pdluo->sellby,'day') .'</td>';
+ print '<td align="right">'.$pdluo->qty.($pdluo->qty<0?' '.img_warning():'').'</td>';
+ print '<td colspan="4"></td></tr>';
}
}
$i++;
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index b76d8a7b9f087048fa08b4c8810434f72229a999..a6a00bb00462e340ceab63c6fb7b9f9a8fc433be 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -62,7 +62,7 @@ $rowspan=2;
if (! empty($conf->barcode->enabled)) $rowspan++;
print '<form method="post" action="'.DOL_URL_ROOT.'/societe/societe.php">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<table class="noborder nohover" width="100%">';
+print '<table class="noborder nohover" width="100%">'."\n";
print '<tr class="liste_titre">';
print '<th colspan="3">'.$langs->trans("SearchThirdparty").'</th></tr>';
print "<tr ".$bc[false]."><td>";
@@ -78,8 +78,8 @@ if (! empty($conf->barcode->enabled))
print "<tr ".$bc[false]."><td ".$bc[false].">";
print '<label for="search_all">'.$langs->trans("Other").'</label>:</td><td '.$bc[false].'><input class="flat" type="text" size="14" name="search_all" id="search_all"></td>';
//print '<td><input type="submit" class="button" value="'.$langs->trans("Search").'"></td>';
-print '</tr>';
-print "</table></form><br>";
+print '</tr>'."\n";
+print "</table></form><br>\n";
/*
* Search contact
@@ -87,18 +87,18 @@ print "</table></form><br>";
$rowspan=2;
if (! empty($conf->barcode->enabled)) $rowspan++;
print '<form method="post" action="'.DOL_URL_ROOT.'/contact/list.php">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<table class="noborder nohover" width="100%">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
+print '<table class="noborder nohover" width="100%">'."\n";
print '<tr class="liste_titre">';
-print '<th colspan="3">'.$langs->trans("SearchContact").'</th></tr>';
+print '<th colspan="3">'.$langs->trans("SearchContact").'</th></tr>'."\n";
print "<tr ".$bc[false]."><td>";
print '<label for="search_nom_only">'.$langs->trans("Name").'</label>:</td><td><input class="flat" type="text" size="14" name="search_firstlast_only" id="search_firstlast_only"></td>';
-print '<td rowspan="'.$rowspan.'"><input type="submit" class="button" value="'.$langs->trans("Search").'"></td></tr>';
+print '<td rowspan="'.$rowspan.'"><input type="submit" class="button" value="'.$langs->trans("Search").'"></td></tr>'."\n";
print "<tr ".$bc[false]."><td ".$bc[false].">";
print '<label for="search_all">'.$langs->trans("Other").'</label>:</td><td '.$bc[false].'><input class="flat" type="text" size="14" name="contactname" id="contactname"></td>';
//print '<td><input type="submit" class="button" value="'.$langs->trans("Search").'"></td>';
-print '</tr>';
-print "</table></form><br>";
+print '</tr>'."\n";
+print "</table></form><br>\n";
/*
* Statistics area
@@ -134,7 +134,7 @@ if ($result)
}
else dol_print_error($db);
-print '<table class="noborder" width="100%">';
+print '<table class="noborder" width="100%">'."\n";
print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>';
if (! empty($conf->use_javascript_ajax) && ((round($third['prospect'])?1:0)+(round($third['customer'])?1:0)+(round($third['supplier'])?1:0)+(round($third['other'])?1:0) >= 2))
{
@@ -146,7 +146,7 @@ if (! empty($conf->use_javascript_ajax) && ((round($third['prospect'])?1:0)+(rou
if (! empty($conf->societe->enabled)) $dataseries[]=array('label'=>$langs->trans("Others"),'data'=>round($third['other']));
$data=array('series'=>$dataseries);
dol_print_graph('stats',300,180,$data,1,'pie',0);
- print '</td></tr>';
+ print '</td></tr>'."\n";
}
else
{
@@ -267,12 +267,13 @@ if ($result)
{
$transRecordedType = $langs->trans("LastModifiedThirdParties",$max);
+ print "\n<!-- last thirdparties modified -->\n";
print '<table class="noborder" width="100%">';
- print '<tr class="liste_titre"><th colspan="2">'.$transRecordedType.'</td>';
- print '<th> </td>';
- print '<th align="right">'.$langs->trans('Status').'</td>';
- print '</tr>';
+ print '<tr class="liste_titre"><th colspan="2">'.$transRecordedType.'</th>';
+ print '<th> </th>';
+ print '<th align="right">'.$langs->trans('Status').'</th>';
+ print '</tr>'."\n";
$var=True;
@@ -326,7 +327,8 @@ if ($result)
$db->free();
- print "</table>";
+ print "</table>\n";
+ print "<!-- End last thirdparties modified -->\n";
}
}
else