[tali/mallard-help: 29/31] Updated Basque language
- From: Rashi Aswani <aswanirashi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tali/mallard-help: 29/31] Updated Basque language
- Date: Sat, 28 Jun 2014 18:42:47 +0000 (UTC)
commit ecdf1ef8771292457744bc1aab52c893776d15e7
Author: Inaki Larranaga Murgoitio <dooteo zundan com>
Date: Mon Mar 24 21:25:06 2014 +0100
Updated Basque language
po/eu.po | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
---
diff --git a/po/eu.po b/po/eu.po
index 22db9ca..965826a 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -72,15 +72,10 @@ 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]