aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar kytwb <kytwb@pm.me>2022-01-03 12:23:20 +0100
committerLibravatar kytwb <kytwb@pm.me>2022-01-03 12:23:20 +0100
commitda8e4a4ece93848e89af7013eeb77947fdd5217a (patch)
tree3853e0ffcd4eca0abe789355fe50fcc6ee8e7225 /src
parentMerge branch 'release' into develop (diff)
downloadferdium-app-da8e4a4ece93848e89af7013eeb77947fdd5217a.tar.gz
ferdium-app-da8e4a4ece93848e89af7013eeb77947fdd5217a.tar.zst
ferdium-app-da8e4a4ece93848e89af7013eeb77947fdd5217a.zip
#2383 Fix unaddressed merge conflict
Diffstat (limited to 'src')
-rw-r--r--src/i18n/locales/el.json4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index 367ae9712..c801ab978 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -286,11 +286,7 @@
286 "settings.recipes.customService.openFolder": "Open folder", 286 "settings.recipes.customService.openFolder": "Open folder",
287 "settings.recipes.headline": "Διαθέσιμες υπηρεσίες", 287 "settings.recipes.headline": "Διαθέσιμες υπηρεσίες",
288 "settings.recipes.missingService": "Λείπει κάποια υπηρεσία;", 288 "settings.recipes.missingService": "Λείπει κάποια υπηρεσία;",
289<<<<<<< HEAD
290 "settings.recipes.mostPopular": "Most popular",
291=======
292 "settings.recipes.mostPopular": "Τα πιο δημοφιλή", 289 "settings.recipes.mostPopular": "Τα πιο δημοφιλή",
293>>>>>>> develop
294 "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.", 290 "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
295 "settings.recipes.servicesSuccessfulAddedInfo": "Η υπηρεσία προστέθηκε με επιτυχία", 291 "settings.recipes.servicesSuccessfulAddedInfo": "Η υπηρεσία προστέθηκε με επιτυχία",
296 "settings.searchService": "Αναζήτηση υπηρεσίας", 292 "settings.searchService": "Αναζήτηση υπηρεσίας",