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 · 0e06391396
parent d765b5978e
commit 0e06391396
26 changed files with 31 additions and 0 deletions
--- a/components/shellprivate/wallpaperplugin.knsrc
+++ b/components/shellprivate/wallpaperplugin.knsrc
@ -21,6 +21,7 @@ Name[hu]=Háttérképmodulok
 Name[ia]=Plugins de tapete de papiro
 Name[id]=Plugin-plugin Wallpaper
 Name[it]=Estensioni per lo sfondo
+Name[ja]=壁紙のプラグイン
 Name[ka]=ფონის სურათის დამატებები
 Name[ko]=배경 그림 플러그인
 Name[lt]=Darbalaukio fono papildiniai
--- a/components/shellprivate/widgetexplorer/plasmoids.knsrc
+++ b/components/shellprivate/widgetexplorer/plasmoids.knsrc
@ -23,6 +23,7 @@ Name[hu]=Plasma widgetek
 Name[ia]=Widgets de Plasma
 Name[id]=Widget Plasma
 Name[it]=Oggetti di Plasma
+Name[ja]=Plasma ウィジェット
 Name[ka]=Plasma-ის ვიჯეტები
 Name[ko]=Plasma 위젯
 Name[lt]=Plasma valdikliai
--- a/dataengines/devicenotifications/devicenotifications.notifyrc
+++ b/dataengines/devicenotifications/devicenotifications.notifyrc
@ -100,6 +100,7 @@ Name[hu]=Eszközállapot
 Name[ia]=Stato de dispositivo
 Name[id]=Status Perangkat
 Name[it]=Stato dei dispositivi
+Name[ja]=デバイスの状態
 Name[ka]=მოწყობილობის სტატუსი
 Name[ko]=장치 상태
 Name[lt]=Įrenginio būsena
--- a/gmenu-dbusmenu-proxy/gmenudbusmenuproxy.desktop
+++ b/gmenu-dbusmenu-proxy/gmenudbusmenuproxy.desktop
@ -22,6 +22,7 @@ Name[hu]=GMenuDBusMenuProxy
 Name[ia]=GMenuDBusMenuProxy
 Name[id]=GMenuDBusMenuProxy
 Name[it]=GMenuDBusMenuProxy
+Name[ja]=GMenuDBusMenuProxy
 Name[ka]=GMenuDBusMenuProxy
 Name[ko]=GMenuDBusMenuProxy
 Name[lt]=GMenuDBusMenuProxy
--- a/kcms/colors/colorschemes.knsrc
+++ b/kcms/colors/colorschemes.knsrc
@ -20,6 +20,7 @@ Name[hu]=Színsémák
 Name[ia]=Schemas de Color
 Name[id]=Skema Warna
 Name[it]=Schemi di colore
+Name[ja]=カラースキーム
 Name[ka]=ფერის სქემები
 Name[ko]=색 배열
 Name[lt]=Spalvų rinkiniai
--- a/kcms/colors/editor/org.kde.kcolorschemeeditor.desktop
+++ b/kcms/colors/editor/org.kde.kcolorschemeeditor.desktop
@ -20,6 +20,7 @@ GenericName[hu]=Színséma-szerkesztő
 GenericName[ia]=Redactor (Editor) de schema de color
 GenericName[id]=Pengedit skema warna
 GenericName[it]=Editor dello schema di colore
+GenericName[ja]=カラースキームエディタ
 GenericName[ka]=ფერის სქემების ჩასწორება
 GenericName[ko]=색 배열 편집기
 GenericName[lt]=Spalvų rinkinių redaktorius
@ -63,6 +64,7 @@ Name[hu]=KColorSchemeEditor
 Name[ia]=KColorSchemeEditor
 Name[id]=KColorSchemeEditor
 Name[it]=KColorSchemeEditor
+Name[ja]=KColorSchemeEditor
 Name[ka]=KColorSchemeEditor
 Name[ko]=KColorSchemeEditor
 Name[lt]=KColorSchemeEditor
@ -105,6 +107,7 @@ Comment[hu]=Plasma színséma-szerkesztő
 Comment[ia]=Redactor (editor) de schema de color de Plasma
 Comment[id]=Pengedit skema warna plasma
 Comment[it]=Editor dello schema di colore di Plasma
+Comment[ja]=Plasma カラースキームエディタ
 Comment[ka]=Plasma-ის ფერის სქემის რედაქტორი
 Comment[ko]=Plasma 색 배열 편집기
 Comment[lt]=Plasma spalvų rinkinių redaktorius
--- a/kcms/desktoptheme/kcm_desktoptheme.desktop
+++ b/kcms/desktoptheme/kcm_desktoptheme.desktop
@ -26,6 +26,7 @@ Name[hu]=Plasma stílus
 Name[ia]=Stilo de Plasma
 Name[id]=Gaya Plasma
 Name[it]=Stile di Plasma
+Name[ja]=Plasma スタイル
 Name[ka]=Plasma-ის სტილი
 Name[ko]=Plasma 스타일
 Name[lt]=Plasma stilius
--- a/kcms/desktoptheme/plasma-themes.knsrc
+++ b/kcms/desktoptheme/plasma-themes.knsrc
@ -20,6 +20,7 @@ Name[hu]=Plasma stílusok
 Name[ia]=Stilos de Plasma
 Name[id]=Gaya Plasma
 Name[it]=Stili di Plasma
+Name[ja]=Plasma スタイル
 Name[ka]=Plasma-ის სტილები
 Name[ko]=Plasma 스타일
 Name[lt]=Plasma stiliai
--- a/kcms/kfontinst/apps/installfont.desktop
+++ b/kcms/kfontinst/apps/installfont.desktop
@ -25,6 +25,7 @@ Name[hu]=Telepítés…
 Name[ia]=Installa ...
 Name[id]=Instal...
 Name[it]=Installa...
+Name[ja]=インストール...
 Name[ka]=დაყენება...
 Name[ko]=설치...
 Name[lt]=Įdiegti...
--- a/kcms/kfontinst/apps/org.kde.kfontview.desktop
+++ b/kcms/kfontinst/apps/org.kde.kfontview.desktop
@ -20,6 +20,7 @@ Name[hu]=KFontView
 Name[ia]=KFontView
 Name[id]=KFontView
 Name[it]=KFontView
+Name[ja]=KFontView
 Name[ka]=KFontView
 Name[ko]=KFontView
 Name[lt]=KFontView
@ -66,6 +67,7 @@ GenericName[hu]=Betűtípus-böngésző
 GenericName[ia]=Visor de font
 GenericName[id]=Penampil Font
 GenericName[it]=Visore di caratteri
+GenericName[ja]=フォントビューア
 GenericName[ka]=ფონტის გადახედვა
 GenericName[ko]=글꼴 뷰어
 GenericName[lt]=Šriftų žiūryklė
--- a/kcms/kfontinst/dbus/fontinst.actions
+++ b/kcms/kfontinst/dbus/fontinst.actions
@ -20,6 +20,7 @@ Name[hu]=Betűtípus-telepítő
 Name[ia]=Installator de Font
 Name[id]=Penginstal Font
 Name[it]=Installatore di caratteri
+Name[ja]=フォントインストーラ
 Name[ka]=ფონტმყენებელი
 Name[ko]=글꼴 설치기
 Name[lt]=Šriftų diegimo programa
@ -65,6 +66,7 @@ Name[hu]=Rendszerszintű betűkészlet-kezelés.
 Name[ia]=Administra fontes de tote le systema.
 Name[id]=Kelola font system-wide.
 Name[it]=Gestisci i caratteri di sistema.
+Name[ja]=システムフォントを管理します。
 Name[ka]=სისტემური ფონტების მართვა.
 Name[ko]=시스템 전역 글꼴을 관리합니다.
 Name[lt]=Tvarkyti sistemos masto šriftus.
@ -107,6 +109,7 @@ Description[hu]=A rendszerszintű betűkészletek beállításainak módosítás
 Description[ia]=Le modification del configuration de tote le systema exige privilegios.
 Description[id]=Memodifikasi konfigurasi font system-wide memerlukan hak akses.
 Description[it]=La modifica della configurazione dei caratteri di sistema richiede dei privilegi.
+Description[ja]=システムフォントの設定の変更には特権が必要です。
 Description[ka]=სისტემური ფონტების მართვას დამატებითი წვდომები ესაჭიროება.
 Description[ko]=시스템 전역 글꼴 설정을 수정하려면 권한이 필요합니다.
 Description[lt]=Norint modifikuoti sistemos masto šriftų konfigūraciją, reikia tam tikrų teisių.
--- a/kcms/kfontinst/thumbnail/fontthumbnail.desktop
+++ b/kcms/kfontinst/thumbnail/fontthumbnail.desktop
@ -21,6 +21,7 @@ Name[hu]=Betűkészletfájlok
 Name[ia]=Files de font
 Name[id]=File Font
 Name[it]=File dei caratteri
+Name[ja]=フォントファイル
 Name[ka]=ფონტის ფაილები
 Name[ko]=글꼴 파일
 Name[lt]=Šriftų failai
--- a/kcms/lookandfeel/lookandfeel.knsrc
+++ b/kcms/lookandfeel/lookandfeel.knsrc
@ -20,6 +20,7 @@ Name[hu]=Globális témák
 Name[ia]=Themas global
 Name[id]=Tema Global
 Name[it]=Temi globali
+Name[ja]=グローバルテーマ
 Name[ka]=გლობალური თემები
 Name[ko]=전역 테마
 Name[lt]=Visuotiniai apipavidalinimai
--- a/kcms/style/gtk_themes.knsrc
+++ b/kcms/style/gtk_themes.knsrc
@ -19,6 +19,7 @@ Name[hu]=GNOME/GTK alkalmazásstílusok
 Name[ia]=Stilos de Application de GNOME/GTK
 Name[id]=Gaya Aplikasi GTK/GNOME
 Name[it]=Stili delle applicazioni GNOME/GTK
+Name[ja]=GNOME/GTK アプリケーションスタイル
 Name[ka]=GTK/GNOME-ის აპლიკაციის სტილები
 Name[ko]=그놈/GTK 프로그램 스타일
 Name[lt]=GNOME/GTK programų stilius
--- a/krunner/org.kde.krunner.desktop.cmake
+++ b/krunner/org.kde.krunner.desktop.cmake
@ -89,6 +89,7 @@ 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[it]=Esegui comando sui contenuti degli appunti
+Name[ja]=クリップボードのコマンドを実行する
 Name[ka]=ბუფერის შემცველობაზე ბრძანების გაშვება
 Name[ko]=클립보드 내용에서 명령 실행하기
 Name[lt]=Vykdyti komandas su iškarpinės turiniu
--- a/login-sessions/plasmawayland-dev.desktop.cmake
+++ b/login-sessions/plasmawayland-dev.desktop.cmake
@ -22,6 +22,7 @@ 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[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})
 Name[ko]=Plasma(개발, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
 Name[lt]=Plasma (Plėtojimas, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
--- a/login-sessions/plasmawayland.desktop.cmake
+++ b/login-sessions/plasmawayland.desktop.cmake
@ -25,6 +25,7 @@ Name[hu]=Plasma (Wayland)
 Name[ia]=Plasma (Wayland)
 Name[id]=Plasma (Wayland)
 Name[it]=Plasma (Wayland)
+Name[ja]=Plasma (Wayland)
 Name[ka]=Plasma (Wayland)
 Name[ko]=Plasma(Wayland)
 Name[lt]=Plasma (Wayland)
--- a/login-sessions/plasmax11-dev.desktop.cmake
+++ b/login-sessions/plasmax11-dev.desktop.cmake
@ -23,6 +23,7 @@ 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[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})
 Name[ko]=Plasma(개발, X11 ${CMAKE_INSTALL_FULL_BINDIR})
 Name[lt]=Plasma (Plėtojimas, X11 ${CMAKE_INSTALL_FULL_BINDIR})
--- a/login-sessions/plasmax11.desktop.cmake
+++ b/login-sessions/plasmax11.desktop.cmake
@ -23,6 +23,7 @@ Name[hu]=Plasma (X11)
 Name[ia]=Plasma (X11)
 Name[id]=Plasma (X11)
 Name[it]=Plasma (X11)
+Name[ja]=Plasma (X11)
 Name[ka]=Plasma (X11)
 Name[ko]=Plasma(X11)
 Name[lt]=Plasma (X11)
--- a/lookandfeel/sddm-theme/metadata.desktop
+++ b/lookandfeel/sddm-theme/metadata.desktop
@ -76,6 +76,7 @@ Description[hu]=Breeze
 Description[ia]=Brisa
 Description[id]=Breeze
 Description[it]=Brezza
+Description[ja]=Breeze
 Description[ka]=ნიავი
 Description[ko]=Breeze
 Description[lt]=Breeze
--- a/menu/desktop/kf5-network.directory
+++ b/menu/desktop/kf5-network.directory
@ -23,6 +23,7 @@ Name[hu]=Hálózat
 Name[ia]=Rete
 Name[id]=Jaringan
 Name[it]=Rete
+Name[ja]=ネットワーキング
 Name[ka]=ქსელი
 Name[ko]=네트워크
 Name[lt]=Tinklas
--- a/runners/baloo/plasma-runner-baloosearch.desktop
+++ b/runners/baloo/plasma-runner-baloosearch.desktop
@ -80,6 +80,7 @@ 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[it]=Cerca tra i file, i messaggi di posta ed i contatti
+Comment[ja]=ファイル、メール、連絡先を検索
 Comment[ka]=ფაილებში, ელფოსტაში და კონტაქტებში ძებნა
 Comment[ko]=파일, 이메일, 연락처 검색
 Comment[lt]=Atlieka paiešką failuose, el. laiškuose ir adresatuose
--- a/wallpapers/image/setaswallpaper.desktop.in
+++ b/wallpapers/image/setaswallpaper.desktop.in
@ -23,6 +23,7 @@ Name[hu]=Beállítás háttérképként
 Name[ia]=Fixa como Tapete de papiro
 Name[id]=Atur sebagai Wallpaper
 Name[it]=Imposta come sfondo
+Name[ja]=壁紙として設定
 Name[ka]=ფონის სურათად დაყენება
 Name[ko]=배경 그림으로 설정
 Name[nl]=Als achtergrondafbeelding instellen
--- a/wallpapers/image/wallpaper-mobile.knsrc
+++ b/wallpapers/image/wallpaper-mobile.knsrc
@ -23,6 +23,7 @@ Name[hu]=Háttérképek
 Name[ia]=Tapetes de papiro
 Name[id]=Wallpaper
 Name[it]=Sfondi
+Name[ja]=壁紙
 Name[ka]=ფონის სურათბი
 Name[ko]=배경 그림
 Name[lt]=Darbalaukio fonai
--- a/wallpapers/image/wallpaper.knsrc
+++ b/wallpapers/image/wallpaper.knsrc
@ -23,6 +23,7 @@ Name[hu]=Háttérképek
 Name[ia]=Tapetes de papiro
 Name[id]=Wallpaper
 Name[it]=Sfondi
+Name[ja]=壁紙
 Name[ka]=ფონის სურათბი
 Name[ko]=배경 그림
 Name[lt]=Darbalaukio fonai
--- a/xembed-sni-proxy/xembedsniproxy.desktop
+++ b/xembed-sni-proxy/xembedsniproxy.desktop
@ -24,6 +24,7 @@ Name[ia]=XembedSniProxy
 Name[id]=XembedSniProxy
 Name[is]=XembedSniProxy
 Name[it]=XembedSniProxy
+Name[ja]=XembedSniProxy
 Name[ka]=XembedSniProxy
 Name[ko]=XembedSniProxy
 Name[lt]=XembedSniProxy