From 533c6fcd81cb795e01f878856d19f5850032a7cd Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 7 Oct 2018 08:04:05 +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/lock_logout/metadata.desktop | 6 +++--- klipper/klipperrc.desktop | 2 +- lookandfeel/metadata.desktop | 2 +- .../plasma-packagestructure-wallpaperimages.desktop | 2 +- wallpapers/image/imagepackage/metadata.desktop | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/applets/lock_logout/metadata.desktop b/applets/lock_logout/metadata.desktop index fb6780aca..3700d7a45 100644 --- a/applets/lock_logout/metadata.desktop +++ b/applets/lock_logout/metadata.desktop @@ -32,7 +32,7 @@ Name[hr]=Zaključavanje/odjavljivanje Name[hsb]=Zamknjenje/Wotzjewjenje Name[hu]=Zárolás/kijelentkezés Name[ia]=Bloca/Claude session -Name[id]=Gembok/Logout +Name[id]=Kunci/Logout Name[is]=Læsa/stimpla út Name[it]=Blocca/Esci Name[ja]=ロック/ログアウト @@ -111,7 +111,7 @@ Comment[hr]=Zaključavanje ekrana ili odjava Comment[hsb]=Wobrazowku zamknyć abo so wotzjewić Comment[hu]=Képernyőzárolás vagy kijelentkezés Comment[ia]=Bloca le schermo o claude session -Comment[id]=Gembok layar atau logout +Comment[id]=Kunci layar atau logout Comment[is]=Læsa skja eða skrá út Comment[it]=Blocca lo schermo o esci Comment[ja]=スクリーンのロックとログアウト @@ -172,7 +172,7 @@ Keywords[gl]=Trancar;saír;durmir;hibernar;cambiar 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]=Gembok;Logout;Tidur;Hibernasi;Alih Pengguna; +Keywords[id]=Kunci;Logout;Tidur;Hibernasi;Alih Pengguna; Keywords[is]=Læsa;útskrá;svæfa:leggja í dvala;Skipta um notanda; Keywords[it]=Blocca;Esci;Sospendi;Iberna;Cambia utente; Keywords[ja]=ロック;ログアウト;スリープ;ハイバネート;ユーザの切り替え; diff --git a/klipper/klipperrc.desktop b/klipper/klipperrc.desktop index 71313e0ef..4279b1450 100644 --- a/klipper/klipperrc.desktop +++ b/klipper/klipperrc.desktop @@ -47,7 +47,7 @@ Description[hr]=Jpeg slika Description[hsb]=jpeg-wobraz Description[hu]=JPEG kép Description[ia]=Jpeg-Image -Description[id]=Gambar-Jpeg +Description[id]=Image-Jpeg Description[is]=Jpeg mynd Description[it]=Immagine JPEG Description[ja]=JPEG 画像 diff --git a/lookandfeel/metadata.desktop b/lookandfeel/metadata.desktop index c61192da1..6ef3ef227 100644 --- a/lookandfeel/metadata.desktop +++ b/lookandfeel/metadata.desktop @@ -55,7 +55,7 @@ Keywords[fi]=Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shut Keywords[fr]=bureau;espace de travail;apparence;déconnexion;verrouillage;suspension;arrêt;hibernation; Keywords[gl]=Escritorio;Espazo de traballo;Aparencia;Aparencia e Comportamento;Saír;Trancar;Bloquear;Suspender;Apagar;Hibernar; Keywords[hu]=Asztal;Munkaterület;Megjelenés;Kinézet;Kijelentkezés;Zárolás;Felfüggesztés;Leállítás;Hibernálás; -Keywords[id]=Desktop;Ruang Kerja;Penampilan;Look and Feel;Logout;Gembok;Suspensi;Matikan;Hibernasi; +Keywords[id]=Desktop;Ruang Kerja;Penampilan;Look and Feel;Logout;Kunci;Suspensi;Matikan;Hibernasi; Keywords[is]=skjáborð;vinnusvæði;útlit;ásýnd og hegðun;Útskráning;Læsing;setja í bið;slökkva;svæfa; Keywords[it]=desktop;spazio di lavoro;aspetto;uscita;blocco;sospensione;spegnimento;ibernazione; Keywords[ja]=デスクトップ;ワークスペース;外観;外観と挙動;ログアウト;ロック;サスペンド;シャットダウン;休止状態; diff --git a/shell/packageplugins/wallpaperimages/plasma-packagestructure-wallpaperimages.desktop b/shell/packageplugins/wallpaperimages/plasma-packagestructure-wallpaperimages.desktop index b7ddcd9fb..762ec5e8b 100644 --- a/shell/packageplugins/wallpaperimages/plasma-packagestructure-wallpaperimages.desktop +++ b/shell/packageplugins/wallpaperimages/plasma-packagestructure-wallpaperimages.desktop @@ -16,7 +16,7 @@ Name[fr]=Images de fond d'écran Name[gl]=Fondos de escritorio Name[he]=תמונת רקע Name[hu]=Háttérképek -Name[id]=Citra Wallpaper +Name[id]=Image Wallpaper Name[is]=Bakgrunnsmyndir Name[it]=Immagini di sfondo Name[ja]=壁紙画像 diff --git a/wallpapers/image/imagepackage/metadata.desktop b/wallpapers/image/imagepackage/metadata.desktop index d7232ef36..55cf1a0fe 100644 --- a/wallpapers/image/imagepackage/metadata.desktop +++ b/wallpapers/image/imagepackage/metadata.desktop @@ -33,7 +33,7 @@ Name[hne]=फोटो Name[hr]=Slika Name[hu]=Kép Name[ia]=Image -Name[id]=Citra +Name[id]=Image Name[is]=Mynd Name[it]=Immagine Name[ja]=画像 @@ -91,7 +91,7 @@ Comment[fi]=Kuvatausta Comment[fr]=Affichage d'images en fond d'écran Comment[gl]=Vista de fondo de pantalla para imaxes. Comment[hu]=Háttérkép nézet képekhez -Comment[id]=Tampilan wallpaper untuk citra +Comment[id]=Tampilan wallpaper untuk image Comment[it]=Vista delle immagini di sfondo Comment[ko]=마음에 드는 그림을 배경으로 사용 Comment[nl]=Achtergrondweergave voor afbeeldingen