Merge lp:~lucian.grijincu/lernid/lernid-lucian into lp:lernid

[Lucian Adrian Grijincu]

[Lucian Adrian Grijincu (lucian.grijincu)]

Fixes two bugs:
#493362 : gtk-ok and gtk-cancel should not be translated.
The translator tab from the About dialog is for translator. It will be filled by rosetta in each .po with the names of each translator. David Planella is credited in the developers tab.

[lp:~lucian.grijincu/lernid/lernid-lucian]

45. By Launchpad Code Hosting <codehost@crowberry> on 2009-12-10

Launchpad automatic translations update.

46. By Jono Bacon on 2009-12-10

Merged in lp:~lucian.grijincu/lernid/lernid-lucian - thanks Lucian!

=== modified file 'data/ui/AboutLernidDialog.ui'
--- data/ui/AboutLernidDialog.ui	2009-12-03 06:30:52 +0000
+++ data/ui/AboutLernidDialog.ui	2009-12-10 03:03:30 +0000
@@ -19,8 +19,9 @@
 
 You should have received a copy of the GNU General Public License along  with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</property>
     <property name="authors">Jono Bacon &lt;[e-mail]&gt;
-Andrew Higginson &lt;[e-mail]&gt;</property>
-    <property name="translator_credits" translatable="yes">David Planella &lt;[e-mail]&gt;</property>
+Andrew Higginson &lt;[e-mail]&gt;
+David Planella &lt;[e-mail]&gt;</property>
+    <property name="translator_credits" translatable="yes">translator-credits</property>
     <property name="artists"></property>
     <property name="wrap_license">True</property>
     <child internal-child="vbox">

=== modified file 'data/ui/PreferencesLernidDialog.ui'
--- data/ui/PreferencesLernidDialog.ui	2009-11-21 18:40:33 +0000
+++ data/ui/PreferencesLernidDialog.ui	2009-12-10 03:03:30 +0000
@@ -22,7 +22,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button2">
-                <property name="label" translatable="yes">gtk-cancel</property>
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -37,7 +37,7 @@
             </child>
             <child>
               <object class="GtkButton" id="button1">
-                <property name="label" translatable="yes">gtk-ok</property>
+                <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>

=== modified file 'po/lernid.pot'
--- po/lernid.pot	2009-12-06 20:39:37 +0000
+++ po/lernid.pot	2009-12-10 03:03:30 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-06 12:39-0800\n"
+"POT-Creation-Date: 2009-12-10 04:58+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -69,7 +69,7 @@
 msgstr ""
 
 #: ../data/ui/AboutLernidDialog.ui.h:8
-msgid "David Planella <[e-mail]>"
+msgid "translator-credits"
 msgstr ""
 
 #: ../lernid.desktop.in.h:2
@@ -88,14 +88,6 @@
 msgid "Nickname"
 msgstr ""
 
-#: ../data/ui/PreferencesLernidDialog.ui.h:1
-msgid "gtk-cancel"
-msgstr ""
-
-#: ../data/ui/PreferencesLernidDialog.ui.h:2
-msgid "gtk-ok"
-msgstr ""
-
 #: ../bin/lernid.py:286 ../bin/lernid.py:287
 msgid "Connected to "
 msgstr ""