[tali/mallard-help: 1/31] Updated Basque language
- From: Rashi Aswani <aswanirashi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tali/mallard-help: 1/31] Updated Basque language
- Date: Sat, 28 Jun 2014 18:40:26 +0000 (UTC)
commit a245079b15de2b6026e30e5aef5341eb456e0d1e
Author: Inaki Larranaga Murgoitio <dooteo zundan com>
Date: Mon Mar 24 21:26:07 2014 +0100
Updated Basque language
po/eu.po | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/po/eu.po b/po/eu.po
index 965826a..22db9ca 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -72,10 +72,15 @@ msgid ""
"known variant with colored dice."
msgstr ""
"Pokerraren aldaera bat, dadoekin eta diru gutxiagorekin. Jaurti dadoa hiru "
+<<<<<<< HEAD
"aldiz "
"aldiko, nahi dituzunak gorde esku hobeagoa edukitzeko. Hain ezaguna ez den "
"aldaera batera ere joka dezakezu: "
"koloreztatutako dadoekin."
+=======
+"aldiz aldiko, nahi dituzunak gorde esku hobeagoa edukitzeko. Hain ezaguna ez "
+"den aldaera batera ere joka dezakezu: koloreztatutako dadoekin."
+>>>>>>> Updated Basque language
#: ../data/tali.appdata.xml.in.h:2
msgid "Play between one and five opponents at three difficulty levels."
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]