From 791a82758e7dc9cb774b00863230ba78df68c4d5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 10 May 2018 05:29:11 +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" --- lookandfeel/metadata.desktop | 2 +- themes/qtmacintosh.themerc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lookandfeel/metadata.desktop b/lookandfeel/metadata.desktop index 0debbe8f1..bea98b601 100644 --- a/lookandfeel/metadata.desktop +++ b/lookandfeel/metadata.desktop @@ -54,7 +54,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;Tampilan;Tampilan dan Rasa;Keluar;Kancing;Suspensi;Matikan;Hibernasi; +Keywords[id]=Desktop;Ruang Kerja;Penampilan;Penampilan dan Rasa;Keluar;Kancing;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/themes/qtmacintosh.themerc b/themes/qtmacintosh.themerc index e600d215d..d93012057 100644 --- a/themes/qtmacintosh.themerc +++ b/themes/qtmacintosh.themerc @@ -95,7 +95,7 @@ Comment[he]=סגנון המשתמש במנהל המראה של Apple Comment[hr]=Stil koji koristi Appleov upravitelj izgleda Comment[hu]=Az Apple Megjelenítéskezelőt használó stílus Comment[ia]=Stilo que usa le gerente de apparentia Apple -Comment[id]=Gaya yang menggunakan Pengelola Tampilan Apple +Comment[id]=Gaya yang menggunakan Pengelola Penampilan Apple Comment[is]=Stíll sem notar Apple Appearance Manager Comment[it]=Stile che usa il gestore dell'aspetto di Apple Comment[ja]=Apple のアピアランスマネージャを使うスタイル