API tools faq
paste
Advertisement
Guest User

Untitled

a guest
May 7th, 2017
644
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 12.95 KB | None | 0 0
raw download clone embed print report
  1. === modified file 'localization/da.po'
  2. --- localization/da.po 2010-01-18 15:01:35 +0000
  3. +++ localization/da.po 2010-01-29 19:44:39 +0000
  4. @@ -8,8 +8,13 @@
  5. "Project-Id-Version: eventum\n"
  6. "Report-Msgid-Bugs-To: \n"
  7. "POT-Creation-Date: 2010-01-06 00:02+0200\n"
  8. +<<<<<<< TREE
  9. "PO-Revision-Date: 2009-12-31 14:37+0000\n"
  10. "Last-Translator: nanker <Unknown>\n"
  11. +=======
  12. +"PO-Revision-Date: 2010-01-08 15:14+0000\n"
  13. +"Last-Translator: Elan Ruusamäe <Unknown>\n"
  14. +>>>>>>> MERGE-SOURCE
  15. "Language-Team: Danish <da@li.org>\n"
  16. "MIME-Version: 1.0\n"
  17. "Content-Type: text/plain; charset=UTF-8\n"
  18.  
  19. === modified file 'localization/eo.po'
  20. --- localization/eo.po 2010-01-18 15:01:35 +0000
  21. +++ localization/eo.po 2010-01-29 19:44:39 +0000
  22. @@ -8,7 +8,11 @@
  23. "Project-Id-Version: eventum\n"
  24. "Report-Msgid-Bugs-To: \n"
  25. "POT-Creation-Date: 2010-01-06 00:02+0200\n"
  26. +<<<<<<< TREE
  27. "PO-Revision-Date: 2009-12-31 23:56+0000\n"
  28. +=======
  29. +"PO-Revision-Date: 2010-01-08 15:49+0000\n"
  30. +>>>>>>> MERGE-SOURCE
  31. "Last-Translator: Stephen Brown <sbrown1992@gmail.com>\n"
  32. "Language-Team: Esperanto <eo@li.org>\n"
  33. "MIME-Version: 1.0\n"
  34.  
  35. === modified file 'localization/es.po'
  36. --- localization/es.po 2010-01-05 22:04:09 +0000
  37. +++ localization/es.po 2010-01-29 19:44:40 +0000
  38. @@ -7,14 +7,23 @@
  39. "Project-Id-Version: Eventum 2.2\n"
  40. "Report-Msgid-Bugs-To: \n"
  41. "POT-Creation-Date: 2010-01-06 00:02+0200\n"
  42. +<<<<<<< TREE
  43. "PO-Revision-Date: 2009-11-05 20:27+0000\n"
  44. "Last-Translator: Normando Hall <nhall@unixlan.com.ar>\n"
  45. +=======
  46. +"PO-Revision-Date: 2010-01-20 22:55+0000\n"
  47. +"Last-Translator: Santiago Riega <sriega@gmail.com>\n"
  48. +>>>>>>> MERGE-SOURCE
  49. "Language-Team: Spanish <eventum-devel@lists.mysql.com>\n"
  50. "MIME-Version: 1.0\n"
  51. "Content-Type: text/plain; charset=UTF-8\n"
  52. "Content-Transfer-Encoding: 8bit\n"
  53. "Plural-Forms: nplurals=2; plural=n != 1;\n"
  54. +<<<<<<< TREE
  55. "X-Launchpad-Export-Date: 2009-11-21 04:47+0000\n"
  56. +=======
  57. +"X-Launchpad-Export-Date: 2010-01-22 04:35+0000\n"
  58. +>>>>>>> MERGE-SOURCE
  59. "X-Generator: Launchpad (build Unknown)\n"
  60. "Language: es\n"
  61.  
  62. @@ -188,6 +197,8 @@
  63. "<b>NOTE:</b> Email will be broadcasted to the full notification list, "
  64. "including any customers, if this option is chosen."
  65. msgstr ""
  66. +"<b>NOTA:</b> El email será difundido a toda la lista de notificación, "
  67. +"incluyendo cualquier cliente, si es que esta opción ha sido escogida."
  68.  
  69. #: templates/associate.tpl.html
  70. msgid ""
  71. @@ -6214,7 +6225,7 @@
  72.  
  73. #: templates/associate.tpl.html
  74. msgid "Save Message as an Internal Note"
  75. -msgstr ""
  76. +msgstr "Guardar el mensaje como una nota interna"
  77.  
  78. #: templates/add_phone_entry.tpl.html
  79. msgid "Save Phone Call"
  80. @@ -7845,10 +7856,13 @@
  81. "\n"
  82. "%2."
  83. msgstr ""
  84. +"Este caso ya lo cerró %1 con el mensaje:\n"
  85. +"\n"
  86. +"%2"
  87.  
  88. #: templates/notifications/closed.tpl.text
  89. msgid "This issue was just closed by %1."
  90. -msgstr ""
  91. +msgstr "Este caso ya fue cerrado por %1."
  92.  
  93. #: templates/view_email.tpl.html
  94. msgid "This message already belongs to that account"
  95. @@ -8448,7 +8462,7 @@
  96.  
  97. #: templates/emails.tpl.html
  98. msgid "Viewing Emails (%1 email found)"
  99. -msgstr ""
  100. +msgstr "Monstrando correos (%1 encontrados)"
  101.  
  102. #: lib/eventum/class.help.php:121 templates/help/main.tpl.html
  103. #: templates/help/view.tpl.html
  104.  
  105. === modified file 'localization/fr.po'
  106. --- localization/fr.po 2010-01-18 15:01:35 +0000
  107. +++ localization/fr.po 2010-01-29 19:44:40 +0000
  108. @@ -8,14 +8,23 @@
  109. "Project-Id-Version: eventum\n"
  110. "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
  111. "POT-Creation-Date: 2010-01-06 00:02+0200\n"
  112. +<<<<<<< TREE
  113. "PO-Revision-Date: 2010-01-14 11:34+0000\n"
  114. "Last-Translator: Pierre Slamich <pierre.slamich@gmail.com>\n"
  115. +=======
  116. +"PO-Revision-Date: 2010-01-20 13:32+0000\n"
  117. +"Last-Translator: winniemiel05 <winniemiel05@sfr.fr>\n"
  118. +>>>>>>> MERGE-SOURCE
  119. "Language-Team: French <fr@li.org>\n"
  120. "MIME-Version: 1.0\n"
  121. "Content-Type: text/plain; charset=UTF-8\n"
  122. "Content-Transfer-Encoding: 8bit\n"
  123. "Plural-Forms: nplurals=2; plural=n > 1;\n"
  124. +<<<<<<< TREE
  125. "X-Launchpad-Export-Date: 2010-01-15 04:35+0000\n"
  126. +=======
  127. +"X-Launchpad-Export-Date: 2010-01-21 04:34+0000\n"
  128. +>>>>>>> MERGE-SOURCE
  129. "X-Generator: Launchpad (build Unknown)\n"
  130.  
  131. #: templates/notifications/new_auto_created_issue.tpl.text
  132. @@ -32,11 +41,21 @@
  133. "To view more details of this issue, or to update it, please visit the "
  134. "following URL"
  135. msgstr ""
  136. +<<<<<<< TREE
  137. +=======
  138. +"\n"
  139. +"Pour voir les détails de ce bogue, ou pour le mettre à jour, utliser e lien "
  140. +"suivant"
  141. +>>>>>>> MERGE-SOURCE
  142.  
  143. #: htdocs/view.php:74
  144. #, php-format
  145. msgid "#%1$s - %2$s"
  146. +<<<<<<< TREE
  147. msgstr ""
  148. +=======
  149. +msgstr "#%1$s - %2$s"
  150. +>>>>>>> MERGE-SOURCE
  151.  
  152. #: lib/eventum/class.display_column.php:195
  153. msgid "% Complete"
  154. @@ -54,12 +73,20 @@
  155. #: lib/eventum/class.filter.php:602
  156. #, php-format
  157. msgid "%1$s or greater"
  158. +<<<<<<< TREE
  159. msgstr ""
  160. +=======
  161. +msgstr "%1$s ou plus"
  162. +>>>>>>> MERGE-SOURCE
  163.  
  164. #: lib/eventum/class.filter.php:605
  165. #, php-format
  166. msgid "%1$s or less"
  167. +<<<<<<< TREE
  168. msgstr ""
  169. +=======
  170. +msgstr "%1$s ou moins"
  171. +>>>>>>> MERGE-SOURCE
  172.  
  173. #: templates/manage/time_tracking.tpl.html
  174. msgid ""
  175. @@ -86,6 +113,10 @@
  176. #: templates/manage/general.tpl.html
  177. msgid "(This MUST contain a real email address, e.g. \"%1\" or \"%2\")"
  178. msgstr ""
  179. +<<<<<<< TREE
  180. +=======
  181. +"(Ceci DOIT contenir une adresse e-mail valide, par ex \"%1\" ou \"%2\")"
  182. +>>>>>>> MERGE-SOURCE
  183.  
  184. #: templates/manage/general.tpl.html
  185. msgid ""
  186. @@ -103,7 +134,11 @@
  187.  
  188. #: lib/eventum/class.template_helper.php:175
  189. msgid "(archived)"
  190. +<<<<<<< TREE
  191. msgstr ""
  192. +=======
  193. +msgstr "(archivé)"
  194. +>>>>>>> MERGE-SOURCE
  195.  
  196. #: templates/manage/email_accounts.tpl.html
  197. msgid "(default folder is INBOX)"
  198.  
  199. === modified file 'localization/he.po'
  200. --- localization/he.po 2010-01-18 15:01:35 +0000
  201. +++ localization/he.po 2010-01-29 19:44:40 +0000
  202. @@ -8,8 +8,13 @@
  203. "Project-Id-Version: eventum\n"
  204. "Report-Msgid-Bugs-To: \n"
  205. "POT-Creation-Date: 2010-01-06 00:02+0200\n"
  206. +<<<<<<< TREE
  207. "PO-Revision-Date: 2009-12-24 18:05+0000\n"
  208. "Last-Translator: Aviyam Fischer <Unknown>\n"
  209. +=======
  210. +"PO-Revision-Date: 2010-01-08 16:28+0000\n"
  211. +"Last-Translator: Elan Ruusamäe <Unknown>\n"
  212. +>>>>>>> MERGE-SOURCE
  213. "Language-Team: Hebrew <he@li.org>\n"
  214. "MIME-Version: 1.0\n"
  215. "Content-Type: text/plain; charset=UTF-8\n"
  216.  
  217. === modified file 'localization/it.po'
  218. --- localization/it.po 2010-01-05 22:04:09 +0000
  219. +++ localization/it.po 2010-01-29 19:44:40 +0000
  220. @@ -9,14 +9,23 @@
  221. "Project-Id-Version: eventum\n"
  222. "Report-Msgid-Bugs-To: \n"
  223. "POT-Creation-Date: 2010-01-06 00:02+0200\n"
  224. +<<<<<<< TREE
  225. "PO-Revision-Date: 2009-11-18 16:03+0000\n"
  226. "Last-Translator: Franco Alberganti <Unknown>\n"
  227. +=======
  228. +"PO-Revision-Date: 2010-01-25 14:47+0000\n"
  229. +"Last-Translator: Marco Donato Torsello <Unknown>\n"
  230. +>>>>>>> MERGE-SOURCE
  231. "Language-Team: Italian <eventum-devel@lists.mysql.com>\n"
  232. "MIME-Version: 1.0\n"
  233. "Content-Type: text/plain; charset=UTF-8\n"
  234. "Content-Transfer-Encoding: 8bit\n"
  235. "Plural-Forms: nplurals=2; plural=n != 1;\n"
  236. +<<<<<<< TREE
  237. "X-Launchpad-Export-Date: 2009-11-21 04:47+0000\n"
  238. +=======
  239. +"X-Launchpad-Export-Date: 2010-01-26 04:52+0000\n"
  240. +>>>>>>> MERGE-SOURCE
  241. "X-Generator: Launchpad (build Unknown)\n"
  242. "X-Poedit-Bookmarks: 151,-1,-1,-1,-1,-1,-1,-1,-1,-1\n"
  243.  
  244. @@ -25,6 +34,8 @@
  245. "\n"
  246. "To add more information to this issue, simply reply to this email."
  247. msgstr ""
  248. +"\n"
  249. +"Per aggiungere nuove informazioni a questo problema,rispondi a questa email."
  250.  
  251. #: templates/notifications/new_auto_created_issue.tpl.text
  252. msgid ""
  253. @@ -86,6 +97,7 @@
  254. #: templates/manage/general.tpl.html
  255. msgid "(This MUST contain a real email address, e.g. \"%1\" or \"%2\")"
  256. msgstr ""
  257. +"(Questo DEVE essere un vero indirizzo email,per esempio . \"%1\" or \"%2\")"
  258.  
  259. #: templates/manage/general.tpl.html
  260. msgid ""
  261. @@ -105,7 +117,10 @@
  262. "(Nota: le porte di default sono 110 per server POP3 e 143 per server IMAP)"
  263.  
  264. #: lib/eventum/class.template_helper.php:175
  265. +<<<<<<< TREE
  266. #, fuzzy
  267. +=======
  268. +>>>>>>> MERGE-SOURCE
  269. msgid "(archived)"
  270. msgstr "(archiviato)"
  271.  
  272. @@ -115,11 +130,13 @@
  273.  
  274. #: templates/manage/general.tpl.html
  275. msgid "(e.g. %1)"
  276. -msgstr ""
  277. +msgstr "(per esempio %1)"
  278.  
  279. #: templates/tips/keyboard_shortcuts.tpl.html
  280. msgid "(hold 'ALT' key and press '3' one time) - to access the 'Search' box"
  281. msgstr ""
  282. +"(tieni premuto 'ALT' e premi '3' una volta) - per accedere al box d "
  283. +"'Ricerca'"
  284.  
  285. #: templates/tips/keyboard_shortcuts.tpl.html
  286. msgid "(hold 'ALT' key and press '4' one time) - to access the 'Go' box"
  287.  
  288. === modified file 'localization/lt.po'
  289. --- localization/lt.po 2010-01-18 15:01:35 +0000
  290. +++ localization/lt.po 2010-01-29 19:44:40 +0000
  291. @@ -8,7 +8,11 @@
  292. "Project-Id-Version: eventum\n"
  293. "Report-Msgid-Bugs-To: \n"
  294. "POT-Creation-Date: 2010-01-06 00:02+0200\n"
  295. +<<<<<<< TREE
  296. "PO-Revision-Date: 2010-01-14 06:21+0000\n"
  297. +=======
  298. +"PO-Revision-Date: 2010-01-18 18:34+0000\n"
  299. +>>>>>>> MERGE-SOURCE
  300. "Last-Translator: Tomas D Davainis <tomasdd@gmail.com>\n"
  301. "Language-Team: Lithuanian <lt@li.org>\n"
  302. "MIME-Version: 1.0\n"
  303. @@ -16,7 +20,11 @@
  304. "Content-Transfer-Encoding: 8bit\n"
  305. "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
  306. "(n%100<10 || n%100>=20) ? 1 : 2;\n"
  307. +<<<<<<< TREE
  308. "X-Launchpad-Export-Date: 2010-01-15 04:35+0000\n"
  309. +=======
  310. +"X-Launchpad-Export-Date: 2010-01-19 04:41+0000\n"
  311. +>>>>>>> MERGE-SOURCE
  312. "X-Generator: Launchpad (build Unknown)\n"
  313.  
  314. #: templates/notifications/new_auto_created_issue.tpl.text
  315.  
  316. === modified file 'localization/lv.po'
  317. --- localization/lv.po 2010-01-18 15:01:35 +0000
  318. +++ localization/lv.po 2010-01-29 19:44:40 +0000
  319. @@ -8,14 +8,23 @@
  320. "Project-Id-Version: eventum\n"
  321. "Report-Msgid-Bugs-To: \n"
  322. "POT-Creation-Date: 2010-01-06 00:02+0200\n"
  323. +<<<<<<< TREE
  324. "PO-Revision-Date: 2010-01-16 23:23+0000\n"
  325. "Last-Translator: Kārlis Šteinbergs <Unknown>\n"
  326. +=======
  327. +"PO-Revision-Date: 2010-01-18 18:18+0000\n"
  328. +"Last-Translator: Elan Ruusamäe <Unknown>\n"
  329. +>>>>>>> MERGE-SOURCE
  330. "Language-Team: Latvian <lv@li.org>\n"
  331. "MIME-Version: 1.0\n"
  332. "Content-Type: text/plain; charset=UTF-8\n"
  333. "Content-Transfer-Encoding: 8bit\n"
  334. "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"
  335. +<<<<<<< TREE
  336. "X-Launchpad-Export-Date: 2010-01-18 04:44+0000\n"
  337. +=======
  338. +"X-Launchpad-Export-Date: 2010-01-19 04:41+0000\n"
  339. +>>>>>>> MERGE-SOURCE
  340. "X-Generator: Launchpad (build Unknown)\n"
  341.  
  342. #: templates/notifications/new_auto_created_issue.tpl.text
  343.  
  344. === modified file 'localization/pt.po'
  345. --- localization/pt.po 2010-01-18 15:01:35 +0000
  346. +++ localization/pt.po 2010-01-29 19:44:40 +0000
  347. @@ -8,14 +8,23 @@
  348. "Project-Id-Version: eventum\n"
  349. "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
  350. "POT-Creation-Date: 2010-01-06 00:02+0200\n"
  351. +<<<<<<< TREE
  352. "PO-Revision-Date: 2010-01-14 16:14+0000\n"
  353. "Last-Translator: Tiago Silva <Unknown>\n"
  354. +=======
  355. +"PO-Revision-Date: 2010-01-18 17:35+0000\n"
  356. +"Last-Translator: Elan Ruusamäe <Unknown>\n"
  357. +>>>>>>> MERGE-SOURCE
  358. "Language-Team: Portuguese <pt@li.org>\n"
  359. "MIME-Version: 1.0\n"
  360. "Content-Type: text/plain; charset=UTF-8\n"
  361. "Content-Transfer-Encoding: 8bit\n"
  362. "Plural-Forms: nplurals=2; plural=n != 1;\n"
  363. +<<<<<<< TREE
  364. "X-Launchpad-Export-Date: 2010-01-15 04:35+0000\n"
  365. +=======
  366. +"X-Launchpad-Export-Date: 2010-01-19 04:41+0000\n"
  367. +>>>>>>> MERGE-SOURCE
  368. "X-Generator: Launchpad (build Unknown)\n"
  369.  
  370. #: templates/notifications/new_auto_created_issue.tpl.text
  371.  
  372. === modified file 'localization/sv.po'
  373. --- localization/sv.po 2010-01-18 15:01:35 +0000
  374. +++ localization/sv.po 2010-01-29 19:44:40 +0000
  375. @@ -10,14 +10,23 @@
  376. "Project-Id-Version: eventum\n"
  377. "Report-Msgid-Bugs-To: \n"
  378. "POT-Creation-Date: 2010-01-06 00:02+0200\n"
  379. +<<<<<<< TREE
  380. "PO-Revision-Date: 2010-01-14 20:51+0000\n"
  381. "Last-Translator: Daniel Ruus <Unknown>\n"
  382. +=======
  383. +"PO-Revision-Date: 2010-01-18 16:56+0000\n"
  384. +"Last-Translator: Elan Ruusamäe <Unknown>\n"
  385. +>>>>>>> MERGE-SOURCE
  386. "Language-Team: Swedish <eventum-devel@lists.mysql.com>\n"
  387. "MIME-Version: 1.0\n"
  388. "Content-Type: text/plain; charset=UTF-8\n"
  389. "Content-Transfer-Encoding: 8bit\n"
  390. "Plural-Forms: nplurals=2; plural=n != 1;\n"
  391. +<<<<<<< TREE
  392. "X-Launchpad-Export-Date: 2010-01-15 04:35+0000\n"
  393. +=======
  394. +"X-Launchpad-Export-Date: 2010-01-19 04:42+0000\n"
  395. +>>>>>>> MERGE-SOURCE
  396. "X-Generator: Launchpad (build Unknown)\n"
  397.  
  398. #: templates/notifications/new_auto_created_issue.tpl.text
  399.  
  400. === modified file 'localization/zh_CN.po'
  401. --- localization/zh_CN.po 2010-01-18 15:01:35 +0000
  402. +++ localization/zh_CN.po 2010-01-29 19:44:40 +0000
  403. @@ -8,14 +8,23 @@
  404. "Project-Id-Version: eventum\n"
  405. "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
  406. "POT-Creation-Date: 2010-01-06 00:02+0200\n"
  407. +<<<<<<< TREE
  408. "PO-Revision-Date: 2010-01-08 12:14+0000\n"
  409. "Last-Translator: greenrock <Unknown>\n"
  410. +=======
  411. +"PO-Revision-Date: 2010-01-18 16:34+0000\n"
  412. +"Last-Translator: Elan Ruusamäe <Unknown>\n"
  413. +>>>>>>> MERGE-SOURCE
  414. "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
  415. "MIME-Version: 1.0\n"
  416. "Content-Type: text/plain; charset=UTF-8\n"
  417. "Content-Transfer-Encoding: 8bit\n"
  418. "Plural-Forms: nplurals=1; plural=0;\n"
  419. +<<<<<<< TREE
  420. "X-Launchpad-Export-Date: 2010-01-09 07:50+0000\n"
  421. +=======
  422. +"X-Launchpad-Export-Date: 2010-01-19 04:42+0000\n"
  423. +>>>>>>> MERGE-SOURCE
  424. "X-Generator: Launchpad (build Unknown)\n"
  425.  
  426. #: templates/notifications/new_auto_created_issue.tpl.text
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!