From c3daee69a04816e28906a462c1dff51cebfb09cd Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 25 May 2017 04:30:00 +0200 Subject: [PATCH] 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/appmenu/package/metadata.desktop | 2 ++ applets/calendar/package/metadata.desktop | 1 + applets/lock_logout/metadata.desktop | 1 + components/shellprivate/widgetexplorer/plasmoids.knsrc | 1 + dataengines/packagekit/plasma-dataengine-packagekit.desktop | 1 + dataengines/share/backends/im9/metadata.desktop | 2 ++ runners/appstream/appstreamrunner.desktop | 2 ++ wallpapers/image/wallpaper.knsrc | 1 + 8 files changed, 11 insertions(+) diff --git a/applets/appmenu/package/metadata.desktop b/applets/appmenu/package/metadata.desktop index 1eb61554f..05adb2384 100644 --- a/applets/appmenu/package/metadata.desktop +++ b/applets/appmenu/package/metadata.desktop @@ -11,6 +11,7 @@ Name[en_GB]=Global Menu Name[es]=Menú global Name[eu]=Menu orokorra Name[fi]=Yleisvalikko +Name[he]=תפריט גלובלי Name[hu]=Globális menü Name[it]=Menu globale Name[nl]=Globaal menu @@ -40,6 +41,7 @@ Comment[el]=Κλασσικό μενού για εύρεση και εκκίνη Comment[en_GB]=Classic menu for finding and starting applications Comment[es]=Menú clásico para encontrar y lanzar aplicaciones Comment[eu]=Menu klasikoa aplikazioak aurkitu eta abiarazteko +Comment[he]=תפריט קלסי למציאת יישומים והפעלתם Comment[hu]=Klasszikus menü az alkalmazások kereséséhez és indításához Comment[it]=Menu classico per trovare e avviare le applicazioni Comment[nl]=Klassiek menu voor zoeken en starten van toepassingen diff --git a/applets/calendar/package/metadata.desktop b/applets/calendar/package/metadata.desktop index 8d773848c..d04ce97dc 100644 --- a/applets/calendar/package/metadata.desktop +++ b/applets/calendar/package/metadata.desktop @@ -85,6 +85,7 @@ Comment[el]=Εμφάνιση συναντήσεων και συμβάντων α Comment[en_GB]=Month display with your appointments and events Comment[es]=Calendario mensual con sus citas y eventos Comment[eu]=Hileko ikuspegia zure hitzordu eta gertaerekin +Comment[he]=תצוגה חודשית עם הפגישות והאירועים שלך Comment[hu]=Megjeleníti a hónapban esedékes időpontokat és eseményeket Comment[it]=Visualizzazione del mese con i tuoi appuntamenti ed eventi Comment[nl]=Maandweergave met uw afspraken en gebeurtenissen diff --git a/applets/lock_logout/metadata.desktop b/applets/lock_logout/metadata.desktop index c0ee7e84f..cb4cdd7e3 100644 --- a/applets/lock_logout/metadata.desktop +++ b/applets/lock_logout/metadata.desktop @@ -170,6 +170,7 @@ Keywords[eu]=Giltzatu;blokeatu;saio-bukaera;lokartu;hibernatu;aldatu erabiltzail Keywords[fi]=Lukitse;kirjaudu ulos;valmiustila;lepotila;vaihda käyttäjää; Keywords[fr]=Verrouillage, Déconnexion, Hibernation, Changement d'utilisateur, Keywords[gl]=Trancar;saír;durmir;hibernar;trocar de usuario; +Keywords[he]=Lock;Logout;Sleep;Hibernate;Switch User;נעילה;יציא;שינה;מצב שינה;החלפת משתמש Keywords[hu]=Zárolás;Kijelentkezés;Alvó állapot;Hibernálás;Felhasználóváltás; Keywords[ia]=Bloca;Claude session;Dormi; Hiberna;Cambia Usator; Keywords[id]=Kunci;Keluar;Tidur;Hibernasi;Ganti Pengguna; diff --git a/components/shellprivate/widgetexplorer/plasmoids.knsrc b/components/shellprivate/widgetexplorer/plasmoids.knsrc index 032f0c17f..9beb60d39 100644 --- a/components/shellprivate/widgetexplorer/plasmoids.knsrc +++ b/components/shellprivate/widgetexplorer/plasmoids.knsrc @@ -11,6 +11,7 @@ Name[es]=Elementos gráficos de Plasma Name[eu]=Plasmaren trepetak Name[fi]=Plasma-sovelmat Name[fr]=Composants graphiques Plasma +Name[he]=יישומוני Plasma Name[hu]=Plasma widgetek Name[it]=Oggetti di Plasma Name[ko]=Plasma 위젯 diff --git a/dataengines/packagekit/plasma-dataengine-packagekit.desktop b/dataengines/packagekit/plasma-dataengine-packagekit.desktop index f85d59fb5..836dd54af 100644 --- a/dataengines/packagekit/plasma-dataengine-packagekit.desktop +++ b/dataengines/packagekit/plasma-dataengine-packagekit.desktop @@ -64,6 +64,7 @@ Comment[eu]=PackageKit datuen motorra Comment[fi]=PackageKit-tietomoottori Comment[fr]=Moteur de données de PackageKit Comment[gl]=Motor de datos de PackageKit +Comment[he]=מנוע נתונים של PackageKit Comment[hu]=PackageKit adatmotor Comment[ia]=Motor de Datos (Data Engine) de PackageKit Comment[id]=Mesin Data PackageKit diff --git a/dataengines/share/backends/im9/metadata.desktop b/dataengines/share/backends/im9/metadata.desktop index 638b1a137..48c419126 100644 --- a/dataengines/share/backends/im9/metadata.desktop +++ b/dataengines/share/backends/im9/metadata.desktop @@ -14,6 +14,7 @@ Name[eu]=im9.eu Name[fi]=im9.eu Name[fr]=im9.eu Name[gl]=im9.eu +Name[he]=im9.eu Name[hu]=im9.eu Name[ia]=im9.eu Name[id]=im9.eu @@ -61,6 +62,7 @@ Comment[eu]=Irudiak im9.eu zerbitzuaren bidez partekatzeko aukera ematen du Comment[fi]=Mahdollistaa kuvien jakamisen im9.eu-palvelussa Comment[fr]=Permet le partage d'images à l'aide du service « im9.eu » Comment[gl]=Permite compartir imaxes mediante o servizo im9.eu +Comment[he]=מאפשר שיתוף תמונות באמצעות השירות im9.eu Comment[hu]=Képek megosztása az im9.eu szolgáltatás használatával Comment[ia]=Il permitte imagines de esser compartite per usage de servicio im9.eu Comment[id]=Memungkinkan gambar dibagi menggunakan layanan im9.eu diff --git a/runners/appstream/appstreamrunner.desktop b/runners/appstream/appstreamrunner.desktop index aa9a3734f..13dc8a2a7 100644 --- a/runners/appstream/appstreamrunner.desktop +++ b/runners/appstream/appstreamrunner.desktop @@ -7,6 +7,7 @@ Name[de]=Programmverwaltung Name[el]=Κέντρο λογισμικού Name[en_GB]=Software Centre Name[es]=Centro de software +Name[he]=מרכז התוכנות Name[hu]=Szoftverközpont Name[it]=Centro programmi Name[nl]=Softwarecentrum @@ -32,6 +33,7 @@ Comment[de]=Unterstützt die Suche nach Software Comment[el]=Σας δίνει τη δυνατότητα να βρείτε λογισμικό Comment[en_GB]=Lets you find software Comment[es]=Le permite encontrar software +Comment[he]=מאפשר לך למצוא תוכנות Comment[hu]=Lehetővé teszi szoftverek keresését Comment[it]=Ti consente di trovare i programmi Comment[nl]=Laat u software vinden diff --git a/wallpapers/image/wallpaper.knsrc b/wallpapers/image/wallpaper.knsrc index 9c27329b5..fa8dba1a8 100644 --- a/wallpapers/image/wallpaper.knsrc +++ b/wallpapers/image/wallpaper.knsrc @@ -11,6 +11,7 @@ Name[es]=Fondos del escritorio Name[eu]=Horma-paperak Name[fi]=Taustakuvat Name[fr]=Fonds d'écran +Name[he]=רקעים Name[hu]=Háttérképek Name[it]=Sfondi Name[ko]=배경 그림