The branch, master has been updated
via 75c263252716351ffeb5900f2d5573199a311820 (commit)
via 5d3b448c985d380d81c261e96e2badf4a031b369 (commit)
via b1d61e7b881871d98a1203e9082523bf352d0976 (commit)
via 948d7a290a803ede8e859c0867aab09ca236dc65 (commit)
via ac1f345d75ecefcf4165697f305dd7e320d3e3a0 (commit)
from 17eb0c75c5efa43760ac5715103a67ff92da5192 (commit)
- Log -----------------------------------------------------------------
commit 75c263252716351ffeb5900f2d5573199a311820
Merge: 5d3b448 17eb0c7
Author: Pootle server <poo...@cihar.com>
Date: Wed Jan 4 10:40:08 2012 +0100
Merge remote-tracking branch 'origin/master'
commit 5d3b448c985d380d81c261e96e2badf4a031b369
Author: Marc Delisle <m...@infomarc.info>
Date: Tue Jan 3 20:53:53 2012 +0200
Translation update done using Pootle.
commit b1d61e7b881871d98a1203e9082523bf352d0976
Author: Marc Delisle <m...@infomarc.info>
Date: Tue Jan 3 20:53:23 2012 +0200
Translation update done using Pootle.
commit 948d7a290a803ede8e859c0867aab09ca236dc65
Author: Marc Delisle <m...@infomarc.info>
Date: Tue Jan 3 20:53:00 2012 +0200
Translation update done using Pootle.
commit ac1f345d75ecefcf4165697f305dd7e320d3e3a0
Author: Burak Yavuz <hitowerdi...@hotmail.com>
Date: Tue Jan 3 20:20:09 2012 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/en_GB.po | 17 +++++++----------
po/tr.po | 2 +-
2 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/po/en_GB.po b/po/en_GB.po
index 2e08703..8fa5a34 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -4,13 +4,13 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-de...@lists.sourceforge.net\n"
"POT-Creation-Date: 2012-01-02 07:46-0500\n"
-"PO-Revision-Date: 2011-12-29 14:54+0200\n"
+"PO-Revision-Date: 2012-01-03 20:53+0200\n"
"Last-Translator: Marc Delisle <m...@infomarc.info>\n"
"Language-Team: english-gb <en...@li.org>\n"
+"Language: en_GB\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: en_GB\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.1.6\n"
@@ -2251,15 +2251,14 @@ msgstr "Wk"
#. l10n: Month-year order for calendar, use either "calendar-month-year" or
"calendar-year-month".
#: js/messages.php:483
msgid "calendar-month-year"
-msgstr ""
+msgstr "calendar-month-year"
#. l10n: Year suffix for calendar, "none" is empty.
#: js/messages.php:485
-#, fuzzy
#| msgid "None"
msgctxt "Year suffix"
msgid "none"
-msgstr "None"
+msgstr "none"
#: js/messages.php:494
msgid "Hour"
@@ -10525,7 +10524,6 @@ msgid "Using the monitor:"
msgstr "Using the monitor:"
#: server_status.php:1620
-#, fuzzy
#| msgid ""
#| "Ok, you are good to go! Once you click 'Start monitor' your browser will "
#| "refresh all displayed charts in a regular interval. You may add charts "
@@ -10536,10 +10534,9 @@ msgid ""
"may add charts and change the refresh rate under 'Settings', or remove any "
"chart using the cog icon on each respective chart."
msgstr ""
-"Ok, you are good to go! Once you click 'Start monitor' your browser will "
-"refresh all displayed charts in a regular interval. You may add charts and "
-"change the refresh rate under 'Settings', or remove any chart using the cog "
-"icon on each respective chart."
+"Your browser will refresh all displayed charts in a regular interval. You "
+"may add charts and change the refresh rate under 'Settings', or remove any "
+"chart using the cog icon on each respective chart."
#: server_status.php:1622
msgid ""
diff --git a/po/tr.po b/po/tr.po
index be75ef6..00d1ea9 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -2262,7 +2262,7 @@ msgstr "Hs"
#. l10n: Month-year order for calendar, use either "calendar-month-year" or
"calendar-year-month".
#: js/messages.php:483
msgid "calendar-month-year"
-msgstr "takvim-ay-yıl"
+msgstr "calendar-month-year"
#. l10n: Year suffix for calendar, "none" is empty.
#: js/messages.php:485
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
infrastructure or vast IT resources to deliver seamless, secure access to
virtual desktops. With this all-in-one solution, easily deploy virtual
desktops for less than the cost of PCs and save 60% on VDI infrastructure
costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
_______________________________________________
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
