Commit 25a04eb7 authored by Script Kiddy's avatar Script Kiddy

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"
parent 75ebd102
......@@ -11,53 +11,6 @@ X-KDE-System-Settings-Parent-Category=power-management
X-KDE-Weight=50
Name=Activity Power Settings
Name[ar]=إعدادات الأنشطة
Name[az]=Otaqlar üçün ayarlamaq
Name[bs]=Postavke aktivnosti
Name[ca]=Arranjament d'activitat
Name[ca@valencia]=Configuració d'activitat
Name[cs]=Nastavení aktivit
Name[da]=Aktivitetsindstillinger
Name[de]=Aktivitäten-Einstellungen
Name[el]=Ρυθμίσεις δραστηριοτήτων
Name[en_GB]=Activity Settings
Name[es]=Preferencias de las actividades
Name[et]=Tegevuse seadistused
Name[eu]=Jarduera-ezarpenak
Name[fi]=Aktiviteettiasetukset
Name[fr]=Configuration des activités
Name[gl]=Configuración da actividade
Name[he]=הגדרת פעילויות
Name[hu]=Tevékenység beállítások
Name[ia]=Preferentias de activitate
Name[id]=Pengaturan Aktivitas
Name[it]=Impostazioni delle attività
Name[ja]=アクティビティの設定
Name[ko]=활동 설정
Name[lt]=Veiklos nuostatos
Name[nb]=Aktivitetsinnstillinger
Name[nds]=Aktiviteteninstellen
Name[nl]=Instellingen voor activiteiten
Name[nn]=Aktivitetsoppsett
Name[pa]=ਐਕਟਵਿਟੀ ਸੈਟਿੰਗਾਂ
Name[pl]=Ustawienia aktywności
Name[pt]=Configuração das Actividades
Name[pt_BR]=Configurações da atividade
Name[ro]=Configurări activitate
Name[ru]=Настройка для комнат
Name[sk]=Nastavenie aktivity
Name[sl]=Nastavitve dejavnosti
Name[sr]=Поставке активности
Name[sr@ijekavian]=Поставке активности
Name[sr@ijekavianlatin]=Postavke aktivnosti
Name[sr@latin]=Postavke aktivnosti
Name[sv]=Inställningar av aktiviteter
Name[tg]=Танзимоти фаъолият
Name[tr]=Etkinlik Ayarları
Name[uk]=Параметри простору дій
Name[x-test]=xxActivity Settingsxx
Name[zh_CN]=活动项设置
Name[zh_TW]=活動設定
Comment=Per-Activity Power Management
Comment[ar]=إدارة طاقة ما قبل الأحداث
......
......@@ -11,54 +11,6 @@ X-KDE-System-Settings-Parent-Category=power-management
X-KDE-Weight=99
Name=Advanced Power Settings
Name[ar]=الإعدادات المتقدمة
Name[ast]=Axustes avanzaos
Name[az]=Əlavə Ayarlar
Name[bs]=Napredne postavke
Name[ca]=Arranjament avançat
Name[ca@valencia]=Configuració avançada
Name[cs]=Pokročilá nastavení
Name[da]=Avancerede indstillinger
Name[de]=Erweiterte Einstellungen
Name[el]=Ρυθμίσεις για προχωρημένους
Name[en_GB]=Advanced Settings
Name[es]=Preferencias avanzadas
Name[et]=Muud seadistused
Name[eu]=Ezarpen aurreratuak
Name[fi]=Lisäasetukset
Name[fr]=Configuration avancée
Name[gl]=Configuración avanzada
Name[he]=הגדרות מתקדמות
Name[hu]=Speciális beállítások
Name[ia]=Preferentias Avantiate
Name[id]=Pengaturan Tingkat-lanjut
Name[it]=Impostazioni avanzate
Name[ja]=詳細設定
Name[ko]=고급 설정
Name[lt]=Išplėstinės nuostatos
Name[ml]=വിസ്തരിച്ച സജ്ജീകരണങ്ങള്
Name[nb]=Avanserte innstillinger
Name[nds]=Verwiedert Instellen
Name[nl]=Geavanceerde instellingen
Name[nn]=Avanserte innstillingar
Name[pa]=ਤਕਨੀਕੀ ਸੈਟਿੰਗਾਂ
Name[pl]=Ustawienia zaawansowane
Name[pt]=Configuração Avançada
Name[pt_BR]=Configurações avançadas
Name[ro]=Configurări avansate
Name[ru]=Дополнительные параметры
Name[sk]=Pokročilé nastavenia
Name[sl]=Napredne nastavitve
Name[sr]=Напредне поставке
Name[sr@ijekavian]=Напредне поставке
Name[sr@ijekavianlatin]=Napredne postavke
Name[sr@latin]=Napredne postavke
Name[sv]=Avancerade inställningar
Name[tr]=Gelişmiş Ayarlar
Name[uk]=Додаткові параметри
Name[x-test]=xxAdvanced Settingsxx
Name[zh_CN]=高级设置
Name[zh_TW]=進階設定
Comment=Advanced Power Management Settings
Comment[ar]=إعدادات إدارة الطاقة المتقدمة
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment