Merge commit 'debian/0.1-4' into debian

Conflicts:
	debian/po/ar.po
	debian/po/cs.po
	debian/po/eu.po
	debian/po/fi.po
	debian/po/gl.po
	debian/po/pt.po
	debian/po/ru.po
	debian/po/ta.po

diff --git a/debian/po/ar.po b/debian/po/ar.po
index 5e662ec720d18dcdb6f85d89abc89d20713e26e3..7efe43f9981675844f7a79a84c37d10fd8110ab4 100644 (file)
--- a/debian/po/ar.po
+++ b/debian/po/ar.po
@@ -37,13 +37,12 @@ msgstr "خادم الوب المطلوب تهيئته آلياً:"
 #. Type: multiselect
 #. Description
 #: ../templates:2002
-#| msgid ""
-#| "RoundCube supports any web server supported by PHP, however only Apache "
-#| "can be configured automatically."
 msgid ""
 "RoundCube supports any web server supported by PHP, however only Apache 2 "
 "and lighttpd can be configured automatically."
-msgstr "يدعم RoundCube أي خادم وب يدعمه PHP، ولكن يمكن تهيئة Apache وlighttpd فقط آلياً."
+msgstr ""
+"يدعم RoundCube أي خادم وب يدعمه PHP، ولكن يمكن تهيئة Apache وlighttpd فقط "
+"آلياً."
 
 #. Type: multiselect
 #. Description
@@ -62,9 +61,6 @@ msgstr "هل تريد تشغيل خادم الوب الآن؟"
 #. Type: boolean
 #. Description
 #: ../templates:3001
-#| msgid ""
-#| "In order to activate the new configuration, the reconfigured web servers "
-#| "have to be restarted."
 msgid ""
 "In order to activate the new configuration, the reconfigured web server(s) "
 "have to be restarted."
@@ -127,4 +123,3 @@ msgid ""
 msgstr ""
 "على أي، سيتم استخدام اللغة الافتراضية لشاشة تسجيل الدخول والاتصال الأول "
 "للمستخدمين."
-

diff --git a/debian/po/cs.po b/debian/po/cs.po
index 55321e875dd7f77ca9f20982af5beec7ced95f8e..b3122cbeef1cf8762f2f53db1acdf60e91e99000 100644 (file)
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -36,9 +36,6 @@ msgstr "Webové servery, které se mají nastavit automaticky:"
 #. Type: multiselect
 #. Description
 #: ../templates:2002
-#| msgid ""
-#| "RoundCube supports any web server supported by PHP, however only Apache "
-#| "can be configured automatically."
 msgid ""
 "RoundCube supports any web server supported by PHP, however only Apache 2 "
 "and lighttpd can be configured automatically."
@@ -65,9 +62,6 @@ msgstr "Mají se webové servery restartovat nyní?"
 #. Type: boolean
 #. Description
 #: ../templates:3001
-#| msgid ""
-#| "In order to activate the new configuration, the reconfigured web servers "
-#| "have to be restarted."
 msgid ""
 "In order to activate the new configuration, the reconfigured web server(s) "
 "have to be restarted."

diff --git a/debian/po/eu.po b/debian/po/eu.po
index a496676931e4b53a826612cdba0327f7602227f1..0e011a81ee4684625f5e97c145305923f30a6d68 100644 (file)
--- a/debian/po/eu.po
+++ b/debian/po/eu.po
@@ -37,9 +37,6 @@ msgstr "Automatikoki konfiguratu behar den web zerbitzaria:"
 #. Type: multiselect
 #. Description
 #: ../templates:2002
-#| msgid ""
-#| "RoundCube supports any web server supported by PHP, however only Apache "
-#| "can be configured automatically."
 msgid ""
 "RoundCube supports any web server supported by PHP, however only Apache 2 "
 "and lighttpd can be configured automatically."
@@ -66,15 +63,12 @@ msgstr "Web zerbitzaria(k) orain berrabiarazi behar al da?"
 #. Type: boolean
 #. Description
 #: ../templates:3001
-#| msgid ""
-#| "In order to activate the new configuration, the reconfigured web servers "
-#| "have to be restarted."
 msgid ""
 "In order to activate the new configuration, the reconfigured web server(s) "
 "have to be restarted."
 msgstr ""
-"Konfigurazio berria gaitu ahal izateko, birkonfiguratutako web zerbitzaria(k) "
-"berrabiarazi egin behar d(ir)a."
+"Konfigurazio berria gaitu ahal izateko, birkonfiguratutako web zerbitzaria"
+"(k) berrabiarazi egin behar d(ir)a."
 
 #. Type: string
 #. Description
@@ -136,4 +130,3 @@ msgid ""
 msgstr ""
 "Hala ere, lehenetsiriko hizkuntza saio hasiera orria eta erabiltzailearen "
 "lehen konexioetan erabiliko da."
-

diff --git a/debian/po/fi.po b/debian/po/fi.po
index b30e3ea9bf17b9257ee6b6fc33dba05394f17544..5c3f1d5c39561ebfb6194c813914942d6f3fc942 100644 (file)
--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -33,11 +33,12 @@ msgstr "Automaattisesti asetettavat verkkopalvelimet:"
 #. Type: multiselect
 #. Description
 #: ../templates:2002
-#| msgid ""
-#| "RoundCube supports any web server supported by PHP, however only Apache "
-#| "can be configured automatically."
-msgid "RoundCube supports any web server supported by PHP, however only Apache 2 and lighttpd can be configured automatically."
-msgstr "RoundCube tukee mitä tahansa verkkopalvelinta, joka tukee PHP:ta. Vain Apache 2 ja lighttpd voidaan kuitenkin asettaa automaattisesti."
+msgid ""
+"RoundCube supports any web server supported by PHP, however only Apache 2 "
+"and lighttpd can be configured automatically."
+msgstr ""
+"RoundCube tukee mitä tahansa verkkopalvelinta, joka tukee PHP:ta. Vain "
+"Apache 2 ja lighttpd voidaan kuitenkin asettaa automaattisesti."
 
 #. Type: multiselect
 #. Description
@@ -54,8 +55,12 @@ msgstr "Tulisiko verkkopalvelimet käynnistää uudelleen nyt?"
 #. Type: boolean
 #. Description
 #: ../templates:3001
-msgid "In order to activate the new configuration, the reconfigured web server(s) have to be restarted."
-msgstr "Uusien asetusten ottamiseksi käyttöön asetetut verkkopalvelimet tulee käynnistää uudelleen."
+msgid ""
+"In order to activate the new configuration, the reconfigured web server(s) "
+"have to be restarted."
+msgstr ""
+"Uusien asetusten ottamiseksi käyttöön asetetut verkkopalvelimet tulee "
+"käynnistää uudelleen."
 
 #. Type: string
 #. Description
@@ -72,14 +77,24 @@ msgstr "Valitse IMAP-palvelimet, joita käytetään RoundCuben kanssa."
 #. Type: string
 #. Description
 #: ../templates:4001
-msgid "If this is left blank, a text box will be displayed at login. Entering a space-separated list of hosts will display a pull-down menu. Entering a single host will enforce using this host."
-msgstr "Jos tämä kenttä jätetään tyhjäksi, kirjautumisvaiheessa näytetään tekstikenttä. Jos tässä kentässä on välilyönnein eroteltu lista palvelimista, kirjauduttaessa näytetään alasvetovalikko. Yhden palvelimen syöttäminen pakottaa kyseisen palvelimen käyttöön."
+msgid ""
+"If this is left blank, a text box will be displayed at login. Entering a "
+"space-separated list of hosts will display a pull-down menu. Entering a "
+"single host will enforce using this host."
+msgstr ""
+"Jos tämä kenttä jätetään tyhjäksi, kirjautumisvaiheessa näytetään "
+"tekstikenttä. Jos tässä kentässä on välilyönnein eroteltu lista "
+"palvelimista, kirjauduttaessa näytetään alasvetovalikko. Yhden palvelimen "
+"syöttäminen pakottaa kyseisen palvelimen käyttöön."
 
 #. Type: string
 #. Description
 #: ../templates:4001
-msgid "To use SSL connections, please enter host names as 'ssl://hostname:993'."
-msgstr "SSL-yhteydet saadaan käyttöön syöttämällä palvelimien verkkonimet muodossa ”ssl://verkkonimi:993”."
+msgid ""
+"To use SSL connections, please enter host names as 'ssl://hostname:993'."
+msgstr ""
+"SSL-yhteydet saadaan käyttöön syöttämällä palvelimien verkkonimet muodossa "
+"”ssl://verkkonimi:993”."
 
 #. Type: select
 #. Description

diff --git a/debian/po/gl.po b/debian/po/gl.po
index 68ee003f36c3b07dfeeb127bfb7cfb8c76141b5a..a1f027ca0a76853dc9c7d6482c116e091e17308b 100644 (file)
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -35,9 +35,6 @@ msgstr "Servidor(es) web a reconfigurar automaticamente:"
 #. Type: multiselect
 #. Description
 #: ../templates:2002
-#| msgid ""
-#| "RoundCube supports any web server supported by PHP, however only Apache "
-#| "can be configured automatically."
 msgid ""
 "RoundCube supports any web server supported by PHP, however only Apache 2 "
 "and lighttpd can be configured automatically."

diff --git a/debian/po/pt.po b/debian/po/pt.po
index 586eac77d29b9826002759bc8fab54b8e96da95a..71aaa1012d28982469fcb1b6868e38947f04ff3d 100644 (file)
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -37,9 +37,6 @@ msgstr "Servidor(es) web a configurar automaticamente:"
 #. Type: multiselect
 #. Description
 #: ../templates:2002
-#| msgid ""
-#| "RoundCube supports any web server supported by PHP, however only Apache "
-#| "can be configured automatically."
 msgid ""
 "RoundCube supports any web server supported by PHP, however only Apache 2 "
 "and lighttpd can be configured automatically."
@@ -66,9 +63,6 @@ msgstr "Deverá o servidor web ser reiniciado agora?"
 #. Type: boolean
 #. Description
 #: ../templates:3001
-#| msgid ""
-#| "In order to activate the new configuration, the reconfigured web servers "
-#| "have to be restarted."
 msgid ""
 "In order to activate the new configuration, the reconfigured web server(s) "
 "have to be restarted."
@@ -138,8 +132,8 @@ msgid ""
 "However, the default language will be used for the login screen and the "
 "first connection of users."
 msgstr ""
-"No entanto, o idioma pré-definido será utilizado para o ecrã de login e "
-"para a primeira ligação dos utilizadores."
+"No entanto, o idioma pré-definido será utilizado para o ecrã de login e para "
+"a primeira ligação dos utilizadores."
 
 #~ msgid "apache"
 #~ msgstr "apache"

diff --git a/debian/po/ru.po b/debian/po/ru.po
index 535638a1ede9d41ede512acc33a52913a6f2336f..b376572078ab7116d454d714b27cc86ea0b3947d 100644 (file)
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -38,9 +38,6 @@ msgstr "Веб-сервер(ы), которые нужно настроить а
 #. Type: multiselect
 #. Description
 #: ../templates:2002
-#| msgid ""
-#| "RoundCube supports any web server supported by PHP, however only Apache "
-#| "can be configured automatically."
 msgid ""
 "RoundCube supports any web server supported by PHP, however only Apache 2 "
 "and lighttpd can be configured automatically."
@@ -65,9 +62,6 @@ msgstr "Перезапустить веб-сервер(ы) прямо сейча
 #. Type: boolean
 #. Description
 #: ../templates:3001
-#| msgid ""
-#| "In order to activate the new configuration, the reconfigured web servers "
-#| "have to be restarted."
 msgid ""
 "In order to activate the new configuration, the reconfigured web server(s) "
 "have to be restarted."
@@ -135,4 +129,3 @@ msgid ""
 msgstr ""
 "Однако, язык по умолчанию будет использован для выдачи приглашения к входу и "
 "во время первого подключения пользователя."
-

diff --git a/debian/po/ta.po b/debian/po/ta.po
index c6910a32b2924eae9574500db00d51f583a1ed29..65f3fef763534cb69bce3a4dd5fbae85db610e23 100644 (file)
--- a/debian/po/ta.po
+++ b/debian/po/ta.po
@@ -37,15 +37,12 @@ msgstr "தானியங்கியாக வடிவமைக்க வல
 #. Type: multiselect
 #. Description
 #: ../templates:2002
-#| msgid ""
-#| "RoundCube supports any web server supported by PHP, however only Apache "
-#| "can be configured automatically."
 msgid ""
 "RoundCube supports any web server supported by PHP, however only Apache 2 "
 "and lighttpd can be configured automatically."
 msgstr ""
-"ரவுண்ட் க்யூப் ஹெச்பிஆல் ஆதரிக்கப்பட்ட எந்த வலை சேவையகத்தையும் ஆதரிக்கும். ஆயினும் அபாசே 2 மற்றும் லைட்டிபிடி (lighttpd ) "
-"மட்டுமே தானியங்கியாக வடிவமைக்கப்பட முடியும்."
+"ரவுண்ட் க்யூப் ஹெச்பிஆல் ஆதரிக்கப்பட்ட எந்த வலை சேவையகத்தையும் ஆதரிக்கும். ஆயினும் அபாசே 2 "
+"மறà¯\8dà®±à¯\81à®®à¯\8d லà¯\88à®\9fà¯\8dà®\9fிபிà®\9fி (lighttpd ) à®®à®\9fà¯\8dà®\9fà¯\81à®®à¯\87 தானியà®\99à¯\8dà®\95ியாà®\95 வà®\9fிவமà¯\88à®\95à¯\8dà®\95பà¯\8dபà®\9f à®®à¯\81à®\9fியà¯\81à®®à¯\8d."
 
 #. Type: multiselect
 #. Description
@@ -66,13 +63,11 @@ msgstr "வலை சேவையகத்தை(கங்களை) மீள
 #. Type: boolean
 #. Description
 #: ../templates:3001
-#| msgid ""
-#| "In order to activate the new configuration, the reconfigured web servers "
-#| "have to be restarted."
 msgid ""
 "In order to activate the new configuration, the reconfigured web server(s) "
 "have to be restarted."
-msgstr "புதிய வடிவமைப்பை செயல்படுத்த வடிவமைத்த வலை சேவையகம் (-கங்கள்) மீள் துவக்கப் பட வேண்டும்."
+msgstr ""
+"புதிய வடிவமைப்பை செயல்படுத்த வடிவமைத்த வலை சேவையகம் (-கங்கள்) மீள் துவக்கப் பட வேண்டும்."
 
 #. Type: string
 #. Description
@@ -128,5 +123,5 @@ msgstr "இந்த தேர்வு பயனர் விருப்பங
 msgid ""
 "However, the default language will be used for the login screen and the "
 "first connection of users."
-msgstr "ஆயினும் உள்நுழைவின் போதும் முதல் பயனர் இணைப்பின் போதும் முன்னிருப்பு மொழியே பயன் படும்."
-
+msgstr ""
+"ஆயினும் உள்நுழைவின் போதும் முதல் பயனர் இணைப்பின் போதும் முன்னிருப்பு மொழியே பயன் படும்."