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"
4 years ago · 1428eac1d1
parent 57d55e386a
commit 1428eac1d1
30 changed files with 35 additions and 1 deletions
--- a/components/shellprivate/wallpaperplugin.knsrc
+++ b/components/shellprivate/wallpaperplugin.knsrc
@ -20,6 +20,7 @@ Name[hi]=वॉलपेपर प्लगइन
 Name[hu]=Háttérképmodulok
 Name[ia]=Plugins de tapete de papiro
 Name[id]=Plugin-plugin Wallpaper
+Name[is]=Íforrit fyrir bakgrunnsmyndir
 Name[it]=Estensioni per lo sfondo
 Name[ja]=壁紙のプラグイン
 Name[ka]=ფონის სურათის დამატებები
--- a/components/shellprivate/widgetexplorer/plasmoids.knsrc
+++ b/components/shellprivate/widgetexplorer/plasmoids.knsrc
@ -22,6 +22,7 @@ Name[hi]=प्लाज़्मा विजेट
 Name[hu]=Plasma widgetek
 Name[ia]=Widgets de Plasma
 Name[id]=Widget Plasma
+Name[is]=Plasma-viðmótshlutar
 Name[it]=Oggetti di Plasma
 Name[ja]=Plasma ウィジェット
 Name[ka]=Plasma-ის ვიჯეტები
--- a/dataengines/devicenotifications/devicenotifications.notifyrc
+++ b/dataengines/devicenotifications/devicenotifications.notifyrc
@ -99,6 +99,7 @@ Name[hsb]=Staw grata
 Name[hu]=Eszközállapot
 Name[ia]=Stato de dispositivo
 Name[id]=Status Perangkat
+Name[is]=Staða tækis
 Name[it]=Stato dei dispositivi
 Name[ja]=デバイスの状態
 Name[ka]=მოწყობილობის სტატუსი
--- a/gmenu-dbusmenu-proxy/gmenudbusmenuproxy.desktop
+++ b/gmenu-dbusmenu-proxy/gmenudbusmenuproxy.desktop
@ -21,6 +21,7 @@ Name[hi]=जीमेन्यूडीबसमेन्यूप्रॉक
 Name[hu]=GMenuDBusMenuProxy
 Name[ia]=GMenuDBusMenuProxy
 Name[id]=GMenuDBusMenuProxy
+Name[is]=GMenuDBusMenuProxy
 Name[it]=GMenuDBusMenuProxy
 Name[ja]=GMenuDBusMenuProxy
 Name[ka]=GMenuDBusMenuProxy
--- a/kcms/colors/colorschemes.knsrc
+++ b/kcms/colors/colorschemes.knsrc
@ -19,6 +19,7 @@ Name[hsb]=Barbowe kombinacije
 Name[hu]=Színsémák
 Name[ia]=Schemas de Color
 Name[id]=Skema Warna
+Name[is]=Litastef
 Name[it]=Schemi di colore
 Name[ja]=カラースキーム
 Name[ka]=ფერის სქემები
--- a/kcms/colors/editor/org.kde.kcolorschemeeditor.desktop
+++ b/kcms/colors/editor/org.kde.kcolorschemeeditor.desktop
@ -19,6 +19,7 @@ GenericName[hsb]=Wobdźěłar za kombinacije barbow
 GenericName[hu]=Színséma-szerkesztő
 GenericName[ia]=Redactor (Editor) de schema de color
 GenericName[id]=Pengedit skema warna
+GenericName[is]=Ritill fyrir litastef
 GenericName[it]=Editor dello schema di colore
 GenericName[ja]=カラースキームエディタ
 GenericName[ka]=ფერის სქემების ჩასწორება
@ -63,6 +64,7 @@ Name[hi]=के-कलरस्कीमएडिटर
 Name[hu]=KColorSchemeEditor
 Name[ia]=KColorSchemeEditor
 Name[id]=KColorSchemeEditor
+Name[is]=KColorSchemeEditor
 Name[it]=KColorSchemeEditor
 Name[ja]=KColorSchemeEditor
 Name[ka]=KColorSchemeEditor
@ -106,6 +108,7 @@ Comment[hi]=प्लाज़्मा रंग योजना संपा
 Comment[hu]=Plasma színséma-szerkesztő
 Comment[ia]=Redactor (editor) de schema de color de Plasma
 Comment[id]=Pengedit skema warna plasma
+Comment[is]=Plasma-ritill fyrir litastef
 Comment[it]=Editor dello schema di colore di Plasma
 Comment[ja]=Plasma カラースキームエディタ
 Comment[ka]=Plasma-ის ფერის სქემის რედაქტორი
--- a/kcms/cursortheme/xcursor/xcursor.knsrc
+++ b/kcms/cursortheme/xcursor/xcursor.knsrc
@ -20,6 +20,7 @@ Name[hsb]=Cursory
 Name[hu]=Kurzorok
 Name[ia]=Cursores
 Name[id]=Kursor
+Name[is]=Bendlar
 Name[it]=Puntatori
 Name[ja]=カーソル
 Name[ka]=კურსორები
--- a/kcms/desktoptheme/kcm_desktoptheme.desktop
+++ b/kcms/desktoptheme/kcm_desktoptheme.desktop
@ -25,6 +25,7 @@ Name[hsb]=Plasmowy stil
 Name[hu]=Plasma stílus
 Name[ia]=Stilo de Plasma
 Name[id]=Gaya Plasma
+Name[is]=Stíll Plasma
 Name[it]=Stile di Plasma
 Name[ja]=Plasma スタイル
 Name[ka]=Plasma-ის სტილი
--- a/kcms/desktoptheme/plasma-themes.knsrc
+++ b/kcms/desktoptheme/plasma-themes.knsrc
@ -19,6 +19,7 @@ Name[hi]=प्लाज़्मा शैलियाँ
 Name[hu]=Plasma stílusok
 Name[ia]=Stilos de Plasma
 Name[id]=Gaya Plasma
+Name[is]=Stílar PlasmaPlasma skel
 Name[it]=Stili di Plasma
 Name[ja]=Plasma スタイル
 Name[ka]=Plasma-ის სტილები
--- a/kcms/icons/icons.knsrc
+++ b/kcms/icons/icons.knsrc
@ -20,6 +20,7 @@ Name[hsb]=Piktogramy
 Name[hu]=Ikonok
 Name[ia]=Icones
 Name[id]=Ikon
+Name[is]=Táknmyndir
 Name[it]=Icone
 Name[ja]=アイコン
 Name[ka]=ხატულები
--- a/kcms/kfontinst/apps/installfont.desktop
+++ b/kcms/kfontinst/apps/installfont.desktop
@ -24,6 +24,7 @@ Name[hsb]=Instalować...
 Name[hu]=Telepítés…
 Name[ia]=Installa ...
 Name[id]=Instal...
+Name[is]=Setja upp...
 Name[it]=Installa...
 Name[ja]=インストール...
 Name[ka]=დაყენება...
--- a/kcms/kfontinst/apps/org.kde.kfontview.desktop
+++ b/kcms/kfontinst/apps/org.kde.kfontview.desktop
@ -19,6 +19,7 @@ Name[hi]=केफॉन्टवीव
 Name[hu]=KFontView
 Name[ia]=KFontView
 Name[id]=KFontView
+Name[is]=KFontView
 Name[it]=KFontView
 Name[ja]=KFontView
 Name[ka]=KFontView
@ -66,6 +67,7 @@ GenericName[hi]=फ़ॉन्ट प्रदर्शक
 GenericName[hu]=Betűtípus-böngésző
 GenericName[ia]=Visor de font
 GenericName[id]=Penampil Font
+GenericName[is]=Leturskoðari
 GenericName[it]=Visore di caratteri
 GenericName[ja]=フォントビューア
 GenericName[ka]=ფონტის გადახედვა
--- a/kcms/kfontinst/dbus/fontinst.actions
+++ b/kcms/kfontinst/dbus/fontinst.actions
@ -19,6 +19,7 @@ Name[hsb]=Instalowanje pismow
 Name[hu]=Betűtípus-telepítő
 Name[ia]=Installator de Font
 Name[id]=Penginstal Font
+Name[is]=Leturuppsetning
 Name[it]=Installatore di caratteri
 Name[ja]=フォントインストーラ
 Name[ka]=ფონტმყენებელი
@ -65,6 +66,7 @@ Name[hsb]=Rjaduje pisma, kiž steja cyłemu systemej k dispociji.
 Name[hu]=Rendszerszintű betűkészlet-kezelés.
 Name[ia]=Administra fontes de tote le systema.
 Name[id]=Kelola font system-wide.
+Name[is]=Sýsla með letur á öllu kerfinu
 Name[it]=Gestisci i caratteri di sistema.
 Name[ja]=システムフォントを管理します。
 Name[ka]=სისტემური ფონტების მართვა.
@ -108,6 +110,7 @@ Description[hi]=तंत्र-व्यापी फ़ॉन्ट विन
 Description[hu]=A rendszerszintű betűkészletek beállításainak módosítása megfelelő jogosultságokat igényel.
 Description[ia]=Le modification del configuration de tote le systema exige privilegios.
 Description[id]=Memodifikasi konfigurasi font system-wide memerlukan hak akses.
+Description[is]=Breytingar á letri kerfisins krefjast kerfisstjóraaðgangs
 Description[it]=La modifica della configurazione dei caratteri di sistema richiede dei privilegi.
 Description[ja]=システムフォントの設定の変更には特権が必要です。
 Description[ka]=სისტემური ფონტების მართვას დამატებითი წვდომები ესაჭიროება.
--- a/kcms/kfontinst/kcmfontinst/kfontinst.knsrc
+++ b/kcms/kfontinst/kcmfontinst/kfontinst.knsrc
@ -19,6 +19,7 @@ Name[hsb]=Pisma
 Name[hu]=Betűkészletek
 Name[ia]=Fontes
 Name[id]=Font
+Name[is]=Letur
 Name[it]=Caratteri
 Name[ja]=フォント
 Name[ka]=ფონტები
--- a/kcms/kfontinst/kio/fonts.desktop
+++ b/kcms/kfontinst/kio/fonts.desktop
@ -22,6 +22,7 @@ Name[hsb]=Pisma
 Name[hu]=Betűkészletek
 Name[ia]=Fontes
 Name[id]=Font
+Name[is]=Letur
 Name[it]=Caratteri
 Name[ja]=フォント
 Name[ka]=ფონტები
--- a/kcms/kfontinst/thumbnail/fontthumbnail.desktop
+++ b/kcms/kfontinst/thumbnail/fontthumbnail.desktop
@ -20,6 +20,7 @@ Name[hsb]=Pismowe dataje
 Name[hu]=Betűkészletfájlok
 Name[ia]=Files de font
 Name[id]=File Font
+Name[is]=Leturskrár
 Name[it]=File dei caratteri
 Name[ja]=フォントファイル
 Name[ka]=ფონტის ფაილები
--- a/kcms/lookandfeel/lookandfeel.knsrc
+++ b/kcms/lookandfeel/lookandfeel.knsrc
@ -19,6 +19,7 @@ Name[hi]=वैश्विक प्रसंग
 Name[hu]=Globális témák
 Name[ia]=Themas global
 Name[id]=Tema Global
+Name[is]=Víðvær þemu
 Name[it]=Temi globali
 Name[ja]=グローバルテーマ
 Name[ka]=გლობალური თემები
--- a/kcms/style/gtk_themes.knsrc
+++ b/kcms/style/gtk_themes.knsrc
@ -18,6 +18,7 @@ Name[hi]=गनोम/जीटीके अनुप्रयोग शैल
 Name[hu]=GNOME/GTK alkalmazásstílusok
 Name[ia]=Stilos de Application de GNOME/GTK
 Name[id]=Gaya Aplikasi GTK/GNOME
+Name[is]=Stílar GNOME/GTK forrita
 Name[it]=Stili delle applicazioni GNOME/GTK
 Name[ja]=GNOME/GTK アプリケーションスタイル
 Name[ka]=GTK/GNOME-ის აპლიკაციის სტილები
--- a/klipper/klipperrc.desktop
+++ b/klipper/klipperrc.desktop
@ -50,7 +50,7 @@ Description[hsb]=jpeg-wobraz
 Description[hu]=JPEG kép
 Description[ia]=Jpeg-Image
 Description[id]=Citra-Jpeg
-Description[is]=Jpeg mynd
+Description[is]=Jpeg-mynd
 Description[it]=Immagine JPEG
 Description[ja]=JPEG 画像
 Description[ka]=Jpeg-Image
--- a/krunner/org.kde.krunner.desktop.cmake
+++ b/krunner/org.kde.krunner.desktop.cmake
@ -88,6 +88,7 @@ Name[hsb]=Wuwjedźe přikazy na wobsahu zapisnika
 Name[hu]=Parancs futtatása a vágólap tartalmával
 Name[ia]=Executa  commando sur contentos de area de transferentia
 Name[id]=Jalankan perintah pada konten-konten papan-klip
+Name[is]=Keyra skipun á innihald klippiborðsins
 Name[it]=Esegui comando sui contenuti degli appunti
 Name[ja]=クリップボードのコマンドを実行する
 Name[ka]=ბუფერის შემცველობაზე ბრძანების გაშვება
--- a/login-sessions/plasmawayland-dev.desktop.cmake
+++ b/login-sessions/plasmawayland-dev.desktop.cmake
@ -21,6 +21,7 @@ Name[hi]=प्लाज़्मा (विकास, वैलेंड ${CMAK
 Name[hu]=Plasma (Fejlesztői verzió, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
 Name[ia]=Plasma (Disveloppamento, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
 Name[id]=Plasma (Development, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
+Name[is]=Plasma (Þróunarútgáfa, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
 Name[it]=Plasma (Sviluppo, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
 Name[ja]=Plasma (Development, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
 Name[ka]=Plasma (Development, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
--- a/login-sessions/plasmawayland.desktop.cmake
+++ b/login-sessions/plasmawayland.desktop.cmake
@ -24,6 +24,7 @@ Name[hsb]=Plasma (Wayland)
 Name[hu]=Plasma (Wayland)
 Name[ia]=Plasma (Wayland)
 Name[id]=Plasma (Wayland)
+Name[is]=Plasma (Wayland)
 Name[it]=Plasma (Wayland)
 Name[ja]=Plasma (Wayland)
 Name[ka]=Plasma (Wayland)
--- a/login-sessions/plasmax11-dev.desktop.cmake
+++ b/login-sessions/plasmax11-dev.desktop.cmake
@ -22,6 +22,7 @@ Name[hi]=प्लाज़्मा (विकास, एक्स ११ ${CMA
 Name[hu]=Plasma (Fejlesztői verzió, X11 ${CMAKE_INSTALL_FULL_BINDIR})
 Name[ia]=Plasma (Disveloppamento, X11 ${CMAKE_INSTALL_FULL_BINDIR})
 Name[id]=Plasma (Development, X11 ${CMAKE_INSTALL_FULL_BINDIR})
+Name[is]=Plasma (Þróunarútgáfa, X11 ${CMAKE_INSTALL_FULL_BINDIR})
 Name[it]=Plasma (Sviluppo, X11 ${CMAKE_INSTALL_FULL_BINDIR})
 Name[ja]=Plasma (Development, X11 ${CMAKE_INSTALL_FULL_BINDIR})
 Name[ka]=Plasma (Development, X11 ${CMAKE_INSTALL_FULL_BINDIR})
--- a/login-sessions/plasmax11.desktop.cmake
+++ b/login-sessions/plasmax11.desktop.cmake
@ -22,6 +22,7 @@ Name[hi]=प्लाज़्मा (एक्स ११)
 Name[hu]=Plasma (X11)
 Name[ia]=Plasma (X11)
 Name[id]=Plasma (X11)
+Name[is]=Plasma (X11)
 Name[it]=Plasma (X11)
 Name[ja]=Plasma (X11)
 Name[ka]=Plasma (X11)
--- a/lookandfeel/sddm-theme/metadata.desktop
+++ b/lookandfeel/sddm-theme/metadata.desktop
@ -75,6 +75,7 @@ Description[hi]=ब्रीज़
 Description[hu]=Breeze
 Description[ia]=Brisa
 Description[id]=Breeze
+Description[is]=Breeze
 Description[it]=Brezza
 Description[ja]=Breeze
 Description[ka]=ნიავი
--- a/menu/desktop/kf5-network.directory
+++ b/menu/desktop/kf5-network.directory
@ -22,6 +22,7 @@ Name[hsb]=Syć
 Name[hu]=Hálózat
 Name[ia]=Rete
 Name[id]=Jaringan
+Name[is]=Netkerfi
 Name[it]=Rete
 Name[ja]=ネットワーキング
 Name[ka]=ქსელი
--- a/runners/baloo/plasma-runner-baloosearch.desktop
+++ b/runners/baloo/plasma-runner-baloosearch.desktop
@ -79,6 +79,7 @@ Comment[hsb]=Pyta w datajach, mejlkach a kontaktach
 Comment[hu]=Keresés fájlokban, e-mailekben és névjegyekben
 Comment[ia]=Recercas per files, messages de e-posta e contactos
 Comment[id]=Pencarian melalui file, email dan kontak
+Comment[is]=Leitar í skrám, tölvupósti og tengiliðum
 Comment[it]=Cerca tra i file, i messaggi di posta ed i contatti
 Comment[ja]=ファイル、メール、連絡先を検索
 Comment[ka]=ფაილებში, ელფოსტაში და კონტაქტებში ძებნა
--- a/wallpapers/image/setaswallpaper.desktop.in
+++ b/wallpapers/image/setaswallpaper.desktop.in
@ -22,6 +22,7 @@ Name[fr]=Définir comme fond d'écran
 Name[hu]=Beállítás háttérképként
 Name[ia]=Fixa como Tapete de papiro
 Name[id]=Atur sebagai Wallpaper
+Name[is]=Setja sem bakgrunnsmynd
 Name[it]=Imposta come sfondo
 Name[ja]=壁紙として設定
 Name[ka]=ფონის სურათად დაყენება
--- a/wallpapers/image/wallpaper-mobile.knsrc
+++ b/wallpapers/image/wallpaper-mobile.knsrc
@ -22,6 +22,7 @@ Name[hi]=वालपेपर
 Name[hu]=Háttérképek
 Name[ia]=Tapetes de papiro
 Name[id]=Wallpaper
+Name[is]=Bakgrunnsmyndir
 Name[it]=Sfondi
 Name[ja]=壁紙
 Name[ka]=ფონის სურათბი
--- a/wallpapers/image/wallpaper.knsrc
+++ b/wallpapers/image/wallpaper.knsrc
@ -22,6 +22,7 @@ Name[hi]=वालपेपर
 Name[hu]=Háttérképek
 Name[ia]=Tapetes de papiro
 Name[id]=Wallpaper
+Name[is]=Bakgrunnsmyndir
 Name[it]=Sfondi
 Name[ja]=壁紙
 Name[ka]=ფონის სურათბი