From 6a7f4a89068f4d12ea92e2f287d22793faf3a4f1 Mon Sep 17 00:00:00 2001 From: mluto Date: Sun, 13 Jan 2013 19:34:52 +0100 Subject: [PATCH] Removed dateonlyformat in az, el and fr locales (to fix merge-problems) --- src/locales/az.json | 1 - src/locales/el.json | 1 - src/locales/fr.json | 1 - 3 files changed, 3 deletions(-) diff --git a/src/locales/az.json b/src/locales/az.json index c20623265..f28558e42 100644 --- a/src/locales/az.json +++ b/src/locales/az.json @@ -78,7 +78,6 @@ "timeslider.version": "Versiya {{versiya}}", "timeslider.saved": "Saxlan\u0131ld\u0131 {{ay}} {{g\u00fcn}}, {{il}}", "timeslider.dateformat": "{{ay}}\/{{g\u00fcn}}\/{{il}} {{saat}}:{{d\u0259qiq\u0259}}:{{saniy\u0259}}", - "timeslider.dateonlyformat": "{{day}} {{month}}, {{year}}", "timeslider.month.january": "Yanvar", "timeslider.month.february": "Fevral", "timeslider.month.march": "Mart", diff --git a/src/locales/el.json b/src/locales/el.json index af9f53c4c..593d66640 100644 --- a/src/locales/el.json +++ b/src/locales/el.json @@ -89,7 +89,6 @@ "timeslider.version": "\u0388\u03ba\u03b4\u03bf\u03c3\u03b7 {{\u03ad\u03ba\u03b4\u03bf\u03c3\u03b7}}", "timeslider.saved": "\u0391\u03c0\u03bf\u03b8\u03b7\u03ba\u03b5\u03c5\u03bc\u03ad\u03bd\u03bf\u03c2 {{\u03bc\u03ae\u03bd\u03b1\u03c2}} {{\u03b7\u03bc\u03ad\u03c1\u03b1}}, {{\u03ad\u03c4\u03bf\u03c2}}", "timeslider.dateformat": "{{\u03bc\u03ae\u03bd\u03b1\u03c2}}\/{{\u03b7\u03bc\u03ad\u03c1\u03b1}}\/{{\u03ad\u03c4\u03bf\u03c2}} {{\u03ce\u03c1\u03b5\u03c2}}:{{\u03bb\u03b5\u03c0\u03c4\u03ac}}:{{\u03b4\u03b5\u03c5\u03c4\u03b5\u03c1\u03cc\u03bb\u03b5\u03c0\u03c4\u03b1}}", - "timeslider.dateonlyformat": "{{month}} {{day}}, {{year}}", "timeslider.month.january": "\u0399\u03b1\u03bd\u03bf\u03c5\u03ac\u03c1\u03b9\u03bf\u03c2", "timeslider.month.february": "\u03a6\u03b5\u03b2\u03c1\u03bf\u03c5\u03ac\u03c1\u03b9\u03bf\u03c2", "timeslider.month.march": "\u039c\u03ac\u03c1\u03c4\u03b9\u03bf\u03c2", diff --git a/src/locales/fr.json b/src/locales/fr.json index d9b157365..f914dc05b 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -96,7 +96,6 @@ "timeslider.version": "Version {{version}}", "timeslider.saved": "Enregistr\u00e9 le {{day}} {{month}} {{year}}", "timeslider.dateformat": "{{j}}\/{{mois}}\/{{ann\u00e9e}} {{h}}:{{minutes}}:{{secondes}}", - "timeslider.dateonlyformat": "{{day}} {{month}} {{year}}", "timeslider.month.january": "Janvier", "timeslider.month.february": "F\u00e9vrier", "timeslider.month.march": "Mars",