Skip to content

Commit 0ebd456

Browse files
authored
Merge branch 'master' into fix/add-files
2 parents 34ad9b1 + 3660b9d commit 0ebd456

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+226
-252
lines changed

l10n/ar.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -319,11 +319,10 @@ OC.L10N.register(
319319
"Folder is not a map" : "المجلد ليس خريطة",
320320
"Settings were successfully saved" : "تم حفظ الإعدادات بنجاح",
321321
"Failed to save settings" : "فشل حفظ الإعدادات",
322-
"{nb} favorites imported from {path}" : "{nb} تم استيراد المفضلات من {path}",
322+
"Import as devices in Maps" : "استيراد كأجهزة في الخرائط",
323+
"Import as favorites in Maps" : "استيراد كمفضلات في الخرائط",
323324
"Failed to import favorites" : "فشل استيراد المفضلة",
324325
"View in Maps" : "عرض علي الخرائط",
325-
"Import as favorites in Maps" : "استيراد كمفضلات في الخرائط",
326-
"Import as devices in Maps" : "استيراد كأجهزة في الخرائط",
327326
"Copy link to map" : "نسخ الرابط إلى الخريطة",
328327
"Default Map" : "الخريطة الافتراضية",
329328
"Your Default Map" : "خريطتك الافتراضية",

l10n/ar.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -317,11 +317,10 @@
317317
"Folder is not a map" : "المجلد ليس خريطة",
318318
"Settings were successfully saved" : "تم حفظ الإعدادات بنجاح",
319319
"Failed to save settings" : "فشل حفظ الإعدادات",
320-
"{nb} favorites imported from {path}" : "{nb} تم استيراد المفضلات من {path}",
320+
"Import as devices in Maps" : "استيراد كأجهزة في الخرائط",
321+
"Import as favorites in Maps" : "استيراد كمفضلات في الخرائط",
321322
"Failed to import favorites" : "فشل استيراد المفضلة",
322323
"View in Maps" : "عرض علي الخرائط",
323-
"Import as favorites in Maps" : "استيراد كمفضلات في الخرائط",
324-
"Import as devices in Maps" : "استيراد كأجهزة في الخرائط",
325324
"Copy link to map" : "نسخ الرابط إلى الخريطة",
326325
"Default Map" : "الخريطة الافتراضية",
327326
"Your Default Map" : "خريطتك الافتراضية",

l10n/bg.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -309,11 +309,10 @@ OC.L10N.register(
309309
"Folder is not a map" : "Папката не е карта",
310310
"Settings were successfully saved" : "Настройките бяха записани успешно",
311311
"Failed to save settings" : "Неуспешно записване на настройки",
312-
"{nb} favorites imported from {path}" : "{nb} любими, импортирани от {path}",
312+
"Import as devices in Maps" : "Импортиране като устройства в Карти",
313+
"Import as favorites in Maps" : "Импортиране като любими в Карти",
313314
"Failed to import favorites" : "Неуспешно импортиране на любими",
314315
"View in Maps" : "Преглед в Карти",
315-
"Import as favorites in Maps" : "Импортиране като любими в Карти",
316-
"Import as devices in Maps" : "Импортиране като устройства в Карти",
317316
"Copy link to map" : "Копиране на връзка в картата",
318317
"Default Map" : "Карта по подразбиране",
319318
"Your Default Map" : "Вашата карта по подразбиране",

l10n/bg.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -307,11 +307,10 @@
307307
"Folder is not a map" : "Папката не е карта",
308308
"Settings were successfully saved" : "Настройките бяха записани успешно",
309309
"Failed to save settings" : "Неуспешно записване на настройки",
310-
"{nb} favorites imported from {path}" : "{nb} любими, импортирани от {path}",
310+
"Import as devices in Maps" : "Импортиране като устройства в Карти",
311+
"Import as favorites in Maps" : "Импортиране като любими в Карти",
311312
"Failed to import favorites" : "Неуспешно импортиране на любими",
312313
"View in Maps" : "Преглед в Карти",
313-
"Import as favorites in Maps" : "Импортиране като любими в Карти",
314-
"Import as devices in Maps" : "Импортиране като устройства в Карти",
315314
"Copy link to map" : "Копиране на връзка в картата",
316315
"Default Map" : "Карта по подразбиране",
317316
"Your Default Map" : "Вашата карта по подразбиране",

l10n/ca.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,11 +186,10 @@ OC.L10N.register(
186186
"Default" : "Per defecte",
187187
"Settings were successfully saved" : "La configuració s'ha desat correctament",
188188
"Failed to save settings" : "Ha fallat desar la configuració",
189-
"{nb} favorites imported from {path}" : "S'han importat {nb} des de {path}",
189+
"Import as devices in Maps" : "Importa com a dispositius als Mapes",
190+
"Import as favorites in Maps" : "Importa com a favorit als Mapes",
190191
"Failed to import favorites" : "No s'han pogut importar els favorits",
191192
"View in Maps" : "Mostra-ho a Mapes",
192-
"Import as favorites in Maps" : "Importa com a favorit als Mapes",
193-
"Import as devices in Maps" : "Importa com a dispositius als Mapes",
194193
"Media scan was not done yet. Wait a few minutes/hours and reload this page to see your photos/tracks." : "L'exploració mediàtica encara no s'ha fet. Espereu uns minuts / hores i torneu a carregar aquesta pàgina per veure les vostres fotos / trajectes.",
195194
"Failed to get favorites" : "No s'han pogut agafar els preferits",
196195
"Failed to create favorite" : "No s'han pogut crear el preferit",

l10n/ca.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,11 +184,10 @@
184184
"Default" : "Per defecte",
185185
"Settings were successfully saved" : "La configuració s'ha desat correctament",
186186
"Failed to save settings" : "Ha fallat desar la configuració",
187-
"{nb} favorites imported from {path}" : "S'han importat {nb} des de {path}",
187+
"Import as devices in Maps" : "Importa com a dispositius als Mapes",
188+
"Import as favorites in Maps" : "Importa com a favorit als Mapes",
188189
"Failed to import favorites" : "No s'han pogut importar els favorits",
189190
"View in Maps" : "Mostra-ho a Mapes",
190-
"Import as favorites in Maps" : "Importa com a favorit als Mapes",
191-
"Import as devices in Maps" : "Importa com a dispositius als Mapes",
192191
"Media scan was not done yet. Wait a few minutes/hours and reload this page to see your photos/tracks." : "L'exploració mediàtica encara no s'ha fet. Espereu uns minuts / hores i torneu a carregar aquesta pàgina per veure les vostres fotos / trajectes.",
193192
"Failed to get favorites" : "No s'han pogut agafar els preferits",
194193
"Failed to create favorite" : "No s'han pogut crear el preferit",

l10n/cs.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -325,11 +325,11 @@ OC.L10N.register(
325325
"mph" : "km/h",
326326
"°F" : "°F",
327327
"Temp: " : "Teplota:",
328-
"{nb} favorites imported from {path}" : "{nb} oblíbených importováno z {path}",
328+
"Import as devices in Maps" : "Importovat jako zařízení v Mapy",
329+
"_One device imported_::_%n devices imported_" : ["Jedno zařízení naimporotováno","%n zařízení naimporotována","%n zařízení naimporotováno","%n zařízení naimporotována"],
330+
"Import as favorites in Maps" : "Importovat v mapách jako oblíbené",
329331
"Failed to import favorites" : "Nepodařilo se importovat oblíbené",
330332
"View in Maps" : "Zobrazit na mapě",
331-
"Import as favorites in Maps" : "Importovat v mapách jako oblíbené",
332-
"Import as devices in Maps" : "Importovat jako zařízení v Mapy",
333333
"Copy link to map" : "Zkopírovat odkaz na mapu",
334334
"Default Map" : "Výchozí mapa",
335335
"Your Default Map" : "Vaše výchozí mapa",

l10n/cs.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -323,11 +323,11 @@
323323
"mph" : "km/h",
324324
"°F" : "°F",
325325
"Temp: " : "Teplota:",
326-
"{nb} favorites imported from {path}" : "{nb} oblíbených importováno z {path}",
326+
"Import as devices in Maps" : "Importovat jako zařízení v Mapy",
327+
"_One device imported_::_%n devices imported_" : ["Jedno zařízení naimporotováno","%n zařízení naimporotována","%n zařízení naimporotováno","%n zařízení naimporotována"],
328+
"Import as favorites in Maps" : "Importovat v mapách jako oblíbené",
327329
"Failed to import favorites" : "Nepodařilo se importovat oblíbené",
328330
"View in Maps" : "Zobrazit na mapě",
329-
"Import as favorites in Maps" : "Importovat v mapách jako oblíbené",
330-
"Import as devices in Maps" : "Importovat jako zařízení v Mapy",
331331
"Copy link to map" : "Zkopírovat odkaz na mapu",
332332
"Default Map" : "Výchozí mapa",
333333
"Your Default Map" : "Vaše výchozí mapa",

l10n/da.js

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
OC.L10N.register(
22
"maps",
33
{
4+
"/Maps is not a directory" : "/Maps er ikke en mappe",
5+
"/Maps directory is not writeable" : "/Maps mappe er ikke skrivbaris not writeable",
6+
"Impossible to create /Maps directory" : "Kan ikke oprette mappen /Maps",
47
"File does not exist" : "Filen eksisterer ikke",
58
"File not found" : "Fil ikke fundet",
69
"Personal" : "Personlig",
@@ -20,6 +23,7 @@ OC.L10N.register(
2023
"Copy share link" : "Kopier delelink",
2124
"Open folder" : "Åben mappe",
2225
"Share" : "Del",
26+
"My maps" : "Mine kort",
2327
"Sort by name" : "Sorter efter navn",
2428
"Sort by date" : "Sorter efter dato",
2529
"Category" : "Katergori",
@@ -28,6 +32,7 @@ OC.L10N.register(
2832
"Save" : "Gem",
2933
"Share this location" : "Del denne placering",
3034
"Shared location" : "Delt placering",
35+
"Other maps" : "Andre kort",
3136
"Close" : "Luk",
3237
"(No name)" : "(Uden navn)",
3338
"No favorites to display" : "Ingen favoritter at vise",
@@ -68,12 +73,18 @@ OC.L10N.register(
6873
"Default" : "Standard",
6974
"Settings were successfully saved" : "Indstillingerne blev gemt",
7075
"Failed to save settings" : "Kunne ikke gemme indstillinger",
76+
"Import as devices in Maps" : "Importer som apparater i Maps",
77+
"Import as favorites in Maps" : "Importer som favorit i Maps",
78+
"View in Maps" : "Vis i Maps",
79+
"Failed to load your maps" : "Kunne ikke indlæse dine kort",
7180
"Metadata" : "Metadata",
7281
"Restaurant" : "Restaurant",
7382
"Bar" : "Bar",
7483
"School" : "Skole",
7584
"Cinema" : "Biograf",
7685
"Hospital" : "Hospital",
77-
"Dentist" : "Tandlæge"
86+
"Dentist" : "Tandlæge",
87+
"Maps routing settings" : "Maps routing indstillinger",
88+
"Maps settings" : "Maps indstillinger"
7889
},
7990
"nplurals=2; plural=(n != 1);");

l10n/da.json

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
{ "translations": {
2+
"/Maps is not a directory" : "/Maps er ikke en mappe",
3+
"/Maps directory is not writeable" : "/Maps mappe er ikke skrivbaris not writeable",
4+
"Impossible to create /Maps directory" : "Kan ikke oprette mappen /Maps",
25
"File does not exist" : "Filen eksisterer ikke",
36
"File not found" : "Fil ikke fundet",
47
"Personal" : "Personlig",
@@ -18,6 +21,7 @@
1821
"Copy share link" : "Kopier delelink",
1922
"Open folder" : "Åben mappe",
2023
"Share" : "Del",
24+
"My maps" : "Mine kort",
2125
"Sort by name" : "Sorter efter navn",
2226
"Sort by date" : "Sorter efter dato",
2327
"Category" : "Katergori",
@@ -26,6 +30,7 @@
2630
"Save" : "Gem",
2731
"Share this location" : "Del denne placering",
2832
"Shared location" : "Delt placering",
33+
"Other maps" : "Andre kort",
2934
"Close" : "Luk",
3035
"(No name)" : "(Uden navn)",
3136
"No favorites to display" : "Ingen favoritter at vise",
@@ -66,12 +71,18 @@
6671
"Default" : "Standard",
6772
"Settings were successfully saved" : "Indstillingerne blev gemt",
6873
"Failed to save settings" : "Kunne ikke gemme indstillinger",
74+
"Import as devices in Maps" : "Importer som apparater i Maps",
75+
"Import as favorites in Maps" : "Importer som favorit i Maps",
76+
"View in Maps" : "Vis i Maps",
77+
"Failed to load your maps" : "Kunne ikke indlæse dine kort",
6978
"Metadata" : "Metadata",
7079
"Restaurant" : "Restaurant",
7180
"Bar" : "Bar",
7281
"School" : "Skole",
7382
"Cinema" : "Biograf",
7483
"Hospital" : "Hospital",
75-
"Dentist" : "Tandlæge"
84+
"Dentist" : "Tandlæge",
85+
"Maps routing settings" : "Maps routing indstillinger",
86+
"Maps settings" : "Maps indstillinger"
7687
},"pluralForm" :"nplurals=2; plural=(n != 1);"
7788
}

0 commit comments

Comments
 (0)