From 679aabe93c31c7307f7e0ffc2284c6cd80fa9d26 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 29 Jan 2019 09:05:18 +0100 Subject: [PATCH 1/3] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- applets/batterymonitor/package/metadata.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applets/batterymonitor/package/metadata.desktop b/applets/batterymonitor/package/metadata.desktop index a7c9b6011..899cfa06f 100644 --- a/applets/batterymonitor/package/metadata.desktop +++ b/applets/batterymonitor/package/metadata.desktop @@ -16,7 +16,7 @@ Name[fr]=Batterie et luminosité Name[gl]=Batería e brillo Name[he]=סוללה ובהירות Name[hu]=Akkumulátor és fényerő -Name[id]=Battery and Brightness +Name[id]=Baterai dan Kecerahan Name[is]=Rafhlaða og skjábirta Name[it]=Batteria e luminosità Name[ja]=バッテリーと明るさ From 6b4e2500043b14ca3b74a14deef4e3693e273abe Mon Sep 17 00:00:00 2001 From: "Friedrich W. H. Kossebau" Date: Tue, 29 Jan 2019 23:47:44 +0100 Subject: [PATCH 2/3] [weather dataengine] Remove duplicated condition/forecast strings GIT_SILENT (cherry picked from commit ad0f6834a29afd34d1432788a771f72d6d40cf90) --- dataengines/weather/ions/data/envcan_i18n.dat | 2 -- dataengines/weather/ions/data/noaa_i18n.dat | 8 -------- 2 files changed, 10 deletions(-) diff --git a/dataengines/weather/ions/data/envcan_i18n.dat b/dataengines/weather/ions/data/envcan_i18n.dat index 47381c69a..ee590393d 100644 --- a/dataengines/weather/ions/data/envcan_i18n.dat +++ b/dataengines/weather/ions/data/envcan_i18n.dat @@ -78,8 +78,6 @@ weather condition|Snow Crystals weather condition|Snow Grains weather condition|Squalls weather condition|Sunny -weather condition|Mainly Sunny -weather condition|Partly Cloudy weather condition|Thunderstorm with Hail weather condition|Thunderstorm with Rain weather condition|Thunderstorm with Sand or Dust Storm diff --git a/dataengines/weather/ions/data/noaa_i18n.dat b/dataengines/weather/ions/data/noaa_i18n.dat index aaaeca5fd..f605b375b 100644 --- a/dataengines/weather/ions/data/noaa_i18n.dat +++ b/dataengines/weather/ions/data/noaa_i18n.dat @@ -48,7 +48,6 @@ weather condition|Heavy Drizzle Fog weather condition|Heavy Drizzle Fog/Mist weather condition|Heavy Drizzle Ice Pellets weather condition|Heavy Drizzle Snow -weather condition|Heavy Drizzle Snow weather condition|Heavy Dust Storm weather condition|Heavy Freezing Drizzle weather condition|Heavy Freezing Drizzle Rain @@ -303,9 +302,6 @@ weather forecast|Slight Chance Snow Showers weather forecast|Chance Snow Showers weather forecast|Snow Showers Likely weather forecast|Snow Showers -weather forecast|Chance Snow Showers -weather forecast|Snow Showers Likely -weather forecast|Snow Showers weather forecast|Chance Drizzle weather forecast|Drizzle Likely weather forecast|Drizzle @@ -317,9 +313,6 @@ weather forecast|Heavy Rain weather forecast|Chance Rain Showers weather forecast|Rain Showers Likely weather forecast|Rain Showers -weather forecast|Chance Rain Showers -weather forecast|Rain Showers Likely -weather forecast|Rain Showers weather forecast|Sleet weather forecast|Smoke weather forecast|Freezing Fog @@ -350,5 +343,4 @@ weather forecast|Decreasing Clouds weather forecast|Becoming Sunny weather forecast|Clear weather forecast|Mostly Clear -weather forecast|Chance Thunderstorms weather forecast|Slight Chance Thunderstorms From 182ef20af6fbc3da48a8f43b83832621dc24ef72 Mon Sep 17 00:00:00 2001 From: "Friedrich W. H. Kossebau" Date: Tue, 29 Jan 2019 23:50:20 +0100 Subject: [PATCH 3/3] weather dataengine] noaa: support more "Slight Chance *" forecast strings --- dataengines/weather/ions/data/noaa_i18n.dat | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dataengines/weather/ions/data/noaa_i18n.dat b/dataengines/weather/ions/data/noaa_i18n.dat index f605b375b..c56303795 100644 --- a/dataengines/weather/ions/data/noaa_i18n.dat +++ b/dataengines/weather/ions/data/noaa_i18n.dat @@ -267,26 +267,33 @@ weather forecast|Volcanic Ash weather forecast|Water Spout weather forecast|Freezing Spray weather forecast|Frost +weather forecast|Slight Chance Thunderstorms weather forecast|Chance Thunderstorms weather forecast|Thunderstorms Likely weather forecast|Thunderstorms weather forecast|Severe Tstms +weather forecast|Slight Chance Snow/Sleet weather forecast|Chance Snow/Sleet weather forecast|Snow/Sleet Likely weather forecast|Snow/Sleet +weather forecast|Slight Chance Rain/Sleet weather forecast|Chance Rain/Sleet weather forecast|Rain/Sleet Likely weather forecast|Rain/Sleet +weather forecast|Slight Chance Rain/Freezing Rain weather forecast|Chance Rain/Freezing Rain weather forecast|Rain/Freezing Rain Likely weather forecast|Rain/Freezing Rain weather forecast|Wintry Mix +weather forecast|Slight Chance Freezing Drizzle weather forecast|Chance Freezing Drizzle weather forecast|Freezing Drizzle Likely weather forecast|Freezing Drizzle +weather forecast|Slight Chance Freezing Rain weather forecast|Chance Freezing Rain weather forecast|Freezing Rain Likely weather forecast|Freezing Rain +weather forecast|Slight Chance Rain/Snow weather forecast|Chance Rain/Snow weather forecast|Rain/Snow Likely weather forecast|Rain/Snow @@ -295,6 +302,7 @@ weather forecast|Chance Snow weather forecast|Snow Likely weather forecast|Snow weather forecast|Heavy Snow +weather forecast|Slight Chance Flurries weather forecast|Chance Flurries weather forecast|Flurries Likely weather forecast|Flurries @@ -302,6 +310,7 @@ weather forecast|Slight Chance Snow Showers weather forecast|Chance Snow Showers weather forecast|Snow Showers Likely weather forecast|Snow Showers +weather forecast|Slight Chance Drizzle weather forecast|Chance Drizzle weather forecast|Drizzle Likely weather forecast|Drizzle @@ -310,6 +319,7 @@ weather forecast|Chance Rain weather forecast|Rain Likely weather forecast|Rain weather forecast|Heavy Rain +weather forecast|Slight Chance Rain Showers weather forecast|Chance Rain Showers weather forecast|Rain Showers Likely weather forecast|Rain Showers @@ -343,4 +353,3 @@ weather forecast|Decreasing Clouds weather forecast|Becoming Sunny weather forecast|Clear weather forecast|Mostly Clear -weather forecast|Slight Chance Thunderstorms