meging

compiled/js/locale/id.js

@@ -1,2 +1,7 @@
 /* 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'<br/><small>'d mmmm yyyy'</small>'",full_long:"dddd',' d mmm yyyy 'pukul' HH:MM",full_long_small_date:"HH:MM'<br/><small>'dddd',' d mmm yyyy'</small>'"},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'<br/><small>'d mmmm yyyy'</small>'", full_long: "dddd',' d mmm yyyy 'pukul' HH:MM", full_long_small_date: "HH:MM'<br/><small>'dddd',' d mmm yyyy'</small>'", }, 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

source/js/locale/fr.js

@@ -9,8 +9,13 @@ 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",
@@ -20,7 +25,7 @@ if(typeof VMM != 'undefined') {
 		    full: "d mmmm yyyy",
 		    time_no_seconds_short: "HH:MM",
 		    time_no_seconds_small_date: "HH:MM'<br/><small>'d mmmm yyyy'</small>'",
-		    full_long: "dddd',' d mmm yyyy 'um' HH:MM",
+		    full_long: "dddd',' d mmm yyyy 'à' HH:MM",
 		    full_long_small_date: "HH:MM'<br/><small>'dddd',' d mmm yyyy'</small>'"
 		},
 		messages: {

source/js/locale/id.js

@@ -10,7 +10,11 @@ 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",
@@ -21,7 +25,11 @@ if(typeof VMM != 'undefined') {
 			time_no_seconds_short: "HH:MM",
 			time_no_seconds_small_date: "HH:MM'<br/><small>'d mmmm yyyy'</small>'",
 			full_long: "dddd',' d mmm yyyy 'pukul' HH:MM",
+<<<<<<< HEAD
 			full_long_small_date: "HH:MM'<br/><small>'dddd',' d mmm yyyy'</small>'"
+=======
+			full_long_small_date: "HH:MM'<br/><small>'dddd',' d mmm yyyy'</small>'",
+>>>>>>> 2777d46deba49aa37730e2d31bcd2fb1e1112acf
 		},
 		messages: {
 			loading_timeline: "Memuat Timeline... ",