Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

phpmyadmin · Aug 3, 2015 · f7626c6 · f7626c6
2 parents 36ba14a + e48f212
commit f7626c6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 24 deletions.
diff --git a/po/it.po b/po/it.po
@@ -2,12 +2,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
-"Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
+"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2015-08-03 09:51+0200\n"
-"PO-Revision-Date: 2015-08-02 11:19+0200\n"
+"PO-Revision-Date: 2015-08-03 14:01+0200\n"
 "Last-Translator: Stefano Martinelli <stefano.ste.martinelli@gmail.com>\n"
-"Language-Team: Italian <https://hosted.weblate.org/projects/phpmyadmin/"
-"master/it/>\n"
+"Language-Team: Italian "
+"<https://hosted.weblate.org/projects/phpmyadmin/master/it/>\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -3833,10 +3833,9 @@ msgid "Error while moving uploaded file."
 msgstr "Si é verificato un errore durante lo spostamento del file."
 
 #: libraries/File.class.php:487
-#, fuzzy
 #| msgid "Cannot read (moved) upload file."
 msgid "Cannot read moved uploaded file."
-msgstr "Impossibile leggere il file caricato (spostato)."
+msgstr "Impossibile leggere il file caricato (è stato spostato)."
 
 #: libraries/Footer.class.php:74
 #, php-format
@@ -8212,10 +8211,9 @@ msgstr "Password Hashing:"
 
 #: libraries/display_change_password.lib.php:96
 #: libraries/server_privileges.lib.php:1698
-#, fuzzy
 #| msgid "mysql_native_password"
 msgid "MySQL native password"
-msgstr "mysql_native_password"
+msgstr "Password nativa MySQL"
 
 #: libraries/display_change_password.lib.php:136
 msgid "MySQL 4.0 compatible"
@@ -14133,10 +14131,9 @@ msgid "Unexpected token."
 msgstr "Token inatteso."
 
 #: libraries/sql-parser/src/Statement.php:238
-#, fuzzy
 #| msgid "No transaction was previously started."
 msgid "This type of clause was previously parsed."
-msgstr "Non è stata iniziata alcuna transazione in precedenza."
+msgstr "Questo tipo di clausola è stata esaminata in precedenza."
 
 #: libraries/sql-parser/src/Statement.php:265
 msgid "A new statement was found, but no delimiter between them."

diff --git a/po/sl.po b/po/sl.po
@@ -2,18 +2,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
-"Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
+"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2015-08-03 09:51+0200\n"
-"PO-Revision-Date: 2015-07-31 22:51+0200\n"
+"PO-Revision-Date: 2015-08-03 15:54+0200\n"
 "Last-Translator: Domen <mitenem@outlook.com>\n"
-"Language-Team: Slovenian <https://hosted.weblate.org/projects/phpmyadmin/"
-"master/sl/>\n"
+"Language-Team: Slovenian "
+"<https://hosted.weblate.org/projects/phpmyadmin/master/sl/>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3;\n"
+"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
+"n%100==4 ? 2 : 3;\n"
 "X-Generator: Weblate 2.4-dev\n"
 
 #: changelog.php:37 license.php:30
@@ -3809,10 +3809,9 @@ msgid "Error while moving uploaded file."
 msgstr "Napaka pri premikanju naložene datoteke."
 
 #: libraries/File.class.php:487
-#, fuzzy
 #| msgid "Cannot read (moved) upload file."
 msgid "Cannot read moved uploaded file."
-msgstr "Ne morem prebrati (premakniti) naložene datoteke."
+msgstr "Ne morem prebrati premaknjene naložene datoteke."
 
 #: libraries/Footer.class.php:74
 #, php-format
@@ -8129,10 +8128,9 @@ msgstr "Šifriranje gesel:"
 
 #: libraries/display_change_password.lib.php:96
 #: libraries/server_privileges.lib.php:1698
-#, fuzzy
 #| msgid "mysql_native_password"
 msgid "MySQL native password"
-msgstr "mysql_native_password"
+msgstr "Domače geslo MySQL"
 
 #: libraries/display_change_password.lib.php:136
 msgid "MySQL 4.0 compatible"
@@ -12451,10 +12449,9 @@ msgid "Authentication Plugin"
 msgstr "Vtičnik za overovitev"
 
 #: libraries/server_privileges.lib.php:1709
-#, fuzzy
 #| msgid "Change password"
 msgid "sha256_password"
-msgstr "Spremeni geslo"
+msgstr "sha256_password"
 
 #: libraries/server_privileges.lib.php:1926
 #, php-format
@@ -13967,10 +13964,9 @@ msgid "Unexpected token."
 msgstr "Nepričakovan žeton."
 
 #: libraries/sql-parser/src/Statement.php:238
-#, fuzzy
 #| msgid "No transaction was previously started."
 msgid "This type of clause was previously parsed."
-msgstr "Začeli niste nobene transakcije."
+msgstr "To vrsto stavka smo prej razčlenili."
 
 #: libraries/sql-parser/src/Statement.php:265
 msgid "A new statement was found, but no delimiter between them."