From ca1ee28844fda1099036a5138cc35834c8f62f31 Mon Sep 17 00:00:00 2001 From: Pootle daemon Date: Sun, 22 Jul 2012 05:30:40 +0000 Subject: commit multiple PO files, resolve Poolte conflict --- diff --git a/po/bi.po b/po/bi.po index ad2b025..9b596e4 100644 --- a/po/bi.po +++ b/po/bi.po @@ -39,7 +39,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-04 13:41+0000\n" +"POT-Creation-Date: 2012-06-07 00:36-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -49,100 +49,100 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Translate Toolkit 1.3.0\n" -#: activity.py:137 +#: activity/activity.info:2 +msgid "Speak" +msgstr "" + +#: activity.py:135 msgid "Type something to hear it" msgstr "" -#: activity.py:144 +#: activity.py:142 msgid "Ask robot any question" msgstr "" -#: activity.py:152 +#: activity.py:150 msgid "Voice chat" msgstr "" -#: activity.py:164 +#: activity.py:159 msgid "Voice" msgstr "" -#: activity.py:170 +#: activity.py:165 msgid "Face" msgstr "" -#: activity.py:199 +#: activity.py:194 #, python-format msgid "Hello %s. Please Type something." msgstr "" -#: activity.py:263 +#: activity.py:260 msgid "Pitch:" msgstr "" -#: activity.py:276 +#: activity.py:273 msgid "Rate:" msgstr "" -#: activity.py:284 +#: activity.py:281 msgid "pitch adjusted" msgstr "" -#: activity.py:288 +#: activity.py:285 msgid "rate adjusted" msgstr "" -#: activity.py:294 +#: activity.py:291 msgid "Simple" msgstr "" -#: activity.py:295 +#: activity.py:292 msgid "Waveform" msgstr "" -#: activity.py:296 +#: activity.py:293 msgid "Frequency" msgstr "" -#: activity.py:301 +#: activity.py:298 msgid "Mouth:" msgstr "" -#: activity.py:305 +#: activity.py:302 msgid "Round" msgstr "" -#: activity.py:306 +#: activity.py:303 msgid "Glasses" msgstr "" -#: activity.py:311 +#: activity.py:308 msgid "Eyes:" msgstr "" -#: activity.py:322 +#: activity.py:319 msgid "Eyes number:" msgstr "" -#: activity.py:334 +#: activity.py:331 msgid "mouth changed" msgstr "" -#: activity.py:346 +#: activity.py:343 msgid "eyes changed" msgstr "" -#: activity.py:445 +#: activity.py:442 #, python-format -msgid "Sorry, I can't speak %s, let's speak %s instead." +msgid "Sorry, I can't speak %(old_voice)s, let's talk %(new_voice)s instead." msgstr "" #: activity.py:473 msgid "You are in off-line mode, share and invite someone." msgstr "" -#: activity/activity.info:2 -msgid "Speak" -msgstr "" - #: brain.py:33 voice.py:67 msgid "Spanish" msgstr "" @@ -174,35 +174,39 @@ msgstr "" msgid "Copy to Clipboard" msgstr "" -#: toolkit/activity_widgets.py:83 +#: toolkit/activity_widgets.py:84 msgid "Stop" msgstr "" -#: toolkit/activity_widgets.py:95 +#: toolkit/activity_widgets.py:96 msgid "Undo" msgstr "" -#: toolkit/activity_widgets.py:103 +#: toolkit/activity_widgets.py:104 msgid "Redo" msgstr "" -#: toolkit/activity_widgets.py:110 +#: toolkit/activity_widgets.py:111 msgid "Copy" msgstr "" -#: toolkit/activity_widgets.py:117 +#: toolkit/activity_widgets.py:118 msgid "Paste" msgstr "" -#: toolkit/activity_widgets.py:127 +#: toolkit/activity_widgets.py:128 msgid "Private" msgstr "" -#: toolkit/activity_widgets.py:134 +#: toolkit/activity_widgets.py:135 msgid "My Neighborhood" msgstr "" -#: toolkit/activity_widgets.py:322 +#: toolkit/activity_widgets.py:213 +msgid "Description" +msgstr "" + +#: toolkit/activity_widgets.py:393 msgid "Activity" msgstr "" diff --git a/po/de.po b/po/de.po index 01c16a5..04870c0 100644 --- a/po/de.po +++ b/po/de.po @@ -59,8 +59,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-06-07 00:36-0400\n" -"PO-Revision-Date: 2012-02-19 12:51+0200\n" -"Last-Translator: olenz \n" +"PO-Revision-Date: 2012-06-25 21:48+0200\n" +"Last-Translator: mattthias \n" "Language-Team: LANGUAGE \n" "Language: de\n" "MIME-Version: 1.0\n" @@ -230,7 +230,7 @@ msgstr "Meine Umgebung" #: toolkit/activity_widgets.py:213 msgid "Description" -msgstr "" +msgstr "Beschreibung" #: toolkit/activity_widgets.py:393 msgid "Activity" diff --git a/po/hus.po b/po/hus.po index 9077a20..b9b67ef 100644 --- a/po/hus.po +++ b/po/hus.po @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-06-07 00:36-0400\n" -"PO-Revision-Date: 2012-03-01 08:57+0200\n" -"Last-Translator: Chris \n" +"PO-Revision-Date: 2012-06-24 02:20+0200\n" +"Last-Translator: ing.arturo.lara \n" "Language-Team: LANGUAGE \n" "Language: hus\n" "MIME-Version: 1.0\n" @@ -68,7 +68,7 @@ msgstr "Alk'idh" #: activity.py:292 msgid "Waveform" -msgstr "ik' bel" +msgstr "Ik' bel" #: activity.py:293 msgid "Frequency" @@ -113,7 +113,7 @@ msgstr "It k'wajat ti in alwa´yab ts'ot'k'odh, ts'ejlixna ani ka kániy jita'." #: brain.py:33 voice.py:67 msgid "Spanish" -msgstr "labkaw" +msgstr "Labkaw" #: brain.py:37 brain.py:52 brain.py:54 brain.py:64 voice.py:58 msgid "English" diff --git a/po/pt.po b/po/pt.po index 60754b0..e80c13e 100644 --- a/po/pt.po +++ b/po/pt.po @@ -35,8 +35,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-06-07 00:36-0400\n" -"PO-Revision-Date: 2012-04-03 00:34+0200\n" -"Last-Translator: Eduardo H. \n" +"PO-Revision-Date: 2012-06-25 01:45+0200\n" +"Last-Translator: Luis \n" "Language-Team: LANGUAGE \n" "Language: pt\n" "MIME-Version: 1.0\n" @@ -202,7 +202,7 @@ msgstr "A Minha Vizinhança" #: toolkit/activity_widgets.py:213 msgid "Description" -msgstr "" +msgstr "Descrição" #: toolkit/activity_widgets.py:393 msgid "Activity" diff --git a/po/quz.po b/po/quz.po index 7ae7436..75349c3 100644 --- a/po/quz.po +++ b/po/quz.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-06-07 00:36-0400\n" -"PO-Revision-Date: 2011-11-21 05:42+0200\n" +"PO-Revision-Date: 2012-07-16 01:58+0200\n" "Last-Translator: Chris \n" "Language-Team: Voluntarios quechuas Sugar Camp Lima\n" "Language: quz\n" @@ -204,11 +204,12 @@ msgstr "wakinkunallapaq" # "Vecindario" #: toolkit/activity_widgets.py:135 msgid "My Neighborhood" -msgstr "Ayllu" +msgstr "Aylluy" #: toolkit/activity_widgets.py:213 +#, fuzzy msgid "Description" -msgstr "" +msgstr "Riqsichinapaq" # "Actividad" #: toolkit/activity_widgets.py:393 @@ -363,7 +364,7 @@ msgstr "Eslovaco simi" # "Polaco" #: voice.py:68 msgid "Polish" -msgstr "Poalco simi" +msgstr "Polaco simi" # "Esperanto" #: voice.py:69 -- cgit v0.9.1