From eaf05ee710a4db1e2a267f5b575190d5235e9c0f Mon Sep 17 00:00:00 2001 From: Zach Wise Date: Sat, 16 Jun 2012 20:02:29 -0500 Subject: [PATCH] Fix merging --- compiled/js/locale/fr.js | 2 +- compiled/js/locale/id.js | 7 +------ source/js/locale/fr.js | 5 ----- source/js/locale/id.js | 8 -------- 4 files changed, 2 insertions(+), 20 deletions(-) diff --git a/compiled/js/locale/fr.js b/compiled/js/locale/fr.js index 5d8c95e..73858b2 100644 --- a/compiled/js/locale/fr.js +++ b/compiled/js/locale/fr.js @@ -1,2 +1,2 @@ /* LANGUAGE -================================================== */typeof VMM!="undefined"&&(VMM.Language={lang:"fr",api:{wikipedia:"fr"},date:{month:["janvier","février","mars","avril","mai","juin","juillet","août","septembre","octobre","novembre","décembre"],month_abbr:["janv.","févr.","mars","avril","mai","juin","juil.","août","sept.","oct.","nov.","dec."],day:["dimanche","lundi","mardi","mercredi","jeudi","vendredi","samedi"],day_abbr:["dim.","lu.","ma.","me.","jeu.","vend.","sam."]},dateformats:{year:"yyyy",month_short:"mmm",month:"mmmm yyyy",full_short:"d mmm",full:"d mmmm yyyy",time_no_seconds_short:"HH:MM",time_no_seconds_small_date:"HH:MM'
'd mmmm yyyy''",full_long:"dddd',' d mmm yyyy 'um' HH:MM",full_long_small_date:"HH:MM'
'dddd',' d mmm yyyy''"},messages:{loading_timeline:"Chargement de la frise en cours... ",return_to_title:"Retour à la page d'accueil",expand_timeline:"Elargir la frise",contract_timeline:"Réduire la frise",wikipedia:"Extrait de Wikipedia, l'encyclopédie libre",loading_content:"Chargement",loading:"Chargement"}}); \ No newline at end of file +================================================== */typeof VMM!="undefined"&&(VMM.Language={lang:"fr",api:{wikipedia:"fr"},date:{month:["janvier","février","mars","avril","mai","juin","juillet","août","septembre","octobre","novembre","décembre"],month_abbr:["janv.","févr.","mars","avril","mai","juin","juil.","août","sept.","oct.","nov.","dec."],day:["Dimanche","Lundi","Mardi","Mercredi","Jeudi","Vendredi","Samedi"],day_abbr:["Dim.","Lu.","Ma.","Me.","Jeu.","Vend.","Sam."]},dateformats:{year:"yyyy",month_short:"mmm",month:"mmmm yyyy",full_short:"d mmm",full:"d mmmm yyyy",time_no_seconds_short:"HH:MM",time_no_seconds_small_date:"HH:MM'
'd mmmm yyyy''",full_long:"dddd',' d mmm yyyy 'à' HH:MM",full_long_small_date:"HH:MM'
'dddd',' d mmm yyyy''"},messages:{loading_timeline:"Chargement de la frise en cours... ",return_to_title:"Retour à la page d'accueil",expand_timeline:"Elargir la frise",contract_timeline:"Réduire la frise",wikipedia:"Extrait de Wikipedia, l'encyclopédie libre",loading_content:"Chargement",loading:"Chargement"}}); \ No newline at end of file diff --git a/compiled/js/locale/id.js b/compiled/js/locale/id.js index a793957..fc1a6ff 100644 --- a/compiled/js/locale/id.js +++ b/compiled/js/locale/id.js @@ -1,7 +1,2 @@ /* LANGUAGE -<<<<<<< HEAD -================================================== */typeof VMM!="undefined"&&(VMM.Language={lang:"id",api:{wikipedia:"id"},date:{month:["Januari","Februari","Maret","April","Mei","Juni","Juli","Agustus","September","Oktober","November","Desember"],month_abbr:["Jan.","Feb.","Maret","April","Mei","Juni","July","Agus.","Sept.","Okt.","Nov.","Des."],day:["Ahad","Senin","Selasa","Rabu","Kamis","Jum'at","Sabtu"],day_abbr:["Ahad","Sen.","Sel.","Rabu","Kamis","Jum.","Sab."]},dateformats:{year:"yyyy",month_short:"mmm",month:"mmmm yyyy",full_short:"d mmm",full:"d mmmm yyyy",time_no_seconds_short:"HH:MM",time_no_seconds_small_date:"HH:MM'
'd mmmm yyyy''",full_long:"dddd',' d mmm yyyy 'pukul' HH:MM",full_long_small_date:"HH:MM'
'dddd',' d mmm yyyy''"},messages:{loading_timeline:"Memuat Timeline... ",return_to_title:"Kembali ke Judul",expand_timeline:"Kembangkan Timeline",contract_timeline:"Ciutkan Timeline",wikipedia:"dari Wikipedia, ensiklopedia bebas",loading_content:"Memuat Isi",loading:"Memuat"}}); -======= -================================================== */ -if(typeof VMM != 'undefined') { VMM.Language = {lang: "id", api:{wikipedia:"id"}, date:{ month:["Januari", "Februari", "Maret", "April", "Mei", "Juni", "Juli", "Agustus", "September", "Oktober", "November", "Desember"], month_abbr: ["Jan.", "Feb.", "Maret", "April", "Mei", "Juni", "July", "Agus.", "Sept.", "Okt.", "Nov.", "Des."], day:["Ahad","Senin", "Selasa", "Rabu", "Kamis", "Jum'at", "Sabtu"], day_abbr: ["Ahad","Sen.", "Sel.", "Rabu", "Kamis", "Jum.", "Sab."],},dateformats: { year: "yyyy", month_short: "mmm", month: "mmmm yyyy", full_short: "d mmm", full: "d mmmm yyyy", time_no_seconds_short: "HH:MM", time_no_seconds_small_date: "HH:MM'
'd mmmm yyyy''", full_long: "dddd',' d mmm yyyy 'pukul' HH:MM", full_long_small_date: "HH:MM'
'dddd',' d mmm yyyy''", }, messages: { loading_timeline: "Memuat Timeline... ", return_to_title: "Kembali ke Judul", expand_timeline: "Kembangkan Timeline", contract_timeline: "Ciutkan Timeline", wikipedia: "dari Wikipedia, ensiklopedia bebas", loading_content: "Memuat Isi", loading: "Memuat" }}}; ->>>>>>> 2777d46deba49aa37730e2d31bcd2fb1e1112acf +================================================== */typeof VMM!="undefined"&&(VMM.Language={lang:"id",api:{wikipedia:"id"},date:{month:["Januari","Februari","Maret","April","Mei","Juni","Juli","Agustus","September","Oktober","November","Desember"],month_abbr:["Jan.","Feb.","Maret","April","Mei","Juni","July","Agus.","Sept.","Okt.","Nov.","Des."],day:["Ahad","Senin","Selasa","Rabu","Kamis","Jum'at","Sabtu"],day_abbr:["Ahad","Sen.","Sel.","Rabu","Kamis","Jum.","Sab."]},dateformats:{year:"yyyy",month_short:"mmm",month:"mmmm yyyy",full_short:"d mmm",full:"d mmmm yyyy",time_no_seconds_short:"HH:MM",time_no_seconds_small_date:"HH:MM'
'd mmmm yyyy''",full_long:"dddd',' d mmm yyyy 'pukul' HH:MM",full_long_small_date:"HH:MM'
'dddd',' d mmm yyyy''"},messages:{loading_timeline:"Memuat Timeline... ",return_to_title:"Kembali ke Judul",expand_timeline:"Kembangkan Timeline",contract_timeline:"Ciutkan Timeline",wikipedia:"dari Wikipedia, ensiklopedia bebas",loading_content:"Memuat Isi",loading:"Memuat"}}); \ No newline at end of file diff --git a/source/js/locale/fr.js b/source/js/locale/fr.js index ae1a946..fbb6d85 100644 --- a/source/js/locale/fr.js +++ b/source/js/locale/fr.js @@ -9,13 +9,8 @@ if(typeof VMM != 'undefined') { date: { month: ["janvier", "février", "mars", "avril", "mai", "juin", "juillet", "août", "septembre", "octobre", "novembre", "décembre"], month_abbr: ["janv.", "févr.", "mars", "avril", "mai", "juin", "juil.", "août", "sept.", "oct.", "nov.", "dec."], -<<<<<<< HEAD - day: ["dimanche","lundi", "mardi", "mercredi", "jeudi", "vendredi", "samedi"], - day_abbr: ["dim.","lu.", "ma.", "me.", "jeu.", "vend.", "sam."] -======= day: ["Dimanche","Lundi", "Mardi", "Mercredi", "Jeudi", "Vendredi", "Samedi"], day_abbr: ["Dim.","Lu.", "Ma.", "Me.", "Jeu.", "Vend.", "Sam."], ->>>>>>> 2777d46deba49aa37730e2d31bcd2fb1e1112acf }, dateformats: { year: "yyyy", diff --git a/source/js/locale/id.js b/source/js/locale/id.js index 508b9d3..efa3ca0 100644 --- a/source/js/locale/id.js +++ b/source/js/locale/id.js @@ -10,11 +10,7 @@ if(typeof VMM != 'undefined') { month: ["Januari", "Februari", "Maret", "April", "Mei", "Juni", "Juli", "Agustus", "September", "Oktober", "November", "Desember"], month_abbr: ["Jan.", "Feb.", "Maret", "April", "Mei", "Juni", "July", "Agus.", "Sept.", "Okt.", "Nov.", "Des."], day: ["Ahad","Senin", "Selasa", "Rabu", "Kamis", "Jum'at", "Sabtu"], -<<<<<<< HEAD day_abbr: ["Ahad","Sen.", "Sel.", "Rabu", "Kamis", "Jum.", "Sab."] -======= - day_abbr: ["Ahad","Sen.", "Sel.", "Rabu", "Kamis", "Jum.", "Sab."], ->>>>>>> 2777d46deba49aa37730e2d31bcd2fb1e1112acf }, dateformats: { year: "yyyy", @@ -25,11 +21,7 @@ if(typeof VMM != 'undefined') { time_no_seconds_short: "HH:MM", time_no_seconds_small_date: "HH:MM'
'd mmmm yyyy''", full_long: "dddd',' d mmm yyyy 'pukul' HH:MM", -<<<<<<< HEAD full_long_small_date: "HH:MM'
'dddd',' d mmm yyyy''" -======= - full_long_small_date: "HH:MM'
'dddd',' d mmm yyyy''", ->>>>>>> 2777d46deba49aa37730e2d31bcd2fb1e1112acf }, messages: { loading_timeline: "Memuat Timeline... ",